From 8df7fe3f630e13da1585c151f6f2f986ea7dcdfd Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Mon, 3 Oct 2011 12:05:25 +0400
Subject: normalize arg for ActionView::TestCase tests method

---
 actionpack/lib/action_view/test_case.rb |  7 ++++++-
 actionpack/test/template/test_test.rb   | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index c4d51d7946..7df95b0cb0 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -50,7 +50,12 @@ module ActionView
 
       module ClassMethods
         def tests(helper_class)
-          self.helper_class = helper_class
+          case helper_class
+          when String, Symbol
+            self.helper_class = "#{helper_class.to_s.underscore}_helper".camelize.safe_constantize
+          when Module
+            self.helper_class = helper_class
+          end
         end
 
         def determine_default_helper_class(name)
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index bf789cd8b7..adcbf1447f 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -62,3 +62,19 @@ class CrazyHelperTest < ActionView::TestCase
     assert_equal PeopleHelper, self.class.helper_class
   end
 end
+
+class CrazySymbolHelperTest < ActionView::TestCase
+  tests :people
+
+  def test_set_helper_class_using_symbol
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end
+
+class CrazyStringHelperTest < ActionView::TestCase
+  tests 'people'
+
+  def test_set_helper_class_using_string
+    assert_equal PeopleHelper, self.class.helper_class
+  end
+end
-- 
cgit v1.2.3


From fd8f0b297822ba36002084faa36bd0320d3be4a7 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 5 Oct 2011 15:41:28 -0200
Subject: stylesheet_link_tag('/stylesheets/application') and similar helpers
 doesn't throw Sprockets::FileOutsidePaths exception anymore

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  | 2 ++
 actionpack/test/template/sprockets_helper_test.rb | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index f866bc626e..ddf9b08b54 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -123,6 +123,8 @@ module Sprockets
           return nil if is_uri?(source)
           source = rewrite_extension(source, nil, ext)
           asset_environment[source]
+        rescue Sprockets::FileOutsidePaths
+          nil
         end
 
         def digest_for(logical_path)
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 08b66fec8b..db69f95130 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -219,6 +219,8 @@ class SprocketsHelperTest < ActionView::TestCase
 
     @config.assets.compile = true
     @config.assets.debug = true
+    assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>},
+      javascript_include_tag('/javascripts/application')
     assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
       javascript_include_tag(:application)
   end
@@ -264,6 +266,9 @@ class SprocketsHelperTest < ActionView::TestCase
 
     @config.assets.compile = true
     @config.assets.debug = true
+    assert_match %r{<link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />},
+      stylesheet_link_tag('/stylesheets/application')
+
     assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
       stylesheet_link_tag(:application)
 
-- 
cgit v1.2.3


From d42d97d2e3f0bdef2163cc14daa181903e0b198d Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Thu, 6 Oct 2011 10:39:37 +0400
Subject: Fix comment in AbstractController callbacks

---
 actionpack/lib/abstract_controller/callbacks.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index 14c984e41f..7004e607a1 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -177,7 +177,7 @@ module AbstractController
           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, :#{filter}, name, options.merge(:prepend => true))
+              set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true))  #     set_callback(:process_action, :before, name, options.merge(:prepend => true))
             end                                                                                 #   end
           end                                                                                   # end
 
@@ -185,7 +185,7 @@ module AbstractController
           # 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, :#{filter}, name, options)
+              skip_callback(:process_action, :#{filter}, name, options)  #     skip_callback(:process_action, :before, name, options)
             end                                                          #   end
           end                                                            # end
 
-- 
cgit v1.2.3


From 99888487b63b313ea4495edd24b666fc5a3c8fe0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 6 Oct 2011 11:06:38 -0700
Subject: fix require

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index e921269331..bc956ef216 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -1,4 +1,4 @@
-require 'journey/router'
+require 'journey'
 require 'forwardable'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
-- 
cgit v1.2.3


From 0d3d9a150a4ba1084cf28fd26be2a154f4540952 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 7 Oct 2011 23:53:12 +0530
Subject: closes #3241 - partial doc fix

---
 actionpack/lib/action_view/helpers/rendering_helper.rb  | 4 ++--
 actionpack/lib/action_view/renderer/partial_renderer.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/rendering_helper.rb b/actionpack/lib/action_view/helpers/rendering_helper.rb
index 47efdded42..626e1a1ab7 100644
--- a/actionpack/lib/action_view/helpers/rendering_helper.rb
+++ b/actionpack/lib/action_view/helpers/rendering_helper.rb
@@ -8,7 +8,7 @@ module ActionView
     module RenderingHelper
       # Returns the result of a render that's dictated by the options hash. The primary options are:
       #
-      # * <tt>:partial</tt> - See ActionView::Partials.
+      # * <tt>:partial</tt> - See <tt>ActionView::PartialRenderer</tt>.
       # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
       # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
       # * <tt>:text</tt> - Renders the text passed in out.
@@ -87,4 +87,4 @@ module ActionView
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index e808fa3415..15cb9d0f76 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -27,7 +27,7 @@ module ActionView
   #
   # == The :as and :object options
   #
-  # By default <tt>ActionView::Partials::PartialRenderer</tt> doesn't have any local variables.
+  # By default <tt>ActionView::PartialRenderer</tt> doesn't have any local variables.
   # The <tt>:object</tt> option can be used to pass an object to the partial. For instance:
   #
   #   <%= render :partial => "account", :object => @buyer %>
-- 
cgit v1.2.3


From 7f64e472772293a3a5bbf4a435d937dabd98ed92 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 7 Oct 2011 16:56:18 -0700
Subject: just check to see that the first item in the list is an array

---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 2 +-
 actionpack/test/template/form_options_helper_test.rb      | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index c677257d60..d636702111 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -579,7 +579,7 @@ module ActionView
       def to_select_tag(choices, options, html_options)
         selected_value = options.has_key?(:selected) ? options[:selected] : value(object)
 
-        if !choices.empty? && choices.try(:first).try(:second).respond_to?(:each)
+        if !choices.empty? && Array === choices.first
           option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
         else
           option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 6aea991f7c..d3e0cc41a9 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -587,6 +587,15 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_empty
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n</select>",
+      select("post", "category", [], :prompt => true, :include_blank => true)
+    )
+  end
+
   def test_select_with_selected_value
     @post = Post.new
     @post.category = "<mus>"
-- 
cgit v1.2.3


From 22b6e829dc9f07036399e52f0d352e6723c1113b Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sat, 8 Oct 2011 10:12:58 +0400
Subject: Fix params hash example in AC::Base comment

---
 actionpack/lib/action_controller/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index da93c988c4..98bfe72fef 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -50,7 +50,7 @@ module ActionController
   #
   # All request parameters, whether they come from a GET or POST request, or from the URL, are available through the params method
   # which returns a hash. For example, an action that was performed through <tt>/posts?category=All&limit=5</tt> will include
-  # <tt>{ "category" => "All", "limit" => 5 }</tt> in params.
+  # <tt>{ "category" => "All", "limit" => "5" }</tt> in params.
   #
   # It's also possible to construct multi-dimensional parameter hashes by specifying keys using brackets, such as:
   #
-- 
cgit v1.2.3


From a4515b60e316d52a6ac2902886b117588702e20b Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sat, 8 Oct 2011 11:01:31 +0400
Subject: Remove unnecessary dup in expire_page

---
 actionpack/lib/action_controller/caching/pages.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 496390402b..957bb7de6b 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -122,7 +122,7 @@ module ActionController #:nodoc:
 
         if options.is_a?(Hash)
           if options[:action].is_a?(Array)
-            options[:action].dup.each do |action|
+            options[:action].each do |action|
               self.class.expire_page(url_for(options.merge(:only_path => true, :action => action)))
             end
           else
-- 
cgit v1.2.3


From d68f27e9b184a8e7e4ce71db11874a6b36ea1edc Mon Sep 17 00:00:00 2001
From: Ben Scheirman <ben@scheirman.com>
Date: Sat, 8 Oct 2011 18:38:02 -0500
Subject: accept optional :host parameter to force_ssl

---
 .../lib/action_controller/metal/force_ssl.rb       |  7 +++++--
 actionpack/test/controller/force_ssl_test.rb       | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index ed693c5967..0fd42f9d8a 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -24,12 +24,15 @@ module ActionController
       # * <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
       def force_ssl(options = {})
+        host = options.delete(:host)
         before_filter(options) do
           if !request.ssl? && !Rails.env.development?
-            redirect_to :protocol => 'https://', :status => :moved_permanently
+            redirect_options = {:protocol => 'https://', :status => :moved_permanently}
+            redirect_options.merge!(:host => host) if host
+            redirect_to redirect_options
           end
         end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 3e723e20d9..43b20fdead 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -14,6 +14,10 @@ class ForceSSLControllerLevel < ForceSSLController
   force_ssl
 end
 
+class ForceSSLCustomDomain < ForceSSLController
+  force_ssl :host => "secure.test.host"
+end
+
 class ForceSSLOnlyAction < ForceSSLController
   force_ssl :only => :cheeseburger
 end
@@ -38,6 +42,22 @@ class ForceSSLControllerLevelTest < ActionController::TestCase
   end
 end
 
+class ForceSSLCustomDomainTest < ActionController::TestCase
+  tests ForceSSLCustomDomain
+
+  def test_banana_redirects_to_https_with_custom_host
+    get :banana
+    assert_response 301
+    assert_equal "https://secure.test.host/force_ssl_custom_domain/banana", redirect_to_url
+  end
+  
+  def test_cheeseburger_redirects_to_https_with_custom_host
+    get :cheeseburger
+    assert_response 301
+    assert_equal "https://secure.test.host/force_ssl_custom_domain/cheeseburger", redirect_to_url
+  end
+end
+
 class ForceSSLOnlyActionTest < ActionController::TestCase
   tests ForceSSLOnlyAction
 
@@ -80,4 +100,4 @@ class ForceSSLExcludeDevelopmentTest < ActionController::TestCase
     get :banana
     assert_response 200
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 114218e4da9a2adf7b6ef4a27d2fa47e15881cf1 Mon Sep 17 00:00:00 2001
From: Liborio Cannici <lic@crd.dk>
Date: Thu, 15 Sep 2011 00:35:53 +0200
Subject: Fixes an issue when creating a date select with too many options.

Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93

Closes #239.

Conflicts:

	actionpack/CHANGELOG
---
 actionpack/CHANGELOG                              |  6 ++++++
 actionpack/lib/action_view/helpers/date_helper.rb | 15 ++++++++++-----
 actionpack/test/template/date_helper_test.rb      |  9 +++++++++
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index e8c619723f..29992a36b1 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,11 @@
 *Rails 3.2.0 (unreleased)*
 
+* Limit the number of options for select_year to 1000.
+
+  Pass the :max_years_allowed option to set your own limit.
+
+  [Libo Cannici]
+
 * Passing formats or handlers to render :template and friends is deprecated. For example: [Nick Sutterer & José Valim]
 
     render :template => "foo.html.erb"
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index e850c258ce..4deb87180c 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -765,11 +765,16 @@ module ActionView
         if @options[:use_hidden] || @options[:discard_year]
           build_hidden(:year, val)
         else
-          options                 = {}
-          options[:start]         = @options[:start_year] || middle_year - 5
-          options[:end]           = @options[:end_year] || middle_year + 5
-          options[:step]          = options[:start] < options[:end] ? 1 : -1
-          options[:leading_zeros] = false
+          options                     = {}
+          options[:start]             = @options[:start_year] || middle_year - 5
+          options[:end]               = @options[:end_year] || middle_year + 5
+          options[:step]              = options[:start] < options[:end] ? 1 : -1
+          options[:leading_zeros]     = false
+          options[:max_years_allowed] = @options[:max_years_allowed] || 1000
+
+          if (options[:end] - options[:start]).abs > options[:max_years_allowed]
+            raise ArgumentError,  "There're too many years options to be built. Are you sure you haven't mistyped something? You can provide the :max_years_allowed parameter"
+          end
 
           build_options_and_select(:year, val, options)
         end
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 09c53a36f0..af30ec9892 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -664,6 +664,15 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_date(Time.mktime(2003, 8, 16), :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
   end
 
+  def test_select_date_with_too_big_range_between_start_year_and_end_year
+    assert_raise(ArgumentError) { select_date(Time.mktime(2003, 8, 16), :start_year => 2000, :end_year => 20000, :prefix => "date[first]", :order => [:month, :day, :year]) }
+    assert_raise(ArgumentError) { select_date(Time.mktime(2003, 8, 16), :start_year => Date.today.year - 100.years, :end_year => 2000, :prefix => "date[first]", :order => [:month, :day, :year]) }
+  end
+
+  def test_select_date_can_have_more_then_1000_years_interval_if_forced_via_parameter
+    assert_nothing_raised { select_date(Time.mktime(2003, 8, 16), :start_year => 2000, :end_year => 3100, :max_years_allowed => 2000) }
+  end
+
   def test_select_date_with_order
     expected = %(<select id="date_first_month" name="date[first][month]">\n)
     expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
-- 
cgit v1.2.3


From ca219a21b60ea20868deab20afaa0335d32f1c17 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 9 Oct 2011 17:15:55 +0530
Subject: Warnings removed when running with 1.9.3

---
 actionpack/lib/sprockets/assets.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index a5145080c2..a61a121d55 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -6,7 +6,7 @@ namespace :assets do
     groups = ENV['RAILS_GROUPS'] || 'assets'
     args   = [$0, task,"RAILS_ENV=#{env}","RAILS_GROUPS=#{groups}"]
     args << "--trace" if Rake.application.options.trace
-    ruby *args
+    ruby(*args)
   end
 
   # We are currently running with no explicit bundler group
-- 
cgit v1.2.3


From a0a68ecbb22dacf5111198e72e3a803e7c965881 Mon Sep 17 00:00:00 2001
From: Denis Odorcic <denis.odorcic@jadedpixel.com>
Date: Mon, 10 Oct 2011 01:42:12 -0400
Subject: JSON responder should return errors with :error root

---
 .../lib/action_controller/metal/responder.rb       | 10 ++++++++-
 actionpack/test/controller/mime_responds_test.rb   | 26 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index 3794e277f6..c7827309dd 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -253,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.
@@ -286,5 +286,13 @@ module ActionController #:nodoc:
     def empty_json_resource
       "{}"
     end
+
+    def resource_errors
+      respond_to?("#{format}_resource_errors") ? send("#{format}_resource_errors") : resource.errors
+    end
+
+    def json_resource_errors
+      {:errors => resource.errors}
+    end
   end
 end
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index afb2d39955..afdab30eaf 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -745,6 +745,20 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
+  def test_using_resource_for_post_with_json_yields_unprocessable_entity_on_failure
+    with_test_route_set do
+      @request.accept = "application/json"
+      errors = { :name => :invalid }
+      Customer.any_instance.stubs(:errors).returns(errors)
+      post :using_resource
+      assert_equal "application/json", @response.content_type
+      assert_equal 422, @response.status
+      errors = {:errors => errors}
+      assert_equal errors.to_json, @response.body
+      assert_nil @response.location
+    end
+  end
+
   def test_using_resource_for_put_with_html_redirects_on_success
     with_test_route_set do
       put :using_resource
@@ -808,6 +822,18 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_nil @response.location
   end
 
+  def test_using_resource_for_put_with_json_yields_unprocessable_entity_on_failure
+    @request.accept = "application/json"
+    errors = { :name => :invalid }
+    Customer.any_instance.stubs(:errors).returns(errors)
+    put :using_resource
+    assert_equal "application/json", @response.content_type
+    assert_equal 422, @response.status
+    errors = {:errors => errors}
+    assert_equal errors.to_json, @response.body
+    assert_nil @response.location
+  end
+
   def test_using_resource_for_delete_with_html_redirects_on_success
     with_test_route_set do
       Customer.any_instance.stubs(:destroyed?).returns(true)
-- 
cgit v1.2.3


From 8f863742e34908ed1a9549bb9f984edb58f2b068 Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Mon, 10 Oct 2011 19:53:42 -0300
Subject: allow shorthand routes with nested optional parameters

---
 actionpack/lib/action_dispatch/routing/mapper.rb |  6 +++---
 actionpack/test/dispatch/routing_test.rb         | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index cd59b13c42..ef31d1e004 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -49,7 +49,7 @@ module ActionDispatch
       class Mapping #:nodoc:
         IGNORE_OPTIONS = [:to, :as, :via, :on, :constraints, :defaults, :only, :except, :anchor, :shallow, :shallow_path, :shallow_prefix]
         ANCHOR_CHARACTERS_REGEX = %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
-        SHORTHAND_REGEX = %r{^/[\w/]+$}
+        SHORTHAND_REGEX = %r{/[\w/]+$}
         WILDCARD_PATH = %r{\*([^/\)]+)\)?$}
 
         def initialize(set, scope, path, options)
@@ -70,7 +70,7 @@ module ActionDispatch
 
             if using_match_shorthand?(path_without_format, @options)
               to_shorthand    = @options[:to].blank?
-              @options[:to] ||= path_without_format[1..-1].sub(%r{/([^/]*)$}, '#\1')
+              @options[:to] ||= path_without_format.gsub(/\(.*\)/, "")[1..-1].sub(%r{/([^/]*)$}, '#\1')
             end
 
             @options.merge!(default_controller_and_action(to_shorthand))
@@ -90,7 +90,7 @@ module ActionDispatch
 
           # match "account/overview"
           def using_match_shorthand?(path, options)
-            path && options.except(:via, :anchor, :to, :as).empty? && path =~ SHORTHAND_REGEX
+            path && (options[:to] || options[:action]).nil? && path =~ SHORTHAND_REGEX
           end
 
           def normalize_path(path)
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c0b74bc9f9..a71ac1bdc1 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -339,6 +339,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       scope '(:locale)', :locale => /en|pl/ do
+        get "registrations/new"
         resources :descriptions
         root :to => 'projects#index'
       end
@@ -1471,6 +1472,16 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_nested_optional_path_shorthand
+    with_test_routes do
+      get '/registrations/new'
+      assert @request.params[:locale].nil?
+
+      get '/en/registrations/new'
+      assert 'en', @request.params[:locale]
+    end
+  end
+
   def test_default_params
     with_test_routes do
       get '/inline_pages'
-- 
cgit v1.2.3


From 419d4c09dfcc5cbd898ce52d779603c6a29ac3bc Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 11 Oct 2011 12:31:27 +0400
Subject: Add ActionController#head example

---
 actionpack/lib/action_controller/metal/head.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index 8abcad55a2..a618533d09 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -9,6 +9,8 @@ module ActionController
     #
     #   head :created, :location => person_path(@person)
     #
+    #   head :created, :location => @person
+    #
     # It can also be used to return exceptional conditions:
     #
     #   return head(:method_not_allowed) unless request.post?
-- 
cgit v1.2.3


From 50d262f52ab39680b031e485b89b64875c08358e Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 11 Oct 2011 12:48:03 +0400
Subject: Support symbol and string actions in AC#respond_to options

---
 actionpack/lib/action_controller/metal/mime_responds.rb | 6 +++---
 actionpack/test/controller/mime_responds_test.rb        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index f10287afb4..00bd1706e7 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/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))
-        except_actions = Array(options.delete(:except))
+        only_actions   = Array(options.delete(:only)).map(&:to_s)
+        except_actions = Array(options.delete(:except)).map(&:to_s)
 
         new = mimes_for_respond_to.dup
         mimes.each do |mime|
@@ -245,7 +245,7 @@ module ActionController #:nodoc:
     # current action.
     #
     def collect_mimes_from_class_level #:nodoc:
-      action = action_name.to_sym
+      action = action_name.to_s
 
       self.class.mimes_for_respond_to.keys.select do |mime|
         config = self.class.mimes_for_respond_to[mime]
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index afdab30eaf..2aa73f1650 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -509,7 +509,7 @@ end
 class RespondWithController < ActionController::Base
   respond_to :html, :json
   respond_to :xml, :except => :using_resource_with_block
-  respond_to :js,  :only => [ :using_resource_with_block, :using_resource, :using_hash_resource ]
+  respond_to :js,  :only => [ :using_resource_with_block, :using_resource, 'using_hash_resource' ]
 
   def using_resource
     respond_with(resource)
-- 
cgit v1.2.3


From 4a025f0080d05f6c27518a84cde0b93fa3821345 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Wed, 12 Oct 2011 15:44:19 +0900
Subject: status is a number in Rails 3

---
 actionpack/lib/action_controller/metal/data_streaming.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 5e077dd7bd..0670a58d97 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -34,7 +34,7 @@ module ActionController #:nodoc:
       #   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 OK'.
+      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to 200.
       # * <tt>:url_based_filename</tt> - set to +true+ if you want the browser guess the filename from
       #   the URL, which is necessary for i18n filenames on certain browsers
       #   (setting <tt>:filename</tt> overrides this option).
@@ -92,7 +92,7 @@ module ActionController #:nodoc:
       #   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 OK'.
+      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to 200.
       #
       # Generic data download:
       #
-- 
cgit v1.2.3


From 2cb2ca68b1973ddd202b094599521e4adc39a217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 12 Oct 2011 09:24:13 +0200
Subject: Add some implementation docs. closes #3298. closes #2509.

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 2adbce031b..e59404ef68 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -70,6 +70,10 @@ module ActionDispatch
       end
     end
 
+    # Implementation detail: please do not change the signature of the
+    # FlashHash class. Doing that will likely affect all Rails apps in
+    # production as the FlashHash currently stored in their sessions will
+    # become invalid.
     class FlashHash
       include Enumerable
 
-- 
cgit v1.2.3


From 20728f551c2a429fc7c29c6ac17b3f44b57526b9 Mon Sep 17 00:00:00 2001
From: Mac Martine <admin@cycle7.com>
Date: Wed, 12 Oct 2011 17:06:44 -0700
Subject: remove user-specified delimiter from start when no area code is
 present (in number_to_phone)

---
 actionpack/lib/action_view/helpers/number_helper.rb | 2 +-
 actionpack/test/template/number_helper_test.rb      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index ec6c2c8db3..7031694af4 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -69,7 +69,7 @@ module ActionView
           number.gsub!(/(\d{1,3})(\d{3})(\d{4}$)/,"(\\1) \\2#{delimiter}\\3")
         else
           number.gsub!(/(\d{0,3})(\d{3})(\d{4})$/,"\\1#{delimiter}\\2#{delimiter}\\3")
-          number.slice!(0, 1) if number.starts_with?('-')
+          number.slice!(0, 1) if number.starts_with?(delimiter) && !delimiter.blank?
         end
 
         str = []
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 0e3475d98b..8d679aac1d 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -27,6 +27,7 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "}))
     assert_equal("(800) 555-1212 x 123", number_to_phone(8005551212, {:area_code => true, :extension => 123}))
     assert_equal("800-555-1212", number_to_phone(8005551212, :extension => "  "))
+    assert_equal("555.1212", number_to_phone(5551212, :delimiter => '.'))
     assert_equal("800-555-1212", number_to_phone("8005551212"))
     assert_equal("+1-800-555-1212", number_to_phone(8005551212, :country_code => 1))
     assert_equal("+18005551212", number_to_phone(8005551212, :country_code => 1, :delimiter => ''))
-- 
cgit v1.2.3


From 8f11d53506ea7ef2fd4cd28581f5eedd9be9e570 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 23 Jul 2011 13:50:34 -0700
Subject: Merge pull request #2219 from kommen/fix_fragment_caching_squashed

Fix fragment caching (squashed commits)
---
 actionpack/lib/action_view/helpers/cache_helper.rb |  2 +-
 actionpack/test/controller/caching_test.rb         | 49 ++++++++++++++++++++++
 .../functional_caching/fragment_cached.html.erb    |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb
index f81ce3e31c..850dd5f448 100644
--- a/actionpack/lib/action_view/helpers/cache_helper.rb
+++ b/actionpack/lib/action_view/helpers/cache_helper.rb
@@ -54,7 +54,7 @@ module ActionView
           output_safe = output_buffer.html_safe?
           fragment = output_buffer.slice!(pos..-1)
           if output_safe
-            self.output_buffer = output_buffer.html_safe
+            self.output_buffer = output_buffer.class.new(output_buffer)
           end
           controller.write_fragment(name, fragment, options)
         end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index f3b180283f..618e7b77b2 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -745,6 +745,7 @@ class FunctionalFragmentCachingTest < ActionController::TestCase
     expected_body = <<-CACHED
 Hello
 This bit's fragment cached
+Ciao
 CACHED
     assert_equal expected_body, @response.body
 
@@ -786,3 +787,51 @@ CACHED
     assert_equal "  <p>Builder</p>\n", @store.read('views/test.host/functional_caching/formatted_fragment_cached')
   end
 end
+
+class CacheHelperOutputBufferTest < ActionController::TestCase
+
+  class MockController
+    def read_fragment(name, options)
+      return false
+    end
+
+    def write_fragment(name, fragment, options)
+      fragment
+    end
+  end
+
+  def setup
+    super
+  end
+
+  def test_output_buffer
+    output_buffer = ActionView::OutputBuffer.new
+    controller = MockController.new
+    cache_helper = Object.new
+    cache_helper.extend(ActionView::Helpers::CacheHelper)
+    cache_helper.expects(:controller).returns(controller).at_least(0)
+    cache_helper.expects(:output_buffer).returns(output_buffer).at_least(0)
+    # if the output_buffer is changed, the new one should be html_safe and of the same type
+    cache_helper.expects(:output_buffer=).with(responds_with(:html_safe?, true)).with(instance_of(output_buffer.class)).at_least(0)
+
+    assert_nothing_raised do
+      cache_helper.send :fragment_for, 'Test fragment name', 'Test fragment', &Proc.new{ nil }
+    end
+  end
+
+  def test_safe_buffer
+    output_buffer = ActiveSupport::SafeBuffer.new
+    controller = MockController.new
+    cache_helper = Object.new
+    cache_helper.extend(ActionView::Helpers::CacheHelper)
+    cache_helper.expects(:controller).returns(controller).at_least(0)
+    cache_helper.expects(:output_buffer).returns(output_buffer).at_least(0)
+    # if the output_buffer is changed, the new one should be html_safe and of the same type
+    cache_helper.expects(:output_buffer=).with(responds_with(:html_safe?, true)).with(instance_of(output_buffer.class)).at_least(0)
+
+    assert_nothing_raised do
+      cache_helper.send :fragment_for, 'Test fragment name', 'Test fragment', &Proc.new{ nil }
+    end
+  end
+
+end
diff --git a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
index c479adb897..fa5e6bd318 100644
--- a/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
+++ b/actionpack/test/fixtures/functional_caching/fragment_cached.html.erb
@@ -1,2 +1,3 @@
 Hello
 <%= cache do %>This bit's fragment cached<% end %>
+<%= 'Ciao' %>
-- 
cgit v1.2.3


From 45ced7e1beb0d996f0471e21f0f88efaf2b26124 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 13 Oct 2011 18:50:23 -0700
Subject: Failing tests for path parameter escaping

---
 actionpack/test/dispatch/routing_test.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index a71ac1bdc1..a0d2c51a7c 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2528,3 +2528,30 @@ class TestHttpMethods < ActionDispatch::IntegrationTest
     end
   end
 end
+
+class TestUriPathEscaping < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      match '/:segment' => lambda { |env|
+        path_params = env['action_dispatch.request.path_parameters']
+        [200, { 'Content-Type' => 'text/plain' }, [path_params[:segment]]]
+      }, :as => :segment
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  setup do
+    @path, @param = '/a%20b%2Fc+d', 'a b/c+d'
+  end
+
+  test 'escapes generated path parameters' do
+    assert_equal @path, segment_path(:segment => @param)
+  end
+
+  test 'unescapes recognized path parameters' do
+    get @path
+    assert_equal @param, @response.body
+  end
+end
-- 
cgit v1.2.3


From ec371606640f87289f4821f5f197709dd0ebe6f2 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 13 Oct 2011 21:40:42 -0700
Subject: Leave escaping up to Journey

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index bc956ef216..e7bc431783 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -394,10 +394,9 @@ module ActionDispatch
           if name == :controller
             value
           elsif value.is_a?(Array)
-            value.map { |v| Journey::Router::Utils.escape_uri(v.to_param) }.join('/')
-          else
-            return nil unless param = value.to_param
-            param.split('/').map { |v| Journey::Router::Utils.escape_uri(v) }.join("/")
+            value.map { |v| v.to_param }.join('/')
+          elsif param = value.to_param
+            param
           end
         end
 
-- 
cgit v1.2.3


From bceec4c3c3c8bb8d0747e0c58fd539f46228c37b Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 13 Oct 2011 21:41:30 -0700
Subject: / is allowed in URI fragments

---
 actionpack/lib/action_dispatch/http/url.rb      | 2 +-
 actionpack/test/controller/url_rewriter_test.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 170c68f3e0..c8ddd07bfa 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -45,7 +45,7 @@ module ActionDispatch
 
           rewritten_url << (options[:trailing_slash] ? path.sub(/\?|\z/) { "/" + $& } : path)
           rewritten_url << "?#{params.to_query}" unless params.empty?
-          rewritten_url << "##{Journey::Router::Utils.escape_uri(options[:anchor].to_param.to_s)}" if options[:anchor]
+          rewritten_url << "##{Journey::Router::Utils.escape_fragment(options[:anchor].to_param.to_s)}" if options[:anchor]
           rewritten_url
         end
 
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 89de4c1da4..f88903b10e 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -70,9 +70,9 @@ class UrlRewriterTests < ActionController::TestCase
     )
   end
 
-  def test_anchor_should_be_cgi_escaped
+  def test_anchor_should_be_uri_escaped
     assert_equal(
-      'http://test.host/c/a/i#anc%2Fhor',
+      'http://test.host/c/a/i#anc/hor',
       @rewriter.rewrite(@routes, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anc/hor'))
     )
   end
-- 
cgit v1.2.3


From 401d00d296c0c4dafd0e1103051f6adf0ae56fc5 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 13 Oct 2011 21:42:15 -0700
Subject: Symbol captures may generate multiple path segments, so don't escape
 / -> %2F. Test splat escaping.

---
 actionpack/test/dispatch/routing_test.rb | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index a0d2c51a7c..cf22731823 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2536,22 +2536,32 @@ class TestUriPathEscaping < ActionDispatch::IntegrationTest
         path_params = env['action_dispatch.request.path_parameters']
         [200, { 'Content-Type' => 'text/plain' }, [path_params[:segment]]]
       }, :as => :segment
+
+      match '/*splat' => lambda { |env|
+        path_params = env['action_dispatch.request.path_parameters']
+        [200, { 'Content-Type' => 'text/plain' }, [path_params[:splat]]]
+      }, :as => :splat
     end
   end
 
   include Routes.url_helpers
   def app; Routes end
 
-  setup do
-    @path, @param = '/a%20b%2Fc+d', 'a b/c+d'
+  test 'escapes generated path segment' do
+    assert_equal '/a%20b/c+d', segment_path(:segment => 'a b/c+d')
+  end
+
+  test 'unescapes recognized path segment' do
+    get '/a%20b%2Fc+d'
+    assert_equal 'a b/c+d', @response.body
   end
 
-  test 'escapes generated path parameters' do
-    assert_equal @path, segment_path(:segment => @param)
+  test 'escapes generated path splat' do
+    assert_equal '/a%20b/c+d', splat_path(:splat => 'a b/c+d')
   end
 
-  test 'unescapes recognized path parameters' do
-    get @path
-    assert_equal @param, @response.body
+  test 'unescapes recognized path splat' do
+    get '/a%20b/c+d'
+    assert_equal 'a b/c+d', @response.body
   end
 end
-- 
cgit v1.2.3


From f247c5f81175fc160de6be906ef87316f0528f38 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sat, 15 Oct 2011 11:34:33 +0400
Subject: Update AC::RecordIdentifier example

---
 actionpack/lib/action_controller/record_identifier.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 2036442cfe..9c38ff44d8 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -14,9 +14,9 @@ module ActionController
   #   <% end %>                  </div>
   #
   #   # controller
-  #   def destroy
+  #   def update
   #     post = Post.find(params[:id])
-  #     post.destroy
+  #     post.update_attributes(params[:post])
   #
   #     redirect_to(post) # Calls polymorphic_url(post) which in turn calls post_url(post)
   #   end
-- 
cgit v1.2.3


From 8ff7693a8dc61f43fc4eaf72ed24d3b8699191fe Mon Sep 17 00:00:00 2001
From: Jose and Yehuda <wycats@gmail.com>
Date: Mon, 26 Sep 2011 18:48:19 -0400
Subject: Initial commit of serializer support

---
 actionpack/lib/action_controller.rb                |  1 +
 actionpack/lib/action_controller/base.rb           |  1 +
 .../lib/action_controller/metal/serialization.rb   | 26 +++++++++++++++++
 actionpack/test/controller/render_json_test.rb     | 34 ++++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 actionpack/lib/action_controller/metal/serialization.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index f4eaa2fd1b..3829e60bb0 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,6 +31,7 @@ module ActionController
     autoload :RequestForgeryProtection
     autoload :Rescue
     autoload :Responder
+    autoload :Serialization
     autoload :SessionManagement
     autoload :Streaming
     autoload :Testing
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 98bfe72fef..cfb9cf5e6e 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -190,6 +190,7 @@ module ActionController
       Redirecting,
       Rendering,
       Renderers::All,
+      Serialization,
       ConditionalGet,
       RackDelegation,
       SessionManagement,
diff --git a/actionpack/lib/action_controller/metal/serialization.rb b/actionpack/lib/action_controller/metal/serialization.rb
new file mode 100644
index 0000000000..9bb665a9ae
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/serialization.rb
@@ -0,0 +1,26 @@
+module ActionController
+  module Serialization
+    extend ActiveSupport::Concern
+
+    include ActionController::Renderers
+
+    included do
+      class_attribute :_serialization_scope
+    end
+
+    def serialization_scope
+      send(_serialization_scope)
+    end
+
+    def _render_option_json(json, options)
+      json = json.active_model_serializer.new(json, serialization_scope) if json.respond_to?(:active_model_serializer)
+      super
+    end
+
+    module ClassMethods
+      def serialization_scope(scope)
+        self._serialization_scope = scope
+      end
+    end
+  end
+end
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index fc604a2db3..f886af1a95 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -15,9 +15,32 @@ class RenderJsonTest < ActionController::TestCase
     end
   end
 
+  class JsonSerializer
+    def initialize(object, scope)
+      @object, @scope = object, scope
+    end
+
+    def as_json(*)
+      { :object => @object.as_json, :scope => @scope.as_json }
+    end
+  end
+
+  class JsonSerializable
+    def active_model_serializer
+      JsonSerializer
+    end
+
+    def as_json(*)
+      { :serializable_object => true }
+    end
+  end
+
   class TestController < ActionController::Base
     protect_from_forgery
 
+    serialization_scope :current_user
+    attr_reader :current_user
+
     def self.controller_path
       'test'
     end
@@ -61,6 +84,11 @@ class RenderJsonTest < ActionController::TestCase
     def render_json_without_options
       render :json => JsonRenderable.new
     end
+
+    def render_json_with_serializer
+      @current_user = Struct.new(:as_json).new(:current_user => true)
+      render :json => JsonSerializable.new
+    end
   end
 
   tests TestController
@@ -132,4 +160,10 @@ class RenderJsonTest < ActionController::TestCase
     get :render_json_without_options
     assert_equal '{"a":"b"}', @response.body
   end
+
+  def test_render_json_with_serializer
+    get :render_json_with_serializer
+    assert_match '"scope":{"current_user":true}', @response.body
+    assert_match '"object":{"serializable_object":true}', @response.body
+  end
 end
-- 
cgit v1.2.3


From a4c04a43cc96d9c94b7a5ecd5c7458fdc2f8617f Mon Sep 17 00:00:00 2001
From: Jose and Yehuda <wycats@gmail.com>
Date: Mon, 26 Sep 2011 18:57:49 -0400
Subject: Refactor to make renderers a Set

---
 actionpack/lib/action_controller/metal/renderers.rb | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'actionpack')

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


From 8f473dc9aea2099e6e7e47c929c6a9cec02c7902 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sat, 15 Oct 2011 23:54:26 +0400
Subject: HTMl -> HTML: html scanner comment fix

---
 actionpack/lib/action_controller/vendor/html-scanner/html/document.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
index 7fa3aead82..386820300a 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/document.rb
@@ -4,7 +4,7 @@ require 'html/selector'
 require 'html/sanitizer'
 
 module HTML #:nodoc:
-  # A top-level HTMl document. You give it a body of text, and it will parse that
+  # A top-level HTML document. You give it a body of text, and it will parse that
   # text into a tree of nodes.
   class Document #:nodoc:
 
-- 
cgit v1.2.3


From 91be318120654ad698cfb24c63194e3dfe754b4c Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Mon, 17 Oct 2011 23:13:42 +0530
Subject: Bump sprockets

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 96d583730a..062ebed4c2 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',          '~> 1.3.2')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0')
-  s.add_dependency('sprockets',     '~> 2.0.2')
+  s.add_dependency('sprockets',     '~> 2.0.3')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')
-- 
cgit v1.2.3


From 124bb176380387b65c8643208fa50c475d8f2a49 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Tue, 18 Oct 2011 11:09:59 +0530
Subject: Bump Rack to 1.3.5

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 96d583730a..78b9a4d5a8 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack-cache',    '~> 1.1')
   s.add_dependency('builder',       '~> 3.0.0')
   s.add_dependency('i18n',          '~> 0.6')
-  s.add_dependency('rack',          '~> 1.3.2')
+  s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0')
   s.add_dependency('sprockets',     '~> 2.0.2')
-- 
cgit v1.2.3


From bed5825f775bdf2a1af6eec9dc1f4071dbde5ead Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 18 Oct 2011 22:57:55 +0400
Subject: Remove superfluous assignment in cookies

---
 actionpack/lib/action_dispatch/middleware/cookies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 8c4615c0c1..a4ffd40a66 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -174,7 +174,7 @@ module ActionDispatch
           options = { :value => value }
         end
 
-        value = @cookies[key.to_s] = value
+        @cookies[key.to_s] = value
 
         handle_options(options)
 
-- 
cgit v1.2.3


From afde6fdd5ef3e6b0693a7e330777e85ef4cffddb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 12:59:33 -0500
Subject: Added X-Request-Id tracking and TaggedLogging to easily log that and
 other production concerns

---
 actionpack/CHANGELOG                               |  2 +
 actionpack/lib/action_dispatch.rb                  |  1 +
 actionpack/lib/action_dispatch/http/request.rb     | 10 ++++
 .../lib/action_dispatch/middleware/request_id.rb   | 38 ++++++++++++++
 actionpack/test/dispatch/request_id_test.rb        | 59 ++++++++++++++++++++++
 5 files changed, 110 insertions(+)
 create mode 100644 actionpack/lib/action_dispatch/middleware/request_id.rb
 create mode 100644 actionpack/test/dispatch/request_id_test.rb

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 29992a36b1..e7886facb9 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.2.0 (unreleased)*
 
+* Added ActionDispatch::RequestId middleware that'll make a unique X-Request-Id header available to the response and enables the ActionDispatch::Request#uuid method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog [DHH]
+
 * Limit the number of options for select_year to 1000.
 
   Pass the :max_years_allowed option to set your own limit.
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 7f972fc281..c13850f378 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -47,6 +47,7 @@ module ActionDispatch
   end
 
   autoload_under 'middleware' do
+    autoload :RequestId
     autoload :BestStandardsSupport
     autoload :Callbacks
     autoload :Cookies
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 37d0a3e0b8..7a5237dcf3 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -177,6 +177,16 @@ module ActionDispatch
       @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
diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
new file mode 100644
index 0000000000..968ad6c28d
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -0,0 +1,38 @@
+require 'digest/md5'
+
+module ActionDispatch
+  # Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through
+  # ActionDispatch::Request#uuid) and sends the same id to the client via the X-Request-Id header.
+  #
+  # The unique request id is either based off the X-Request-Id header in the request, which would typically be generated
+  # by a firewall, load balancer, or the web server, or, if this header is not available, a random uuid. If the
+  # header is accepted from the outside world, we sanitize it to a max of 255 chars and alphanumeric and dashes only.
+  #
+  # The unique request id can be used to trace a request end-to-end and would typically end up being part of log files
+  # from multiple pieces of the stack.
+  class RequestId
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      env["action_dispatch.request_id"] = external_request_id(env) || internal_request_id
+
+      status, headers, body = @app.call(env)
+
+      headers["X-Request-Id"] = env["action_dispatch.request_id"]
+      [ status, headers, body ]
+    end
+    
+    private
+      def external_request_id(env)
+        if env["HTTP_X_REQUEST_ID"].present?
+          env["HTTP_X_REQUEST_ID"].gsub(/[^\w\d\-]/, "").first(255)
+        end
+      end
+    
+      def internal_request_id
+        SecureRandom.uuid
+      end
+  end
+end
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
new file mode 100644
index 0000000000..bdadbf6644
--- /dev/null
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -0,0 +1,59 @@
+require 'abstract_unit'
+
+class RequestIdTest < ActiveSupport::TestCase
+  test "passing on the request id from the outside" do
+    assert_equal "external-uu-rid", stub_request('HTTP_X_REQUEST_ID' => 'external-uu-rid').uuid
+  end
+
+  test "ensure that only alphanumeric uurids are accepted" do
+    assert_equal "X-Hacked-HeaderStuff", stub_request('HTTP_X_REQUEST_ID' => '; X-Hacked-Header: Stuff').uuid
+  end
+  
+  test "ensure that 255 char limit on the request id is being enforced" do
+    assert_equal "X" * 255, stub_request('HTTP_X_REQUEST_ID' => 'X' * 500).uuid
+  end
+  
+  test "generating a request id when none is supplied" do
+    assert_match /\w+-\w+-\w+-\w+-\w+/, stub_request.uuid
+  end
+
+  private
+    def stub_request(env = {})
+      ActionDispatch::RequestId.new(->(env) { [ 200, env, [] ] }).call(env)
+      ActionDispatch::Request.new(env)
+    end
+end
+
+# FIXME: Testing end-to-end doesn't seem to work
+# 
+# class RequestIdResponseTest < ActionDispatch::IntegrationTest
+#   class TestController < ActionController::Base
+#     def index
+#       head :ok
+#     end
+#   end
+# 
+#   test "request id is passed all the way to the response" do
+#     with_test_route_set do
+#       get '/'
+#       puts @response.headers.inspect
+#       assert_equal "internal-uu-rid", @response.headers["X-Request-Id"]
+#     end
+#   end  
+# 
+# 
+#   private
+#     def with_test_route_set
+#       with_routing do |set|
+#         set.draw do
+#           match ':action', to: ::RequestIdResponseTest::TestController
+#         end
+# 
+#         @app = self.class.build_app(set) do |middleware|
+#           middleware.use ActionDispatch::RequestId
+#         end
+# 
+#         yield
+#       end
+#     end
+# end
\ No newline at end of file
-- 
cgit v1.2.3


From ddbb2cae3146fc125375a0aae61bbaca9328b797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:15:25 +0300
Subject: Require securerandom as it is the proper dependency.

---
 actionpack/lib/action_dispatch/middleware/request_id.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index 968ad6c28d..c515798d48 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -1,4 +1,4 @@
-require 'digest/md5'
+require 'securerandom'
 
 module ActionDispatch
   # Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through
-- 
cgit v1.2.3


From 1b50207ed3a2f545763b8c0b3afcd35d9d36d4e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:17:54 +0300
Subject: Require missing string access dependency.

---
 actionpack/lib/action_dispatch/middleware/request_id.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index c515798d48..cdddc55aae 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'active_support/core_ext/string/access'
 
 module ActionDispatch
   # Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through
-- 
cgit v1.2.3


From ada78066fdbccffb1da092a2470211fa252b3c99 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 14:45:42 -0500
Subject: Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for
 Rails 4.0 to drop compatibility with 1.8.x

---
 actionpack/lib/action_dispatch/middleware/request_id.rb | 2 +-
 actionpack/test/dispatch/request_id_test.rb             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index cdddc55aae..4728e9f71e 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -33,7 +33,7 @@ module ActionDispatch
       end
     
       def internal_request_id
-        SecureRandom.uuid
+        SecureRandom.hex(16)
       end
   end
 end
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index bdadbf6644..230ff54889 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -14,7 +14,7 @@ class RequestIdTest < ActiveSupport::TestCase
   end
   
   test "generating a request id when none is supplied" do
-    assert_match /\w+-\w+-\w+-\w+-\w+/, stub_request.uuid
+    assert_match /\w+/, stub_request.uuid
   end
 
   private
-- 
cgit v1.2.3


From f1fecd9b4e38c289b678bc2aadb406265963c528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:09:36 +0200
Subject: Make tests run on 1.8.x, add integration setup.

---
 .../lib/action_dispatch/middleware/request_id.rb   |  5 +-
 actionpack/test/dispatch/request_id_test.rb        | 84 ++++++++++++----------
 2 files changed, 47 insertions(+), 42 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index 4728e9f71e..f4d721f9bf 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -18,20 +18,19 @@ module ActionDispatch
 
     def call(env)
       env["action_dispatch.request_id"] = external_request_id(env) || internal_request_id
-
       status, headers, body = @app.call(env)
 
       headers["X-Request-Id"] = env["action_dispatch.request_id"]
       [ status, headers, body ]
     end
-    
+
     private
       def external_request_id(env)
         if env["HTTP_X_REQUEST_ID"].present?
           env["HTTP_X_REQUEST_ID"].gsub(/[^\w\d\-]/, "").first(255)
         end
       end
-    
+
       def internal_request_id
         SecureRandom.hex(16)
       end
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index 230ff54889..ece8353810 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -8,52 +8,58 @@ class RequestIdTest < ActiveSupport::TestCase
   test "ensure that only alphanumeric uurids are accepted" do
     assert_equal "X-Hacked-HeaderStuff", stub_request('HTTP_X_REQUEST_ID' => '; X-Hacked-Header: Stuff').uuid
   end
-  
+
   test "ensure that 255 char limit on the request id is being enforced" do
     assert_equal "X" * 255, stub_request('HTTP_X_REQUEST_ID' => 'X' * 500).uuid
   end
-  
+
   test "generating a request id when none is supplied" do
     assert_match /\w+/, stub_request.uuid
   end
 
   private
-    def stub_request(env = {})
-      ActionDispatch::RequestId.new(->(env) { [ 200, env, [] ] }).call(env)
-      ActionDispatch::Request.new(env)
-    end
+
+  def stub_request(env = {})
+    ActionDispatch::RequestId.new(lambda { |env| [ 200, env, [] ] }).call(env)
+    ActionDispatch::Request.new(env)
+  end
 end
 
-# FIXME: Testing end-to-end doesn't seem to work
-# 
-# class RequestIdResponseTest < ActionDispatch::IntegrationTest
-#   class TestController < ActionController::Base
-#     def index
-#       head :ok
-#     end
-#   end
-# 
-#   test "request id is passed all the way to the response" do
-#     with_test_route_set do
-#       get '/'
-#       puts @response.headers.inspect
-#       assert_equal "internal-uu-rid", @response.headers["X-Request-Id"]
-#     end
-#   end  
-# 
-# 
-#   private
-#     def with_test_route_set
-#       with_routing do |set|
-#         set.draw do
-#           match ':action', to: ::RequestIdResponseTest::TestController
-#         end
-# 
-#         @app = self.class.build_app(set) do |middleware|
-#           middleware.use ActionDispatch::RequestId
-#         end
-# 
-#         yield
-#       end
-#     end
-# end
\ No newline at end of file
+class RequestIdResponseTest < ActionDispatch::IntegrationTest
+  class TestController < ActionController::Base
+    def index
+      head :ok
+    end
+  end
+
+  test "request id is passed all the way to the response" do
+    with_test_route_set do
+      get '/'
+      assert_match(/\w+/, @response.headers["X-Request-Id"])
+    end
+  end
+
+  test "request id given on request is passed all the way to the response" do
+    with_test_route_set do
+      get '/', {}, 'HTTP_X_REQUEST_ID' => 'X' * 500
+      assert_equal "X" * 255, @response.headers["X-Request-Id"]
+    end
+  end
+
+
+  private
+
+  def with_test_route_set
+    with_routing do |set|
+      set.draw do
+        match '/', :to => ::RequestIdResponseTest::TestController.action(:index)
+      end
+
+      @app = self.class.build_app(set) do |middleware|
+        middleware.use ActionDispatch::RequestId
+      end
+
+      yield
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 4ef74536940ea4c8c7f8c2cb0252bfe5f0db6fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 19 Oct 2011 22:10:43 +0200
Subject: Load object/blank and make use of presence.

---
 actionpack/lib/action_dispatch/middleware/request_id.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index f4d721f9bf..d7bb9c58df 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -1,5 +1,6 @@
 require 'securerandom'
 require 'active_support/core_ext/string/access'
+require 'active_support/core_ext/object/blank'
 
 module ActionDispatch
   # Makes a unique request id available to the action_dispatch.request_id env variable (which is then accessible through
@@ -26,8 +27,8 @@ module ActionDispatch
 
     private
       def external_request_id(env)
-        if env["HTTP_X_REQUEST_ID"].present?
-          env["HTTP_X_REQUEST_ID"].gsub(/[^\w\d\-]/, "").first(255)
+        if request_id = env["HTTP_X_REQUEST_ID"].presence
+          request_id.gsub(/[^\w\d\-]/, "").first(255)
         end
       end
 
-- 
cgit v1.2.3


From 951a325c99ef2845f29ef95c85230ac2e835a31c Mon Sep 17 00:00:00 2001
From: Marc Bowes <marcbowes@gmail.com>
Date: Thu, 20 Oct 2011 10:00:42 +0300
Subject: Remove the unneeded `\d` when sanitizing `X-Request-Id`.

---
 actionpack/lib/action_dispatch/middleware/request_id.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index d7bb9c58df..bee446c8a5 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -28,7 +28,7 @@ module ActionDispatch
     private
       def external_request_id(env)
         if request_id = env["HTTP_X_REQUEST_ID"].presence
-          request_id.gsub(/[^\w\d\-]/, "").first(255)
+          request_id.gsub(/[^\w\-]/, "").first(255)
         end
       end
 
-- 
cgit v1.2.3


From 2b04c2f66e3cf5abbbf118eaa1e692b9e1380e4e Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Fri, 21 Oct 2011 13:13:29 -0500
Subject: Add ActionDispatch::Session::CacheStore as a generic way of storing
 sessions in a cache.

---
 actionpack/lib/action_dispatch.rb                  |   1 +
 .../middleware/session/cache_store.rb              |  50 ++++++
 .../test/dispatch/session/cache_store_test.rb      | 181 +++++++++++++++++++++
 3 files changed, 232 insertions(+)
 create mode 100644 actionpack/lib/action_dispatch/middleware/session/cache_store.rb
 create mode 100644 actionpack/test/dispatch/session/cache_store_test.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index c13850f378..1e92d14542 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -83,6 +83,7 @@ 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
diff --git a/actionpack/lib/action_dispatch/middleware/session/cache_store.rb b/actionpack/lib/action_dispatch/middleware/session/cache_store.rb
new file mode 100644
index 0000000000..d3b6fd12fa
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/session/cache_store.rb
@@ -0,0 +1,50 @@
+require 'action_dispatch/middleware/session/abstract_store'
+require 'rack/session/memcache'
+
+module ActionDispatch
+  module Session
+    # Session store that uses an ActiveSupport::Cache::Store to store the sessions. This store is most useful
+    # if you don't store critical data in your sessions and you don't need them to live for extended periods
+    # of time.
+    class CacheStore < AbstractStore
+      # Create a new store. The cache to use can be passed in the <tt>:cache</tt> option. If it is
+      # not specified, <tt>Rails.cache</tt> will be used.
+      def initialize(app, options = {})
+        @cache = options[:cache] || Rails.cache
+        options[:expire_after] ||= @cache.options[:expires_in]
+        super
+      end
+
+      # Get a session from the cache.
+      def get_session(env, sid)
+        sid ||= generate_sid
+        session = @cache.read(cache_key(sid))
+        session ||= {}
+        [sid, session]
+      end
+
+      # Set a session in the cache.
+      def set_session(env, sid, session, options)
+        key = cache_key(sid)
+        if session
+          @cache.write(key, session, :expires_in => options[:expire_after])
+        else
+          @cache.delete(key)
+        end
+        sid
+      end
+
+      # Remove a session from the cache.
+      def destroy_session(env, sid, options)
+        @cache.delete(cache_key(sid))
+        generate_sid
+      end
+
+      private
+        # Turn the session id into a cache key.
+        def cache_key(sid)
+          "_session_id:#{sid}"
+        end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/session/cache_store_test.rb b/actionpack/test/dispatch/session/cache_store_test.rb
new file mode 100644
index 0000000000..73e056de23
--- /dev/null
+++ b/actionpack/test/dispatch/session/cache_store_test.rb
@@ -0,0 +1,181 @@
+require 'abstract_unit'
+
+class CacheStoreTest < ActionDispatch::IntegrationTest
+  class TestController < ActionController::Base
+    def no_session_access
+      head :ok
+    end
+
+    def set_session_value
+      session[:foo] = "bar"
+      head :ok
+    end
+
+    def set_serialized_session_value
+      session[:foo] = SessionAutoloadTest::Foo.new
+      head :ok
+    end
+
+    def get_session_value
+      render :text => "foo: #{session[:foo].inspect}"
+    end
+
+    def get_session_id
+      render :text => "#{request.session_options[:id]}"
+    end
+
+    def call_reset_session
+      session[:bar]
+      reset_session
+      session[:bar] = "baz"
+      head :ok
+    end
+
+    def rescue_action(e) raise end
+  end
+
+  def test_setting_and_getting_session_value
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: "bar"', response.body
+    end
+  end
+
+  def test_getting_nil_session_value
+    with_test_route_set do
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+    end
+  end
+
+  def test_getting_session_value_after_session_reset
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+      session_cookie = cookies.send(:hash_for)['_session_id']
+
+      get '/call_reset_session'
+      assert_response :success
+      assert_not_equal [], headers['Set-Cookie']
+
+      cookies << session_cookie # replace our new session_id with our old, pre-reset session_id
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body, "data for this session should have been obliterated from cache"
+    end
+  end
+
+  def test_getting_from_nonexistent_session
+    with_test_route_set do
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+      assert_nil cookies['_session_id'], "should only create session on write, not read"
+    end
+  end
+
+  def test_setting_session_value_after_session_reset
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+      session_id = cookies['_session_id']
+
+      get '/call_reset_session'
+      assert_response :success
+      assert_not_equal [], headers['Set-Cookie']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+
+      get '/get_session_id'
+      assert_response :success
+      assert_not_equal session_id, response.body
+    end
+  end
+
+  def test_getting_session_id
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+      session_id = cookies['_session_id']
+
+      get '/get_session_id'
+      assert_response :success
+      assert_equal session_id, response.body, "should be able to read session id without accessing the session hash"
+    end
+  end
+
+  def test_deserializes_unloaded_class
+    with_test_route_set do
+      with_autoload_path "session_autoload_test" do
+        get '/set_serialized_session_value'
+        assert_response :success
+        assert cookies['_session_id']
+      end
+      with_autoload_path "session_autoload_test" do
+        get '/get_session_id'
+        assert_response :success
+      end
+      with_autoload_path "session_autoload_test" do
+        get '/get_session_value'
+        assert_response :success
+        assert_equal 'foo: #<SessionAutoloadTest::Foo bar:"baz">', response.body, "should auto-load unloaded class"
+      end
+    end
+  end
+
+  def test_doesnt_write_session_cookie_if_session_id_is_already_exists
+    with_test_route_set do
+      get '/set_session_value'
+      assert_response :success
+      assert cookies['_session_id']
+
+      get '/get_session_value'
+      assert_response :success
+      assert_equal nil, headers['Set-Cookie'], "should not resend the cookie again if session_id cookie is already exists"
+    end
+  end
+
+  def test_prevents_session_fixation
+    with_test_route_set do
+      get '/get_session_value'
+      assert_response :success
+      assert_equal 'foo: nil', response.body
+      session_id = cookies['_session_id']
+
+      reset!
+
+      get '/set_session_value', :_session_id => session_id
+      assert_response :success
+      assert_not_equal session_id, cookies['_session_id']
+    end
+  end
+
+  private
+    def with_test_route_set
+      with_routing do |set|
+        set.draw do
+          match ':action', :to => ::CacheStoreTest::TestController
+        end
+
+        @app = self.class.build_app(set) do |middleware|
+          cache = ActiveSupport::Cache::MemoryStore.new
+          middleware.use ActionDispatch::Session::CacheStore, :key => '_session_id', :cache => cache
+          middleware.delete "ActionDispatch::ShowExceptions"
+        end
+
+        yield
+      end
+    end
+end
-- 
cgit v1.2.3


From 50dfd58fdb10557d9f14dc22494f96cf55237330 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 16:30:48 +0530
Subject: Warnings removed from RequestIdTest

---
 actionpack/test/dispatch/request_id_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index ece8353810..b6e8b6c3ad 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -14,13 +14,13 @@ class RequestIdTest < ActiveSupport::TestCase
   end
 
   test "generating a request id when none is supplied" do
-    assert_match /\w+/, stub_request.uuid
+    assert_match(/\w+/, stub_request.uuid)
   end
 
   private
 
   def stub_request(env = {})
-    ActionDispatch::RequestId.new(lambda { |env| [ 200, env, [] ] }).call(env)
+    ActionDispatch::RequestId.new(lambda { |environment| [ 200, environment, [] ] }).call(env)
     ActionDispatch::Request.new(env)
   end
 end
-- 
cgit v1.2.3


From 244dcfea477ace65963b41de122f7dab7904900b Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Mon, 24 Oct 2011 14:11:20 +0530
Subject: ActionPack test fix for RBX

---
 actionpack/test/controller/mime_responds_test.rb       | 4 +++-
 actionpack/test/template/html-scanner/tag_node_test.rb | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 2aa73f1650..e91e11a8a7 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -656,7 +656,9 @@ class RespondWithControllerTest < ActionController::TestCase
     @request.accept = "application/json"
     get :using_hash_resource
     assert_equal "application/json", @response.content_type
-    assert_equal %Q[{"result":{"name":"david","id":13}}], @response.body
+    assert @response.body.include?("result")
+    assert @response.body.include?('"name":"david"')
+    assert @response.body.include?('"id":13')
   end
 
   def test_using_hash_resource_with_post
diff --git a/actionpack/test/template/html-scanner/tag_node_test.rb b/actionpack/test/template/html-scanner/tag_node_test.rb
index 0d87f1bd42..3b72243e7d 100644
--- a/actionpack/test/template/html-scanner/tag_node_test.rb
+++ b/actionpack/test/template/html-scanner/tag_node_test.rb
@@ -55,7 +55,12 @@ class TagNodeTest < Test::Unit::TestCase
 
   def test_to_s
     node = tag("<a b=c d='f' g=\"h 'i'\" />")
-    assert_equal %(<a b="c" d="f" g="h 'i'" />), node.to_s
+    node = node.to_s
+    assert node.include?('a')
+    assert node.include?('b="c"')
+    assert node.include?('d="f"')
+    assert node.include?('g="h')
+    assert node.include?('i')
   end
 
   def test_tag
-- 
cgit v1.2.3


From a7641054d80a285c5da85d80b8678d899c27cd1a Mon Sep 17 00:00:00 2001
From: Nick Howard <ndh@baroquebobcat.com>
Date: Tue, 25 Oct 2011 10:39:20 -0600
Subject: add namespacing when referring to ActionController::RedirectBackError

---
 actionpack/lib/action_controller/metal/redirecting.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index f2dfb3833b..0355c9f458 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -54,8 +54,8 @@ 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, RedirectBackError will be raised. You may specify some fallback
-    # behavior for this case by rescuing RedirectBackError.
+    # 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.
     def redirect_to(options = {}, response_status = {}) #:doc:
       raise ActionControllerError.new("Cannot redirect to nil!") unless options
       raise AbstractController::DoubleRenderError if response_body
-- 
cgit v1.2.3


From e368583ba716f90120e7e6ccfc5ee76de015521c Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Tue, 25 Oct 2011 15:08:28 -0400
Subject: Adds missing closing regex slashes.

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ef31d1e004..09a8c10043 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -696,7 +696,7 @@ module ActionDispatch
         # Allows you to constrain the nested routes based on a set of rules.
         # For instance, in order to change the routes to allow for a dot character in the +id+ parameter:
         #
-        #   constraints(:id => /\d+\.\d+) do
+        #   constraints(:id => /\d+\.\d+/) do
         #     resources :posts
         #   end
         #
@@ -706,7 +706,7 @@ module ActionDispatch
         # You may use this to also restrict other parameters:
         #
         #   resources :posts do
-        #     constraints(:post_id => /\d+\.\d+) do
+        #     constraints(:post_id => /\d+\.\d+/) do
         #       resources :comments
         #     end
         #   end
-- 
cgit v1.2.3


From f7e56a3ab6f54ae5b9b021212b3d4e98eae6eeec Mon Sep 17 00:00:00 2001
From: Matthew Daubert <mdaubert@gmail.com>
Date: Tue, 25 Oct 2011 15:11:45 -0400
Subject: Fix deprecation warnings in action pack test suite due to passing
 template formats in the template name.

---
 actionpack/test/template/render_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 0ef3239f83..77659918f7 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -429,7 +429,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
   if '1.9'.respond_to?(:force_encoding)
     def test_render_utf8_template_with_magic_comment
       with_external_encoding Encoding::ASCII_8BIT do
-        result = @view.render(:file => "test/utf8_magic.html", :layouts => "layouts/yield")
+        result = @view.render(:file => "test/utf8_magic", :formats => [:html], :layouts => "layouts/yield")
         assert_equal Encoding::UTF_8, result.encoding
         assert_equal "\nРусский \nтекст\n\nUTF-8\nUTF-8\nUTF-8\n", result
       end
@@ -437,7 +437,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
 
     def test_render_utf8_template_with_default_external_encoding
       with_external_encoding Encoding::UTF_8 do
-        result = @view.render(:file => "test/utf8.html", :layouts => "layouts/yield")
+        result = @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
         assert_equal Encoding::UTF_8, result.encoding
         assert_equal "Русский текст\n\nUTF-8\nUTF-8\nUTF-8\n", result
       end
@@ -446,7 +446,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
     def test_render_utf8_template_with_incompatible_external_encoding
       with_external_encoding Encoding::SHIFT_JIS do
         begin
-          @view.render(:file => "test/utf8.html", :layouts => "layouts/yield")
+          @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
           flunk 'Should have raised incompatible encoding error'
         rescue ActionView::Template::Error => error
           assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
@@ -457,7 +457,7 @@ class LazyViewRenderTest < ActiveSupport::TestCase
     def test_render_utf8_template_with_partial_with_incompatible_encoding
       with_external_encoding Encoding::SHIFT_JIS do
         begin
-          @view.render(:file => "test/utf8_magic_with_bare_partial.html", :layouts => "layouts/yield")
+          @view.render(:file => "test/utf8_magic_with_bare_partial", :formats => [:html], :layouts => "layouts/yield")
           flunk 'Should have raised incompatible encoding error'
         rescue ActionView::Template::Error => error
           assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
-- 
cgit v1.2.3


From 450257c95b0ca2c61eca2cefbcb2afd69e90f4a9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 25 Oct 2011 17:44:17 -0700
Subject: properly handle lists of lists. Thanks @adrianpike for reporting!

---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 7 ++++++-
 actionpack/test/template/form_options_helper_test.rb      | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index d636702111..1a6c3b9740 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -579,7 +579,12 @@ module ActionView
       def to_select_tag(choices, options, html_options)
         selected_value = options.has_key?(:selected) ? options[:selected] : value(object)
 
-        if !choices.empty? && Array === choices.first
+        # Grouped choices look like this:
+        #
+        #   [nil, []]
+        #   { nil => [] }
+        #
+        if !choices.empty? && choices.first.last.respond_to?(:each)
           option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
         else
           option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index d3e0cc41a9..469718e1bd 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -596,6 +596,15 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_list_of_lists
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"number\">Number</option>\n<option value=\"text\">Text</option>\n<option value=\"boolean\">Yes/No</option></select>",
+      select("post", "category", [["Number", "number"], ["Text", "text"], ["Yes/No", "boolean"]], :prompt => true, :include_blank => true)
+    )
+  end
+
   def test_select_with_selected_value
     @post = Post.new
     @post.category = "<mus>"
-- 
cgit v1.2.3


From 80768b739ed7e2053d85a01dd5fa60bde67aad9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 26 Oct 2011 09:31:56 +0200
Subject: Responders now return 204 No Content for API requests without a
 response body (as in the new scaffold)

---
 actionpack/CHANGELOG                               |  2 ++
 .../lib/action_controller/metal/responder.rb       | 22 +---------------------
 actionpack/test/controller/mime_responds_test.rb   | 20 ++++++++++----------
 3 files changed, 13 insertions(+), 31 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index e7886facb9..a7a47bf930 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.2.0 (unreleased)*
 
+* Responders now return 204 No Content for API requests without a response body (as in the new scaffold) [José Valim]
+
 * Added ActionDispatch::RequestId middleware that'll make a unique X-Request-Id header available to the response and enables the ActionDispatch::Request#uuid method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog [DHH]
 
 * Limit the number of options for select_year to 1000.
diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index c7827309dd..b932302a60 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -202,10 +202,8 @@ 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 :ok
+        head :no_content
       end
     end
 
@@ -269,24 +267,6 @@ module ActionController #:nodoc:
       @action ||= ACTIONS_FOR_VERBS[request.request_method_symbol]
     end
 
-    # Check whether resource needs a specific definition of empty resource to be valid
-    #
-    def has_empty_resource_definition?
-      respond_to?("empty_#{format}_resource")
-    end
-
-    # Delegate to proper empty resource method
-    #
-    def empty_resource
-      send("empty_#{format}_resource")
-    end
-
-    # Return a valid empty JSON resource
-    #
-    def empty_json_resource
-      "{}"
-    end
-
     def resource_errors
       respond_to?("#{format}_resource_errors") ? send("#{format}_resource_errors") : resource.errors
     end
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index e91e11a8a7..76a8c89e60 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -796,21 +796,21 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_put_with_xml_yields_ok_on_success
+  def test_using_resource_for_put_with_xml_yields_no_content_on_success
     @request.accept = "application/xml"
     put :using_resource
     assert_equal "application/xml", @response.content_type
-    assert_equal 200, @response.status
+    assert_equal 204, @response.status
     assert_equal " ", @response.body
   end
 
-  def test_using_resource_for_put_with_json_yields_ok_on_success
+  def test_using_resource_for_put_with_json_yields_no_content_on_success
     Customer.any_instance.stubs(:to_json).returns('{"name": "David"}')
     @request.accept = "application/json"
     put :using_resource
     assert_equal "application/json", @response.content_type
-    assert_equal 200, @response.status
-    assert_equal "{}", @response.body
+    assert_equal 204, @response.status
+    assert_equal " ", @response.body
   end
 
   def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
@@ -846,23 +846,23 @@ class RespondWithControllerTest < ActionController::TestCase
     end
   end
 
-  def test_using_resource_for_delete_with_xml_yields_ok_on_success
+  def test_using_resource_for_delete_with_xml_yields_no_content_on_success
     Customer.any_instance.stubs(:destroyed?).returns(true)
     @request.accept = "application/xml"
     delete :using_resource
     assert_equal "application/xml", @response.content_type
-    assert_equal 200, @response.status
+    assert_equal 204, @response.status
     assert_equal " ", @response.body
   end
 
-  def test_using_resource_for_delete_with_json_yields_ok_on_success
+  def test_using_resource_for_delete_with_json_yields_no_content_on_success
     Customer.any_instance.stubs(:to_json).returns('{"name": "David"}')
     Customer.any_instance.stubs(:destroyed?).returns(true)
     @request.accept = "application/json"
     delete :using_resource
     assert_equal "application/json", @response.content_type
-    assert_equal 200, @response.status
-    assert_equal "{}", @response.body
+    assert_equal 204, @response.status
+    assert_equal " ", @response.body
   end
 
   def test_using_resource_for_delete_with_html_redirects_on_failure
-- 
cgit v1.2.3


From 902764379838d0d2b98e262c4039b7069cada3f8 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 26 Oct 2011 10:30:14 -0700
Subject: scumbag 1.8: strings are enumerable :'(

---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 1a6c3b9740..f895cad058 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -584,7 +584,7 @@ module ActionView
         #   [nil, []]
         #   { nil => [] }
         #
-        if !choices.empty? && choices.first.last.respond_to?(:each)
+        if !choices.empty? && Array === choices.first.last
           option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
         else
           option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
-- 
cgit v1.2.3


From 07c4297282c9c2d0768922722ad2ab08dedf4d8d Mon Sep 17 00:00:00 2001
From: Paul McMahon <paul@mobalean.com>
Date: Fri, 28 Oct 2011 15:34:12 +0900
Subject: Add missing type to number_field_tag documentation

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 13b9dc8553..1424a3584d 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -582,7 +582,7 @@ module ActionView
       #
       # ==== Examples
       #   number_field_tag 'quantity', nil, :in => 1...10
-      #   => <input id="quantity" name="quantity" min="1" max="9" />
+      #   => <input id="quantity" name="quantity" min="1" max="9" type="number" />
       def number_field_tag(name, value = nil, options = {})
         options = options.stringify_keys
         options["type"] ||= "number"
-- 
cgit v1.2.3


From 0c7c1dbc41414c12799f339c87e1c04327e9def9 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 29 Oct 2011 12:34:08 +0530
Subject: ActiveRecord is no more in controller directory.

---
 actionpack/RUNNING_UNIT_TESTS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/RUNNING_UNIT_TESTS b/actionpack/RUNNING_UNIT_TESTS
index 1e3ba7abe7..1b29abd2d1 100644
--- a/actionpack/RUNNING_UNIT_TESTS
+++ b/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/controller/active_record/ directory depend on having
+Test cases in the test/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.
-- 
cgit v1.2.3


From 6cbe4223a77d7ea364b4d2dc46cec6a0c58c9537 Mon Sep 17 00:00:00 2001
From: Christopher Meiklejohn <christopher.meiklejohn@gmail.com>
Date: Sat, 30 Jul 2011 00:49:36 -0400
Subject: Ensure that the format isn't applied twice to the cache key, else it
 becomes impossible to target with expire_action.

---
 actionpack/lib/action_controller/caching/actions.rb |  2 +-
 actionpack/test/controller/caching_test.rb          | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index 0031d2701f..f6b23e4efc 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -175,7 +175,7 @@ module ActionController #:nodoc:
       private
         def normalize!(path)
           path << 'index' if path[-1] == ?/
-          path << ".#{extension}" if extension and !path.ends_with?(extension)
+          path << ".#{extension}" if extension and !path.split('?').first.try(:ends_with?, ".#{extension}")
           URI.parser.unescape(path)
         end
       end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 618e7b77b2..2364bbf3a3 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -194,6 +194,7 @@ class ActionCachingTestController < CachingController
   caches_action :show, :cache_path => 'http://test.host/custom/show'
   caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
   caches_action :with_layout
+  caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } } 
   caches_action :layout_false, :layout => false
   caches_action :record_not_found, :four_oh_four, :simple_runtime_error
 
@@ -219,6 +220,11 @@ class ActionCachingTestController < CachingController
     render :text => @cache_this, :layout => true
   end
 
+  def with_format_and_http_param
+    @cache_this = MockTime.now.to_f.to_s
+    render :text => @cache_this
+  end
+  
   def record_not_found
     raise ActiveRecord::RecordNotFound, "oops!"
   end
@@ -359,6 +365,13 @@ class ActionCacheTest < ActionController::TestCase
     assert !fragment_exist?('hostname.com/action_caching_test')
   end
 
+  def test_action_cache_with_format_and_http_param
+    get :with_format_and_http_param, :format => 'json'
+    assert_response :success
+    assert !fragment_exist?('hostname.com/action_caching_test/with_format_and_http_param.json?key=value.json')
+    assert fragment_exist?('hostname.com/action_caching_test/with_format_and_http_param.json?key=value')
+  end
+
   def test_action_cache_with_store_options
     MockTime.expects(:now).returns(12345).once
     @controller.expects(:read_fragment).with('hostname.com/action_caching_test', :expires_in => 1.hour).once
-- 
cgit v1.2.3


From 62a86748ae8e6a43c20e917a963a614a02098a58 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 31 Oct 2011 15:17:16 -0400
Subject: this should never return nil, so no use for "try"

---
 actionpack/lib/action_controller/caching/actions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index f6b23e4efc..f988de39dd 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -175,7 +175,7 @@ module ActionController #:nodoc:
       private
         def normalize!(path)
           path << 'index' if path[-1] == ?/
-          path << ".#{extension}" if extension and !path.split('?').first.try(:ends_with?, ".#{extension}")
+          path << ".#{extension}" if extension and !path.split('?').first.ends_with?(".#{extension}")
           URI.parser.unescape(path)
         end
       end
-- 
cgit v1.2.3


From 5f4550889dcab7def4122d37a3379d57627f68e2 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 1 Nov 2011 08:55:03 +0400
Subject: Fix typo in constraints method documentation

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 09a8c10043..e8bfe9bbd0 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -735,7 +735,7 @@ module ActionDispatch
         # if the user should be given access to that route, or +false+ if the user should not.
         #
         #    class Iphone
-        #      def self.matches(request)
+        #      def self.matches?(request)
         #        request.env["HTTP_USER_AGENT"] =~ /iPhone/
         #      end
         #    end
-- 
cgit v1.2.3


From 702aecb126712de9f996da74357cafe14f449d24 Mon Sep 17 00:00:00 2001
From: Aviv Ben-Yosef <aviv.by@gmail.com>
Date: Tue, 1 Nov 2011 08:59:20 +0200
Subject: Fix typo in Dispatcher#controller documentation

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index e7bc431783..2bcde16110 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -37,7 +37,7 @@ module ActionDispatch
 
         # If this is a default_controller (i.e. a controller specified by the user)
         # we should raise an error in case it's not found, because it usually means
-        # an user error. However, if the controller was retrieved through a dynamic
+        # a user error. However, if the controller was retrieved through a dynamic
         # segment, as in :controller(/:action), we should simply return nil and
         # delegate the control back to Rack cascade. Besides, if this is not a default
         # controller, it means we should respect the @scope[:module] parameter.
-- 
cgit v1.2.3


From 746331711585cfcb158dafcaf3ea5d60d9825ed2 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Thu, 3 Nov 2011 08:43:28 +0400
Subject: Fix small typos in routing docs

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e8bfe9bbd0..970236a05a 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -285,7 +285,7 @@ module ActionDispatch
         # A pattern can also point to a +Rack+ endpoint i.e. anything that
         # responds to +call+:
         #
-        #   match 'photos/:id' => lambda {|hash| [200, {}, "Coming soon" }
+        #   match 'photos/:id' => lambda {|hash| [200, {}, "Coming soon"] }
         #   match 'photos/:id' => PhotoRackApp
         #   # Yes, controller actions are just rack endpoints
         #   match 'photos/:id' => PhotosController.action(:show)
@@ -1023,6 +1023,7 @@ module ActionDispatch
         # creates seven different routes in your application, all mapping to
         # the +Photos+ controller:
         #
+        #   GET     /photos
         #   GET     /photos/new
         #   POST    /photos
         #   GET     /photos/:id
@@ -1038,6 +1039,7 @@ module ActionDispatch
         #
         # This generates the following comments routes:
         #
+        #   GET     /photos/:photo_id/comments
         #   GET     /photos/:photo_id/comments/new
         #   POST    /photos/:photo_id/comments
         #   GET     /photos/:photo_id/comments/:id
-- 
cgit v1.2.3


From a8468731f7cbb0d8702e7fb0722559194dd930ad Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Thu, 3 Nov 2011 09:02:11 +0400
Subject: Fix javascript_include_tag examples in documentation

---
 .../action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index 09700bd0c5..d9f1f88ade 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -119,10 +119,10 @@ module ActionView
         #   #    <script type="text/javascript" src="/elsewhere/cools.js?1423139606"></script>
         #
         #   javascript_include_tag "http://www.example.com/xmlhr"
-        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr.js?1284139606"></script>
+        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr"></script>
         #
         #   javascript_include_tag "http://www.example.com/xmlhr.js"
-        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr.js?1284139606"></script>
+        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr.js"></script>
         #
         #   javascript_include_tag :defaults
         #   # => <script type="text/javascript" src="/javascripts/jquery.js?1284139606"></script>
-- 
cgit v1.2.3


From a50f659e081785479b068b311862703584a589ca Mon Sep 17 00:00:00 2001
From: Olivier Lacan <olivier.lacan@gmail.com>
Date: Thu, 3 Nov 2011 10:01:32 -0400
Subject: CSS fix to prevent error output from being breaking out of body
 element.

Using the white-space: pre-wrap adds extra line breaks to prevent the text from breaking out of the element's box. In this case single line output can be extremely long, breaking out the <body> element.

See for reference: http://www.quirksmode.org/css/whitespace.html

Before: http://link.olivierlacan.com/BVU4
After: http://link.olivierlacan.com/BUfM
---
 actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 6e71fd7ddc..1a308707d1 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -16,6 +16,7 @@
       background-color: #eee;
       padding: 10px;
       font-size: 11px;
+      white-space: pre-wrap;
     }
 
     a { color: #000; }
-- 
cgit v1.2.3


From b5f908a7ad515215f164e306f82c3e6c506182cb Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 3 Nov 2011 16:09:57 +0000
Subject: Stub find_template so that when handle_render_error is called in
 ActionView::Template, we get to see the actual underlying error rather than a
 NoMethodError.

This shows an encoding bug on Ruby 1.9.3.
---
 actionpack/test/template/template_test.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index b0ca7de0b6..70ca876c67 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -8,6 +8,9 @@ class TestERBTemplate < ActiveSupport::TestCase
     def disable_cache
       yield
     end
+
+    def find_template(*args)
+    end
   end
 
   class Context
-- 
cgit v1.2.3


From 56207a3f0165650abb273594f1f54fbb92bbf177 Mon Sep 17 00:00:00 2001
From: Waseem Ahmad <talk.to.waseem@gmail.com>
Date: Fri, 4 Nov 2011 15:03:02 +0530
Subject: Remove 'size' attribute from number_field form helper fixes #3454

f.number_field generates <input type="number", size="30"../> which is
invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state
---
 actionpack/lib/action_view/helpers/form_helper.rb | 2 ++
 actionpack/test/template/form_helper_test.rb      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index f22c466666..5c10b67586 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1027,6 +1027,8 @@ module ActionView
 
       def to_number_field_tag(field_type, options = {})
         options = options.stringify_keys
+        options['size'] ||= nil
+
         if range = options.delete("in") || options.delete("within")
           options.update("min" => range.min, "max" => range.max)
         end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index e36d032f6c..bd7b322fc9 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -438,12 +438,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_number_field
-    expected = %{<input name="order[quantity]" size="30" max="9" id="order_quantity" type="number" min="1" />}
+    expected = %{<input name="order[quantity]" max="9" id="order_quantity" type="number" min="1" />}
     assert_dom_equal(expected, number_field("order", "quantity", :in => 1...10))
   end
 
   def test_range_input
-    expected = %{<input name="hifi[volume]" step="0.1" size="30" max="11" id="hifi_volume" type="range" min="0" />}
+    expected = %{<input name="hifi[volume]" step="0.1" max="11" id="hifi_volume" type="range" min="0" />}
     assert_dom_equal(expected, range_field("hifi", "volume", :in => 0..11, :step => 0.1))
   end
 
-- 
cgit v1.2.3


From 281272ad36e29b49595c1758d56a82f338c21b1a Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 4 Nov 2011 12:55:17 +0000
Subject: Convert CHANGELOGs to Markdown format.

Reasons:

 * Markdown reads well as plain text, but can also be formatted.
 * It will make it easier for people to read on the web as Github
   formats the Markdown nicely.
 * It will encourage a level of consistency when people are writing
   CHANGELOG entries.

The script used to perform the conversion is at
https://gist.github.com/1339263
---
 actionpack/CHANGELOG    | 5689 -----------------------------------------------
 actionpack/CHANGELOG.md | 5663 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 5663 insertions(+), 5689 deletions(-)
 delete mode 100644 actionpack/CHANGELOG
 create mode 100644 actionpack/CHANGELOG.md

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
deleted file mode 100644
index a7a47bf930..0000000000
--- a/actionpack/CHANGELOG
+++ /dev/null
@@ -1,5689 +0,0 @@
-*Rails 3.2.0 (unreleased)*
-
-* Responders now return 204 No Content for API requests without a response body (as in the new scaffold) [José Valim]
-
-* Added ActionDispatch::RequestId middleware that'll make a unique X-Request-Id header available to the response and enables the ActionDispatch::Request#uuid method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog [DHH]
-
-* Limit the number of options for select_year to 1000.
-
-  Pass the :max_years_allowed option to set your own limit.
-
-  [Libo Cannici]
-
-* Passing formats or handlers to render :template and friends is deprecated. For example: [Nick Sutterer & José Valim]
-
-    render :template => "foo.html.erb"
-
-  Instead, you can provide :handlers and :formats directly as option:
-  
-    render :template => "foo", :formats => [:html, :js], :handlers => :erb
-
-* Changed log level of warning for missing CSRF token from :debug to :warn. [Mike Dillon]
-
-* content_tag_for and div_for can now take the collection of records. It will also yield the record as the first argument if you set a receiving argument in your block [Prem Sichanugrist]
-
-  So instead of having to do this:
-
-    @items.each do |item|
-      content_tag_for(:li, item) do
-         Title: <%= item.title %>
-      end
-    end
-
-  You can now do this:
-
-    content_tag_for(:li, @items) do |item|
-      Title: <%= item.title %>
-    end
-
-* send_file now guess the mime type [Esad Hajdarevic]
-
-* Mime type entries for PDF, ZIP and other formats were added [Esad Hajdarevic]
-
-* Generate hidden input before select with :multiple option set to true.
-  This is useful when you rely on the fact that when no options is set,
-  the state of select will be sent to rails application. Without hidden field
-  nothing is sent according to HTML spec [Bogdan Gusiev]
-
-* Refactor ActionController::TestCase cookies [Andrew White]
-
-  Assigning cookies for test cases should now use cookies[], e.g:
-
-    cookies[:email] = 'user@example.com'
-    get :index
-    assert_equal 'user@example.com', cookies[:email]
-
-  To clear the cookies, use clear, e.g:
-
-    cookies.clear
-    get :index
-    assert_nil cookies[:email]
-
-  We now no longer write out HTTP_COOKIE and the cookie jar is
-  persistent between requests so if you need to manipulate the environment
-  for your test you need to do it before the cookie jar is created.
-
-
-*Rails 3.1.1 (unreleased)*
-
-* javascript_path and stylesheet_path now refer to /assets if asset pipelining
-is on. [Santiago Pastorino]
-
-* button_to support form option. Now you're able to pass for example
-'data-type' => 'json'. [ihower]
-
-* image_path and image_tag should use /assets if asset pipelining is turned
-on. Closes #3126 [Santiago Pastorino and christos]
-
-* Avoid use of existing precompiled assets during rake assets:precompile run.
-Closes #3119 [Guillermo Iguaran]
-
-* Copy assets to nondigested filenames too [Santiago Pastorino]
-
-* Give precedence to `config.digest = false` over the existence of
-manifest.yml asset digests [christos]
-
-* escape options for the stylesheet_link_tag method [Alexey Vakhov]
-
-* Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so
-it works on Windows [cablegram]
-
-* env var passed to process shouldn't be modified in process method. [Santiago
-Pastorino]
-
-* `rake assets:precompile` loads the application but does not initialize
-it.
-
-  To the app developer, this means configuration add in
-	config/initializers/* will not be executed.
-
-  Plugins developers need to special case their initializers that are
-  meant to be run in the assets group by adding :group => :assets. [José Valim]
-
-* Sprockets uses config.assets.prefix for asset_path [asee]
-
-* FileStore key_file_path properly limit filenames to 255 characters. [phuibonhoa]
-
-* Fix Hash#to_query edge case with html_safe strings. [brainopia]
-
-* Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.
-Useful for linking assets from static html files or from emails when the user
-could probably look at an older html email with an older asset. [Santiago Pastorino]
-
-* Don't mount Sprockets server at config.assets.prefix if config.assets.compile is false. [Mark J. Titorenko]
-
-* Set relative url root in assets when controller isn't available for Sprockets (eg. Sass files using asset_path). Fixes #2435 [Guillermo Iguaran]
-
-* Fix basic auth credential generation to not make newlines. GH #2882
-
-* Fixed the behavior of asset pipeline when config.assets.digest and config.assets.compile are false and requested asset isn't precompiled.
-  Before the requested asset were compiled anyway ignoring that the config.assets.compile flag is false. [Guillermo Iguaran]
-
-* CookieJar is now Enumerable. Fixes #2795
-
-* Fixed AssetNotPrecompiled error raised when rake assets:precompile is compiling certain .erb files. See GH #2763 #2765 #2805 [Guillermo Iguaran]
-
-* Manifest is correctly placed in assets path when default assets prefix is changed. Fixes #2776 [Guillermo Iguaran]
-
-* Fixed stylesheet_link_tag and javascript_include_tag to respect additional options passed by the users when debug is on. [Guillermo Iguaran]
-
-
-*Rails 3.1.0 (August 30, 2011)*
-
-* Param values are `paramified` in controller tests. [David Chelimsky]
-
-* x_sendfile_header now defaults to nil and config/environments/production.rb doesn't set a particular value for it. This allows servers to set it through X-Sendfile-Type. [Santiago Pastorino]
-
-* The submit form helper does not generate an id "object_name_id" anymore. [fbrusatti]
-
-* Make sure respond_with with :js tries to render a template in all cases [José Valim]
-
-* json_escape will now return a SafeBuffer string if it receives SafeBuffer string [tenderlove]
-
-* Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist]
-
-* Fix escape_js to work correctly with the new SafeBuffer restriction [Paul Gallagher]
-
-* Brought back alternative convention for namespaced models in i18n [thoefer]
-
-  Now the key can be either "namespace.model" or "namespace/model" until further deprecation.
-
-* It is prohibited to perform a in-place SafeBuffer mutation [tenderlove]
-
-  The old behavior of SafeBuffer allowed you to mutate string in place via
-  method like `sub!`. These methods can add unsafe strings to a safe buffer,
-  and the safe buffer will continue to be marked as safe.
-
-  An example problem would be something like this:
-
-    <%= link_to('hello world', @user).sub!(/hello/, params[:xss])  %>
-
-  In the above example, an untrusted string (`params[:xss]`) is added to the
-  safe buffer returned by `link_to`, and the untrusted content is successfully
-  sent to the client without being escaped.  To prevent this from happening
-  `sub!` and other similar methods will now raise an exception when they are called on a safe buffer.
-
-  In addition to the in-place versions, some of the versions of these methods which return a copy of the string will incorrectly mark strings as safe. For example:
-
-     <%= link_to('hello world', @user).sub(/hello/, params[:xss]) %>
-
-  The new versions will now ensure that *all* strings returned by these methods on safe buffers are marked unsafe.
-
-  You can read more about this change in http://groups.google.com/group/rubyonrails-security/browse_thread/thread/2e516e7acc96c4fb
-
-* Warn if we cannot verify CSRF token authenticity [José Valim]
-
-* Allow AM/PM format in datetime selectors [Aditya Sanghi]
-
-* Only show dump of regular env methods on exception screen (not all the rack crap) [DHH]
-
-* auto_link has been removed with no replacement.  If you still use auto_link
-  please install the rails_autolink gem:
-    http://github.com/tenderlove/rails_autolink
-
-  [tenderlove]
-
-* Added streaming support, you can enable it with: [José Valim]
-
-    class PostsController < ActionController::Base
-      stream :only => :index
-    end
-
-  Please read the docs at `ActionController::Streaming` for more information.
-
-* Added `ActionDispatch::Request.ignore_accept_header` to ignore accept headers and only consider the format given as parameter [José Valim]
-
-* Created `ActionView::Renderer` and specified an API for `ActionView::Context`, check those objects for more information [José Valim]
-
-* Added `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default [Prem Sichanugrist]
-
-  This can be customized by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
-
-* RJS has been extracted out to a gem. [fxn]
-
-* Implicit actions named not_implemented can be rendered. [Santiago Pastorino]
-
-* Wildcard route will always match the optional format segment by default. [Prem Sichanugrist]
-
-  For example if you have this route:
-
-    match '*pages' => 'pages#show'
-
-  by requesting '/foo/bar.json', your `params[:pages]` will be equals to "foo/bar" with the request format of JSON. If you want the old 3.0.x behavior back, you could supply `:format => false` like this:
-
-    match '*pages' => 'pages#show', :format => false
-
-* Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH]
-
-    class PostsController < ApplicationController
-      USER_NAME, PASSWORD = "dhh", "secret"
-
-      before_filter :authenticate, :except => [ :index ]
-
-      def index
-        render :text => "Everyone can see me!"
-      end
-
-      def edit
-        render :text => "I'm only accessible if you know the password"
-      end
-
-      private
-        def authenticate
-          authenticate_or_request_with_http_basic do |user_name, password|
-            user_name == USER_NAME && password == PASSWORD
-          end
-        end
-    end
-
-  ..can now be written as
-
-    class PostsController < ApplicationController
-      http_basic_authenticate_with :name => "dhh", :password => "secret", :except => :index
-
-      def index
-        render :text => "Everyone can see me!"
-      end
-
-      def edit
-        render :text => "I'm only accessible if you know the password"
-      end
-    end
-
-* Allow you to add `force_ssl` into controller to force browser to transfer data via HTTPS protocol on that particular controller. You can also specify `:only` or `:except` to specific it to particular action. [DHH and Prem Sichanugrist]
-
-* Allow FormHelper#form_for to specify the :method as a direct option instead of through the :html hash [DHH]
-
-    form_for(@post, remote: true, method: :delete) instead of form_for(@post, remote: true, html: { method: :delete })
-
-* Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -- note this then supersedes the Object#j() method that the JSON gem adds within templates using the JavaScriptHelper [DHH]
-
-* Sensitive query string parameters (specified in config.filter_parameters) will now be filtered out from the request paths in the log file. [Prem Sichanugrist, fxn]
-
-* URL parameters which return false for to_param now appear in the query string (previously they were removed) [Andrew White]
-
-* URL parameters which return nil for to_param are now removed from the query string [Andrew White]
-
-* ActionDispatch::MiddlewareStack now uses composition over inheritance. It is
-no longer an array which means there may be methods missing that were not
-tested.
-
-* Add an :authenticity_token option to form_tag for custom handling or to omit the token (pass :authenticity_token => false).  [Jakub Kuźma, Igor Wiedler]
-
-* HTML5 button_tag helper. [Rizwan Reza]
-
-* Template lookup now searches further up in the inheritance chain. [Artemave]
-
-* Brought back config.action_view.cache_template_loading, which allows to decide whether templates should be cached or not. [Piotr Sarnacki]
-
-* url_for and named url helpers now accept :subdomain and :domain as options, [Josh Kalderimis]
-
-* The redirect route method now also accepts a hash of options which will only change the parts of the url in question, or an object which responds to call, allowing for redirects to be reused (check the documentation for examples). [Josh Kalderimis]
-
-* Added config.action_controller.include_all_helpers. By default 'helper :all' is done in ActionController::Base, which includes all the helpers by default. Setting include_all_helpers to false will result in including only application_helper and helper corresponding to controller (like foo_helper for foo_controller). [Piotr Sarnacki]
-
-* Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a :data hash of options:
-
-    tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
-    # => <div data-name="Stephen" data-city-state="[&quot;Chicago&quot;,&quot;IL&quot;]" />
-
-  Keys are dasherized. Values are JSON-encoded, except for strings and symbols. [Stephen Celis]
-
-* Deprecate old template handler API. The new API simply requires a template handler to respond to call. [José Valim]
-
-* :rhtml and :rxml were finally removed as template handlers. [José Valim]
-
-* Moved etag responsibility from ActionDispatch::Response to the middleware stack. [José Valim]
-
-* Rely on Rack::Session stores API for more compatibility across the Ruby world. This is backwards incompatible since Rack::Session expects #get_session to accept 4 arguments and requires #destroy_session instead of simply #destroy. [José Valim]
-
-* file_field automatically adds :multipart => true to the enclosing form. [Santiago Pastorino]
-
-* Renames csrf_meta_tag -> csrf_meta_tags, and aliases csrf_meta_tag for backwards compatibility. [fxn]
-
-* Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. [Yehuda Katz, Carl Lerche]
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-*No changes.
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* Fixed XSS vulnerability in `auto_link`.  `auto_link` no longer marks input as
-  html safe.  Please make sure that calls to auto_link() are wrapped in a
-  sanitize(), or a raw() depending on the type of input passed to auto_link().
-  For example:
-
-    <%= sanitize(auto_link(some_user_input)) %>
-
-  Thanks to Torben Schulz for reporting this.  The fix can be found here:
-  61ee3449674c591747db95f9b3472c5c3bd9e84d
-
-* Fixes the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default [Prem Sichanugrist]
-
-* Fixes an issue with number_to_human when converting values which are less than 1 but greater than -1 [Josh Kalderimis]
-
-* Sensitive query string parameters (specified in config.filter_parameters) will now be filtered out from the request paths in the log file. [Prem Sichanugrist, fxn]
-
-* URL parameters which return nil for to_param are now removed from the query string [Andrew White]
-
-* Don't allow i18n to change the minor version, version now set to ~> 0.5.0 [Santiago Pastorino]
-
-* Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0 [Sven Fuchs]
-
-* Fix regression: javascript_include_tag shouldn't raise if you register an expansion key with nil or [] value [Santiago Pastorino]
-
-* Fix Action caching bug where an action that has a non-cacheable response always renders a nil response body. It now correctly renders the response body. [Cheah Chu Yeow]
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* When ActiveRecord::Base objects are sent to predicate methods, the id of the object should be sent to ARel, not the ActiveRecord::Base object.
-
-* :constraints routing should only do sanity checks against regular expressions.  String arguments are OK.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* password_field renders with nil value by default making the use of passwords secure by default, if you want to render you should do for instance f.password_field(:password, :value => @user.password) [Santiago Pastorino]
-
-* Symbols and strings in routes should yield the same behavior. Note this may break existing apps that were using symbols with the new routes API. [José Valim]
-
-* Add clear_helpers as a way to clean up all helpers added to this controller, maintaining just the helper with the same name as the controller. [José Valim]
-
-* Support routing constraints in functional tests. [Andrew White]
-
-* Add a header that tells Internet Explorer (all versions) to use the best available standards support. [Yehuda Katz]
-
-* Allow stylesheet/javascript extensions to be changed through railties. [Josh Kalderimis]
-
-* link_to, button_to, and tag/tag_options now rely on html_escape instead of escape_once. [fxn]
-
-* url_for returns always unescaped strings, and the :escape option is gone. [fxn]
-
-* Added accept-charset parameter and _snowman hidden field to force the contents
-  of Rails POSTed forms to be in UTF-8 [Yehuda Katz]
-
-* Upgrade to Rack 1.2.1 [Jeremy Kemper]
-
-* Allow :path to be given to match/get/post/put/delete instead of :path_names in the new router [Carlos Antônio da Silva]
-
-* Added resources_path_names to the new router DSL [José Valim]
-
-* Allow options to be given to the namespace method in the new router [Carlos Antônio da Silva]
-
-* Deprecate :name_prefix in the new router DSL [José Valim]
-
-* Add shallow routes back to the new router [Diego Carrion, Andrew White]
-
-    resources :posts do
-      shallow do
-        resources :comments
-      end
-    end
-
-    You can now use comment_path for /comments/1 instead of post_comment_path for /posts/1/comments/1.
-
-* Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. #4818 [Guillermo Álvarez]
-
-* Removed textilize, textilize_without_paragraph and markdown helpers. [Santiago Pastorino]
-
-* Remove middleware laziness [José Valim]
-
-* Make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean. [José Valim]
-
-* OAuth 2: HTTP Token Authorization support to complement Basic and Digest Authorization.  [Rick Olson]
-
-* Fixed inconsistencies in form builder and view helpers #4432 [Neeraj Singh]
-
-* Both :xml and :json renderers now forwards the given options to the model, allowing you to invoke them as render :xml => @projects, :include => :tasks [José Valim, Yehuda Katz]
-
-* Renamed the field error CSS class from fieldWithErrors to field_with_errors for consistency.  [Jeremy Kemper]
-
-* Add support for shorthand routes like /projects/status(.:format)  #4423 [Diego Carrion]
-
-* Changed translate helper so that it doesn’t mark every translation as safe HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. [Craig Davey]
-
-* New option :as added to form_for allows to change the object name. The old <% form_for :client, @post %> becomes <% form_for @post, :as => :client %> [spastorino]
-
-* Removed verify method in controllers. [JV]
-  It's now available as a plugin at http://github.com/rails/verification
-
-* Removed input, form, error_messages_for and error_message_on from views. [JV]
-  It's now available as a plugin at http://github.com/rails/dynamic_form
-
-* Routes can be scoped by controller module. [Jeremy Kemper]
-
-    # /session => Auth::SessionsController
-    scope :module => 'auth' do
-      resource :session
-    end
-
-* Added #favicon_link_tag, it uses #image_path so in particular the favicon gets an asset ID [fxn]
-
-* Fixed that default locale templates should be used if the current locale template is missing [DHH]
-
-* Added all the new HTML5 form types as individual form tag methods (search, url, number, etc) #3646 [Stephen Celis]
-
-* Changed the object used in routing constraints to be an instance of
-  ActionDispatch::Request rather than Rack::Request [YK]
-
-* Changed ActionDispatch::Request#method to return a String, to be compatible
-  with Rack::Request. Added ActionDispatch::Request#method_symbol to
-  return a symbol form of the request method. [YK]
-
-* Changed ActionDispatch::Request#method to return the original
-  method and #request_method to return the overridden method in the
-  case of methodoverride being used (this means that #method returns
-  "HEAD" and #request_method returns "GET" in HEAD requests). This
-  is for compatibility with Rack::Request [YK]
-
-* #concat is now deprecated in favor of using <%= %> helpers [YK]
-
-* Block helpers now return Strings, so you can use <%= form_for @foo do |f| %>.
-  <% form_for do |f| %> still works with deprecation notices [YK]
-
-* Add a new #mount method on the router that does not anchor the PATH_INFO
-  at the end [YK & CL]
-
-* Create a new LookupContext object that is responsible for performantly
-  finding a template for a given pattern [JV]
-
-* Removed relative_url_for in favor of respecting SCRIPT_NAME [YK & CL]
-
-* Changed file streaming to use Rack::Sendfile middleware [YK]
-
-* ActionDispatch::Request#content_type returns a String to be compatible with
-  Rack::Request. Use #content_mime_type for the Mime::Type instance [YK]
-
-* Updated Prototype to 1.6.1 and Scriptaculous to 1.8.3 [ML]
-
-* Change the preferred way that URL helpers are included into a class[YK & CL]
-
-    # for all helpers including named routes
-    include Rails.application.router.url_helpers
-
-    # for just url_for
-    include Rails.application.router.url_for
-
-* Fixed that PrototypeHelper#update_page should return html_safe [DHH]
-
-* Fixed that much of DateHelper wouldn't return html_safe? strings [DHH]
-
-* Fixed that fragment caching should return a cache hit as html_safe (or it would all just get escaped) [DHH]
-
-* Added that ActionController::Base now does helper :all instead of relying on the default ApplicationController in Rails to do it [DHH]
-
-* Added ActionDispatch::Request#authorization to access the http authentication header regardless of its proxy hiding [DHH]
-
-* Added :alert, :notice, and :flash as options to ActionController::Base#redirect_to that'll automatically set the proper flash before the redirection [DHH]. Examples:
-
-    flash[:notice] = 'Post was created'
-    redirect_to(@post)
-
-  ...becomes:
-
-    redirect_to(@post, :notice => 'Post was created')
-
-* Added ActionController::Base#notice/= and ActionController::Base#alert/= as a convenience accessors in both the controller and the view for flash[:notice]/= and flash[:alert]/= [DHH]
-
-
-* Introduce grouped_collection_select helper.  #1249 [Dan Codeape, Erik Ostrom]
-
-* Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" or ".css" onto external urls. #1664 [Matthew Rudy Jacobs]
-
-* Ruby 1.9: fix Content-Length for multibyte send_data streaming.  #2661 [Sava Chankov]
-
-* Ruby 1.9: ERB template encoding using a magic comment at the top of the file.  [Jeremy Kemper]
-    <%# encoding: utf-8 %>
-
-* Change integration test helpers to accept Rack environment instead of just HTTP Headers [Pratik Naik]
-
-  Before :  get '/path', {}, 'Accept' => 'text/javascript'
-  After  :  get '/path', {}, 'HTTP_ACCEPT' => 'text/javascript'
-
-* Instead of checking Rails.env.test? in Failsafe middleware, check env["rails.raise_exceptions"] [Bryan Helmkamp]
-
-* Fixed that TestResponse.cookies was returning cookies unescaped #1867 [Doug McInnes]
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* Fixed that redirection would just log the options, not the final url (which lead to "Redirected to #<Post:0x23150b8>") [DHH]
-
-* Don't check authenticity tokens for any AJAX requests [Ross Kaffenberger/Bryan Helmkamp]
-
-* Added ability to pass in :public => true to fresh_when, stale?, and expires_in to make the request proxy cachable #2095 [Gregg Pollack]
-
-* Fixed that passing a custom form builder would be forwarded to nested fields_for calls #2023 [Eloy Duran/Nate Wiger]
-
-* Form option helpers now support disabled option tags and the use of lambdas for selecting/disabling option tags from collections #837 [Tekin]
-
-* Added partial scoping to TranslationHelper#translate, so if you call translate(".foo") from the people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo") [DHH]
-
-* Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters #1385, #1868 [chris finne/Andrew White]
-
-* Added localized rescue template when I18n.locale is set (ex: public/404.da.html) #1835 [José Valim]
-
-* Make the form_for and fields_for helpers support the new Active Record nested update options.  #1202 [Eloy Duran]
-
-		<% form_for @person do |person_form| %>
-		  ...
-		  <% person_form.fields_for :projects do |project_fields| %>
-		    <% if project_fields.object.active? %>
-		      Name: <%= project_fields.text_field :name %>
-		    <% end %>
-		  <% end %>
-		<% end %>
-
-
-* Added grouped_options_for_select helper method for wrapping option tags in optgroups. #977 [Jon Crawford]
-
-* Implement HTTP Digest authentication. #1230 [Gregg Kellogg, Pratik Naik] Example :
-
-  class DummyDigestController < ActionController::Base
-    USERS = { "lifo" => 'world' }
-
-    before_filter :authenticate
-
-    def index
-      render :text => "Hello Secret"
-    end
-
-    private
-
-    def authenticate
-      authenticate_or_request_with_http_digest("Super Secret") do |username|
-        # Return the user's password
-        USERS[username]
-      end
-    end
-  end
-
-* Improved i18n support for the number_to_human_size helper. Changes the storage_units translation data; update your translations accordingly.  #1634 [Yaroslav Markin]
-    storage_units:
-      # %u is the storage unit, %n is the number (default: 2 MB)
-      format: "%n %u"
-      units:
-        byte:
-          one: "Byte"
-          other: "Bytes"
-        kb: "KB"
-        mb: "MB"
-        gb: "GB"
-        tb: "TB"
-
-* Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use [DHH]
-
-* Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string #1299 [DHH]
-
-* Make ActionController#render(string) work as a shortcut for render :file/:template/:action => string. [#1435] [Pratik Naik] Examples:
-
-  # Instead of render(:action => 'other_action')
-  render('other_action') # argument has no '/'
-  render(:other_action)
-
-  # Instead of render(:template => 'controller/action')
-  render('controller/action') # argument must not begin with a '/', but contain a '/'
-
-  # Instead of render(:file => '/Users/lifo/home.html.erb')
-  render('/Users/lifo/home.html.erb') # argument must begin with a '/'
-
-* Add :prompt option to date/time select helpers. #561 [Sam Oliver]
-
-* Fixed that send_file shouldn't set an etag #1578 [Hongli Lai]
-
-* Allow users to opt out of the spoofing checks in Request#remote_ip.  Useful for sites whose traffic regularly triggers false positives. [Darren Boyd]
-
-* Deprecated formatted_polymorphic_url.  [Jeremy Kemper]
-
-* Added the option to declare an asset_host as an object that responds to call (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [David Heinemeier Hansson]
-
-* Added support for multiple routes.rb files (useful for plugin engines). This also means that draw will no longer clear the route set, you have to do that by hand (shouldn't make a difference to you unless you're doing some funky stuff) [David Heinemeier Hansson]
-
-* Dropped formatted_* routes in favor of just passing in :format as an option. This cuts resource routes generation in half #1359 [aaronbatalion]
-
-* Remove support for old double-encoded cookies from the cookie store.  These values haven't been generated since before 2.1.0, and any users who have visited the app in the intervening 6 months will have had their cookie upgraded. [Michael Koziarski]
-
-* Allow helpers directory to be overridden via ActionController::Base.helpers_dir #1424 [Sam Pohlenz]
-
-* Remove deprecated ActionController::Base#assign_default_content_type_and_charset
-
-* Changed the default of ActionView#render to assume partials instead of files when not given an options hash [David Heinemeier Hansson]. Examples:
-
-    # Instead of <%= render :partial => "account" %>
-    <%= render "account" %>
-
-    # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
-    <%= render "account", :account => @buyer %>
-
-    # @account is an Account instance, so it uses the RecordIdentifier to replace
-    # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
-    <%= render(@account) %>
-
-    # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
-    # <%= render :partial => "posts/post", :collection => @posts %>
-    <%= render(@posts) %>
-
-* Remove deprecated render_component. Please use the plugin from http://github.com/rails/render_component/tree/master [Pratik Naik]
-
-* Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they're available if you want to use textilize and markdown and let autoload require them [David Heinemeier Hansson]
-
-
-*2.2.2 (November 21st, 2008)*
-
-* I18n: translate number_to_human_size. Add storage_units: [Bytes, KB, MB, GB, TB] to your translations.  #1448 [Yaroslav Markin]
-
-* Restore backwards compatible functionality for setting relative_url_root.  Include deprecation
-
-* Switched the CSRF module to use the request content type to decide if the request is forgeable.  #1145 [Jeff Cohen]
-
-* Added :only and :except to map.resources to let people cut down on the number of redundant routes in an application. Typically only useful for huge routesets.  #1215 [Tom Stuart]
-
-   map.resources :products, :only => :show do |product|
-     product.resources :images, :except => :destroy
-   end
-
-* Added render :js for people who want to render inline JavaScript replies without using RJS [David Heinemeier Hansson]
-
-* Fixed that polymorphic_url should compact given array #1317 [hiroshi]
-
-* Fixed the sanitize helper to avoid double escaping already properly escaped entities #683 [antonmos/Ryan McGeary]
-
-* Fixed that FormTagHelper generated illegal html if name contained square brackets #1238 [Vladimir Dobriakov]
-
-* Fix regression bug that made date_select and datetime_select raise a Null Pointer Exception when a nil date/datetime was passed and only month and year were displayed #1289 [Bernardo Padua/Tor Erik]
-
-* Simplified the logging format for parameters (don't include controller, action, and format as duplicates) [David Heinemeier Hansson]
-
-* Remove the logging of the Session ID when the session store is CookieStore [David Heinemeier Hansson]
-
-* Fixed regex in redirect_to to fully support URI schemes #1247 [Seth Fitzsimmons]
-
-* Fixed bug with asset timestamping when using relative_url_root #1265 [Joe Goldwasser]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* Fix incorrect closing CDATA delimiter and that HTML::Node.parse would blow up on unclosed CDATA sections [packagethief]
-
-* Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [David Heinemeier Hansson]. Example:
-
-    class ArticlesController < ApplicationController
-      def show_with_respond_to_block
-        @article = Article.find(params[:id])
-
-
-        # If the request sends headers that differs from the options provided to stale?, then
-        # the request is indeed stale and the respond_to block is triggered (and the options
-        # to the stale? call is set on the response).
-        #
-        # If the request headers match, then the request is fresh and the respond_to block is
-        # not triggered. Instead the default render will occur, which will check the last-modified
-        # and etag headers and conclude that it only needs to send a "304 Not Modified" instead
-        # of rendering the template.
-        if stale?(:last_modified => @article.published_at.utc, :etag => @article)
-          respond_to do |wants|
-            # normal response processing
-          end
-        end
-      end
-
-      def show_with_implied_render
-        @article = Article.find(params[:id])
-
-        # Sets the response headers and checks them against the request, if the request is stale
-        # (i.e. no match of either etag or last-modified), then the default render of the template happens.
-        # If the request is fresh, then the default render will return a "304 Not Modified"
-        # instead of rendering the template.
-        fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
-      end
-    end
-
-
-* Added inline builder yield to atom_feed_helper tags where appropriate [Sam Ruby]. Example:
-
-    entry.summary :type => 'xhtml' do |xhtml|
-      xhtml.p pluralize(order.line_items.count, "line item")
-      xhtml.p "Shipped to #{order.address}"
-      xhtml.p "Paid by #{order.pay_type}"
-    end
-
-* Make PrototypeHelper#submit_to_remote a wrapper around PrototypeHelper#button_to_remote. [Tarmo Tänav]
-
-* Set HttpOnly for the cookie session store's cookie.  #1046
-
-* Added FormTagHelper#image_submit_tag confirm option #784 [Alastair Brunton]
-
-* Fixed FormTagHelper#submit_tag with :disable_with option wouldn't submit the button's value when was clicked #633 [Jose Fernandez]
-
-* Stopped logging template compiles as it only clogs up the log [David Heinemeier Hansson]
-
-* Changed the X-Runtime header to report in milliseconds [David Heinemeier Hansson]
-
-* Changed BenchmarkHelper#benchmark to report in milliseconds [David Heinemeier Hansson]
-
-* Changed logging format to be millisecond based and skip misleading stats [David Heinemeier Hansson]. Went from:
-
-    Completed in 0.10000 (4 reqs/sec) | Rendering: 0.04000 (40%) | DB: 0.00400 (4%) | 200 OK [http://example.com]
-
-  ...to:
-
-    Completed in 100ms (View: 40, DB: 4) | 200 OK [http://example.com]
-
-* Add support for shallow nesting of routes. #838 [S. Brent Faulkner]
-
-  Example :
-
-  map.resources :users, :shallow => true do |user|
-    user.resources :posts
-  end
-
-  - GET /users/1/posts (maps to PostsController#index action as usual)
-    named route "user_posts" is added as usual.
-
-  - GET /posts/2 (maps to PostsController#show action as if it were not nested)
-    Additionally, named route "post" is added too.
-
-* Added button_to_remote helper.  #3641 [Donald Piret, Tarmo Tänav]
-
-* Deprecate render_component. Please use render_component plugin from http://github.com/rails/render_component/tree/master [Pratik Naik]
-
-* Routes may be restricted to lists of HTTP methods instead of a single method or :any.  #407 [Brennan Dunn, Gaius Centus Novus]
-    map.resource :posts, :collection => { :search => [:get, :post] }
-    map.session 'session', :requirements => { :method => [:get, :post, :delete] }
-
-* Deprecated implicit local assignments when rendering partials [Josh Peek]
-
-* Introduce current_cycle helper method to return the current value without bumping the cycle.  #417 [Ken Collins]
-
-* Allow polymorphic_url helper to take url options. #880 [Tarmo Tänav]
-
-* Switched integration test runner to use Rack processor instead of CGI [Josh Peek]
-
-* Made AbstractRequest.if_modified_sense return nil if the header could not be parsed [Jamis Buck]
-
-* Added back ActionController::Base.allow_concurrency flag [Josh Peek]
-
-* AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root [Josh Peek]
-
-* Update Prototype to 1.6.0.2 #599 [Patrick Joyce]
-
-* Conditional GET utility methods.  [Jeremy Kemper]
-    response.last_modified = @post.updated_at
-    response.etag = [:admin, @post, current_user]
-
-    if request.fresh?(response)
-      head :not_modified
-    else
-      # render ...
-    end
-
-* All 2xx requests are considered successful [Josh Peek]
-
-* Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run [David Heinemeier Hansson]
-
-* Removed config.action_view.cache_template_loading, use config.cache_classes instead [Josh Peek]
-
-* Get buffer for fragment cache from template's @output_buffer [Josh Peek]
-
-* Set config.action_view.warn_cache_misses = true to receive a warning if you perform an action that results in an expensive disk operation that could be cached [Josh Peek]
-
-* Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class [Josh Peek]
-
-* Changed ActionView::TemplateHandler#render API method signature to render(template, local_assigns = {}) [Josh Peek]
-
-* Changed PrototypeHelper#submit_to_remote to PrototypeHelper#button_to_remote to stay consistent with link_to_remote (submit_to_remote still works as an alias) #8994 [clemens]
-
-* Add :recursive option to javascript_include_tag and stylesheet_link_tag to be used along with :all. #480 [Damian Janowski]
-
-* Allow users to disable the use of the Accept header [Michael Koziarski]
-
-    The accept header is poorly implemented by browsers and causes strange
-	errors when used on public sites where crawlers make requests too.  You
-	can use formatted urls (e.g. /people/1.xml) to support API clients in a
-	much simpler way.
-
-	To disable the header you need to set:
-
-	config.action_controller.use_accept_header = false
-
-* Do not stat template files in production mode before rendering. You will no longer be able to modify templates in production mode without restarting the server [Josh Peek]
-
-* Deprecated TemplateHandler line offset [Josh Peek]
-
-* Allow caches_action to accept cache store options. #416. [José Valim]. Example:
-
-  caches_action :index, :redirected, :if => Proc.new { |c| !c.request.format.json? }, :expires_in => 1.hour
-
-* Remove define_javascript_functions, javascript_include_tag and friends are far superior. [Michael Koziarski]
-
-* Deprecate :use_full_path render option. The supplying the option no longer has an effect [Josh Peek]
-
-* Add :as option to render a collection of partials with a custom local variable name. #509 [Simon Jefford, Pratik Naik]
-
-  render :partial => 'other_people', :collection => @people, :as => :person
-
-  This will let you access objects of @people as 'person' local variable inside 'other_people' partial template.
-
-* time_zone_select: support for regexp matching of priority zones. Resolves #195 [Ernie Miller]
-
-* Made ActionView::Base#render_file private [Josh Peek]
-
-* Refactor and simplify the implementation of assert_redirected_to.  Arguments are now normalised relative to the controller being tested,  not the root of the application.  [Michael Koziarski]
-
-  This could cause some erroneous test failures if you were redirecting between controllers
-  in different namespaces and wrote your assertions relative to the root of the application.
-
-* Remove follow_redirect from controller functional tests.
-
-	If you want to follow redirects you can use integration tests.  The functional test
-	version was only useful if you were using redirect_to :id=>...
-
-* Fix polymorphic_url with singleton resources.  #461 [Tammer Saleh]
-
-* Replaced TemplateFinder abstraction with ViewLoadPaths [Josh Peek]
-
-* Added block-call style to link_to [Sam Stephenson/David Heinemeier Hansson]. Example:
-
-    <% link_to(@profile) do %>
-      <strong><%= @profile.name %></strong> -- <span>Check it out!!</span>
-    <% end %>
-
-* Performance: integration test benchmarking and profiling.  [Jeremy Kemper]
-
-* Make caching more aware of mime types. Ensure request format is not considered while expiring cache.  [Jonathan del Strother]
-
-* Drop ActionController::Base.allow_concurrency flag [Josh Peek]
-
-* More efficient concat and capture helpers. Remove ActionView::Base.erb_variable.  [Jeremy Kemper]
-
-* Added page.reload functionality. Resolves #277. [Sean Huber]
-
-* Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_FORWARDED_FOR doesn't match (not just if they're both present) [Mark Imbriaco, Bradford Folkens]
-
-* Allow caches_action to accept a layout option [José Valim]
-
-* Added Rack processor [Ezra Zygmuntowicz, Josh Peek]
-
-
-*2.1.0 (May 31st, 2008)*
-
-* InstanceTag#default_time_from_options overflows to DateTime [Geoff Buesing]
-
-* Fixed that forgery protection can be used without session tracking (Peter Jones) [#139]
-
-* Added session(:on) to turn session management back on in a controller subclass if the superclass turned it off (Peter Jones) [#136]
-
-* Change the request forgery protection to go by Content-Type instead of request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" [Rick Olson]
-* InstanceTag#default_time_from_options with hash args uses Time.current as default; respects hash settings when time falls in system local spring DST gap [Geoff Buesing]
-
-* select_date defaults to Time.zone.today when config.time_zone is set [Geoff Buesing]
-
-* Fixed that TextHelper#text_field would corrypt when raw HTML was used as the value (mchenryc, Kevin Glowacz) [#80]
-
-* Added ActionController::TestCase#rescue_action_in_public! to control whether the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) [David Heinemeier Hansson]
-
-* Reduce number of instance variables being copied from controller to view. [Pratik Naik]
-
-* select_datetime and select_time default to Time.zone.now when config.time_zone is set [Geoff Buesing]
-
-* datetime_select defaults to Time.zone.now when config.time_zone is set [Geoff Buesing]
-
-* Remove ActionController::Base#view_controller_internals flag. [Pratik Naik]
-
-* Add conditional options to caches_page method. [Paul Horsfall]
-
-* Move missing template logic to ActionView. [Pratik Naik]
-
-* Introduce ActionView::InlineTemplate class. [Pratik Naik]
-
-* Automatically parse posted JSON content for Mime::JSON requests.  [Rick Olson]
-
-  POST /posts
-  {"post": {"title": "Breaking News"}}
-
-  def create
-    @post = Post.create params[:post]
-    # ...
-  end
-
-* add json_escape ERB util to escape html entities in json strings that are output in HTML pages. [Rick Olson]
-
-* Provide a helper proxy to access helper methods from outside views. Closes #10839 [Josh Peek]
-  e.g. ApplicationController.helpers.simple_format(text)
-
-* Improve documentation. [Xavier Noria, leethal, jerome]
-
-* Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 [Josh Peek, eventualbuddha, Pratik Naik]
-
-* Support render :partial => collection of heterogeneous elements.  #11491 [Zach Dennis]
-
-* Avoid remote_ip spoofing.  [Brian Candler]
-
-* Added support for regexp flags like ignoring case in the :requirements part of routes declarations #11421 [NeilW]
-
-* Fixed that ActionController::Base#read_multipart would fail if boundary was exactly 10240 bytes #10886 [ariejan]
-
-* Fixed HTML::Tokenizer (used in sanitize helper) didn't handle unclosed CDATA tags #10071 [esad, packagethief]
-
-* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
-
-* Fixed that FormHelper#radio_button would produce invalid ids #11298 [harlancrystal]
-
-* Added :confirm option to submit_tag #11415 [Emilio Tagua]
-
-* Fixed NumberHelper#number_with_precision to properly round in a way that works equally on Mac, Windows, Linux (closes #11409, #8275, #10090, #8027) [zhangyuanyi]
-
-* Allow the #simple_format text_helper to take an html_options hash for each paragraph.  #2448 [François Beausoleil, Chris O'Sullivan]
-
-* Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice.  [Rick Olson]
-
-* Refactor filters to use Active Support callbacks.  #11235 [Josh Peek]
-
-* Fixed that polymorphic routes would modify the input array #11363 [thomas.lee]
-
-* Added :format option to NumberHelper#number_to_currency to enable better localization support #11149 [lylo]
-
-* Fixed that TextHelper#excerpt would include one character too many #11268 [Irfy]
-
-* Fix more obscure nested parameter hash parsing bug.  #10797 [thomas.lee]
-
-* Added ActionView::Helpers::register_javascript/stylesheet_expansion to make it easier for plugin developers to inject multiple assets.  #10350 [lotswholetime]
-
-* Fix nested parameter hash parsing bug.  #10797 [thomas.lee]
-
-* Allow using named routes in ActionController::TestCase before any request has been made. Closes #11273 [Eloy Duran]
-
-* Fixed that sweepers defined by cache_sweeper will be added regardless of the perform_caching setting. Instead, control whether the sweeper should be run with the perform_caching setting. This makes testing easier when you want to turn perform_caching on/off [David Heinemeier Hansson]
-
-* Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]
-
-* Better error message for type conflicts when parsing params.  Closes #7962 [spicycode, matt]
-
-* Remove unused ActionController::Base.template_class. Closes #10787 [Pratik Naik]
-
-* Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik Naik]
-
-* Tests for div_for and content_tag_for helpers. Closes #11223 [Chris O'Sullivan]
-
-* Allow file uploads in Integration Tests.  Closes #11091 [RubyRedRick]
-
-* Refactor partial rendering into a PartialTemplate class. [Pratik Naik]
-
-* Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block  [David Heinemeier Hansson]
-
-* Tests for distance_of_time_in_words with TimeWithZone instances. Closes #10914 [Ernesto Jimenez]
-
-* Remove support for multivalued (e.g., '&'-delimited) cookies. [Jamis Buck]
-
-* Fix problem with render :partial collections, records, and locals. #11057 [lotswholetime]
-
-* Added support for naming concrete classes in sweeper declarations [David Heinemeier Hansson]
-
-* Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application.  #10098 [Tim Pope, Chris Kampmeier]
-
-* Fix typo in form_helper documentation.  #10650 [Xavier Shay, Chris Kampmeier]
-
-* Fix bug with setting Request#format= after the getter has cached the value.  #10889 [cch1]
-
-* Correct inconsistencies in RequestForgeryProtection docs.  #11032 [Mislav Marohnić]
-
-* Introduce a Template class to ActionView.  #11024 [Pratik Naik]
-
-* Introduce the :index option for form_for and fields_for to simplify multi-model forms (see http://railscasts.com/episodes/75).  #9883 [rmm5t]
-
-* Introduce map.resources :cards, :as => 'tarjetas' to use a custom resource name in the URL: cards_path == '/tarjetas'.  #10578 [blj]
-
-* TestSession supports indifferent access.  #7372 [tamc, Arsen7, mhackett, julik, jean.helou]
-
-* Make assert_routing aware of the HTTP method used.  #8039 [mpalmer]
-  e.g. assert_routing({ :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" })
-
-* Make map.root accept a single symbol as an argument to declare an alias.  #10818 [bscofield]
-
-  e.g.  map.dashboard '/dashboard', :controller=>'dashboard'
-        map.root      :dashboard
-
-* Handle corner case with image_tag when passed 'messed up' image names. #9018 [Duncan Beevers, mpalmer]
-
-* Add label_tag helper for generating elements. #10802 [DefV]
-
-* Introduce TemplateFinder to handle view paths and lookups.  #10800 [Pratik Naik]
-
-* Performance: optimize route recognition. Large speedup for apps with many resource routes.  #10835 [oleganza]
-
-* Make render :partial recognise form builders and use the _form partial.  #10814 [Damian Janowski]
-
-* Allow users to declare other namespaces when using the atom feed helpers. #10304 [david.calavera]
-
-* Introduce send_file :x_sendfile => true to send an X-Sendfile response header.  [Jeremy Kemper]
-
-* Fixed ActionView::Helpers::ActiveRecordHelper::form for when protect_from_forgery is used #10739 [Jeremy Evans]
-
-* Provide nicer access to HTTP Headers.  Instead of request.env["HTTP_REFERRER"] you can now use request.headers["Referrer"]. [Michael Koziarski]
-
-* UrlWriter respects relative_url_root.  #10748 [Cheah Chu Yeow]
-
-* The asset_host block takes the controller request as an optional second argument. Example: use a single asset host for SSL requests.  #10549 [Cheah Chu Yeow, Peter B, Tom Taylor]
-
-* Support render :text => nil.  #6684 [tjennings, PotatoSalad, Cheah Chu Yeow]
-
-* assert_response failures include the exception message.  #10688 [Seth Rasmussen]
-
-* All fragment cache keys are now by default prefixed with the "views/" namespace [David Heinemeier Hansson]
-
-* Moved the caching stores from ActionController::Caching::Fragments::* to ActiveSupport::Cache::*. If you're explicitly referring to a store, like ActionController::Caching::Fragments::MemoryStore, you need to update that reference with ActiveSupport::Cache::MemoryStore [David Heinemeier Hansson]
-
-* Deprecated ActionController::Base.fragment_cache_store for ActionController::Base.cache_store [David Heinemeier Hansson]
-
-* Made fragment caching in views work for rjs and builder as well #6642 [Dee Zsombor]
-
-* Fixed rendering of partials with layout when done from site layout #9209 [antramm]
-
-* Fix atom_feed_helper to comply with the atom spec.  Closes #10672 [Xavier Shay]
-
-  * The tags created do not contain a date (http://feedvalidator.org/docs/error/InvalidTAG.html)
-  * IDs are not guaranteed unique
-  * A default self link was not provided, contrary to the documentation
-  * NOTE:  This changes tags for existing atom entries, but at least they validate now.
-
-* Correct indentation in tests.  Closes #10671 [Luca Guidi]
-
-* Fix that auto_link looks for ='s in url paths (Amazon urls have them).  Closes #10640 [Brad Greenlee]
-
-* Ensure that test case setup is run even if overridden.  #10382 [Josh Peek]
-
-* Fix HTML Sanitizer to allow trailing spaces in CSS style attributes.  Closes #10566 [wesley.moxam]
-
-* Add :default option to time_zone_select.  #10590 [Matt Aimonetti]
-
-
-*2.0.2* (December 16th, 2007)
-
-* Added delete_via_redirect and put_via_redirect to integration testing #10497 [philodespotos]
-
-* Allow headers['Accept'] to be set by hand when calling xml_http_request #10461 [BMorearty]
-
-* Added OPTIONS to list of default accepted HTTP methods #10449 [holoway]
-
-* Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 [Cheah Chu Yeow]. Example:
-
-    ActionController::Base.asset_host = Proc.new { |source|
-      if source.starts_with?('/images')
-        "http://images.example.com"
-      else
-        "http://assets.example.com"
-      end
-    }
-
-* Fixed that ActionView#file_exists? would be incorrect if @first_render is set #10569 [dbussink]
-
-* Added that Array#to_param calls to_param on all it's elements #10473 [brandon]
-
-* Ensure asset cache directories are automatically created.  #10337 [Josh Peek, Cheah Chu Yeow]
-
-* render :xml and :json preserve custom content types.  #10388 [jmettraux, Cheah Chu Yeow]
-
-* Refactor Action View template handlers.  #10437, #10455 [Josh Peek]
-
-* Fix DoubleRenderError message and leave out mention of returning false from filters.  Closes #10380 [Frederick Cheung]
-
-* Clean up some cruft around ActionController::Base#head.  Closes #10417 [ssoroka]
-
-
-*2.0.1* (December 7th, 2007)
-
-* Fixed send_file/binary_content for testing #8044 [tolsen]
-
-* When a NonInferrableControllerError is raised, make the proposed fix clearer in the error message. Closes #10199 [Jack Danger Canty]
-
-* Update Prototype to 1.6.0.1.  [sam]
-
-* Update script.aculo.us to 1.8.0.1.  [madrobby]
-
-* Add 'disabled' attribute to <OPTION> separators used in time zone and country selects.  Closes #10354 [Josh Susser]
-
-* Added the same record identification guessing rules to fields_for as form_for has [David Heinemeier Hansson]
-
-* Fixed that verification violations with no specified action didn't halt the chain (now they do with a 400 Bad Request) [David Heinemeier Hansson]
-
-* Raise UnknownHttpMethod exception for unknown HTTP methods. Closes #10303 [Tarmo Tänav]
-
-* Update to Prototype -r8232.  [sam]
-
-* Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. [pager, Michael Koziarski] #10292
-
-* Added protection from trailing slashes on page caching #10229 [devrieda]
-
-* Asset timestamps are appended, not prepended. Closes #10276 [Mike Naberezny]
-
-* Minor inconsistency in description of render example. Closes #10029 [ScottSchram]
-
-* Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods.  [Rick Olson]
-
-* Refactor sanitizer helpers into HTML classes and make it easy to swap them out with custom implementations.  Closes #10129.  [Rick Olson]
-
-* Add deprecation for old subtemplate syntax for ActionMailer templates, use render :partial [Rick Olson]
-
-* Fix TemplateError so it doesn't bomb on exceptions while running tests [Rick Olson]
-
-* Fixed that named routes living under resources shouldn't have double slashes #10198 [Isaac Feliu]
-
-* Make sure that cookie sessions use a secret that is at least 30 chars in length. [Michael Koziarski]
-
-* Fixed that partial rendering should look at the type of the first render to determine its own type if no other clues are available (like when using text.plain.erb as the extension in AM) #10130 [java]
-
-* Fixed that has_many :through associations should render as collections too #9051 [mathie/Jack Danger Canty]
-
-* Added :mouseover short-cut to AssetTagHelper#image_tag for doing easy image swaps #6893 [joost]
-
-* Fixed handling of non-domain hosts #9479 [purp]
-
-* Fix syntax error in documentation example for cycle method. Closes #8735 [foca]
-
-* Document :with option for link_to_remote. Closes #8765 [Ryan Bates]
-
-* Document :minute_step option for time_select. Closes #8814 [brupm]
-
-* Explain how to use the :href option for link_to_remote to degrade gracefully in the absence of JavaScript. Closes #8911 [vlad]
-
-* Disambiguate :size option for text area tag. Closes #8955 [redbeard]
-
-* Fix broken tag in assert_tag documentation. Closes #9037 [mfazekas]
-
-* Add documentation for route conditions. Closes #9041 [innu, Manfred Stienstra]
-
-* Fix typo left over from previous typo fix in url helper. Closes #9414 [Henrik N]
-
-* Fixed that ActionController::CgiRequest#host_with_port() should handle standard port #10082 [moro]
-
-* Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.  [sam, madrobby]
-
-* Expose the cookie jar as a helper method (before the view would just get the raw cookie hash) [David Heinemeier Hansson]
-
-* Integration tests: get_ and post_via_redirect take a headers hash.  #9130 [simonjefford]
-
-* Simplfy #view_paths implementation.  ActionView templates get the exact object, not a dup.  [Rick Olson]
-
-* Update tests for ActiveSupport's JSON escaping change.  [Rick Olson]
-
-* FormHelper's auto_index should use #to_param instead of #id_before_type_cast.  Closes #9994 [mattly]
-
-* Doc typo fixes for ActiveRecordHelper. Closes #9973 [mikong]
-
-* Make example parameters in restful routing docs idiomatic. Closes #9993 [Jack Danger Canty]
-
-* Make documentation comment for mime responders match documentation example.  Closes #9357 [yon]
-
-* Introduce a new test case class for functional tests.  ActionController::TestCase. [Michael Koziarski]
-
-* Fix incorrect path in helper rdoc. Closes #9926 [viktor tron]
-
-* Partials also set 'object' to the default partial variable.  #8823 [Nick Retallack, Jeremy Kemper]
-
-* Request profiler.  [Jeremy Kemper]
-    $ cat login_session.rb
-    get_with_redirect '/'
-    say "GET / => #{path}"
-    post_with_redirect '/sessions', :username => 'john', :password => 'doe'
-    say "POST /sessions => #{path}"
-    $ ./script/performance/request -n 10 login_session.rb
-
-* Disabled checkboxes don't submit a form value.  #9301 [vladr, robinjfisher]
-
-* Added tests for options to ActiveRecordHelper#form. Closes #7213 [richcollins, mikong, Mislav Marohnić]
-
-* Changed before_filter halting to happen automatically on render or redirect but no longer on simply returning false [David Heinemeier Hansson]
-
-* Ensure that cookies handle array values correctly.  Closes #9937 [queso]
-
-* Make sure resource routes don't clash with internal helpers like javascript_path, image_path etc.  #9928 [Geoff Buesing]
-
-* caches_page uses a single after_filter instead of one per action.  #9891 [Pratik Naik]
-
-* Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0.  [sam, madrobby]
-
-* Dispatcher: fix that to_prepare should only run once in production.  #9889 [Nathaniel Talbott]
-
-* Memcached sessions: add session data on initialization; don't silently discard exceptions; add unit tests.  #9823 [kamk]
-
-* error_messages_for also takes :message and :header_message options which defaults to the old "There were problems with the following fields:" and "<count> errors prohibited this <object_name> from being saved".  #8270 [rmm5t, zach-inglis-lt3]
-
-* Make sure that custom inflections are picked up by map.resources.  #9815 [Mislav Marohnić]
-
-* Changed SanitizeHelper#sanitize to only allow the custom attributes and tags when specified in the call [David Heinemeier Hansson]
-
-* Extracted sanitization methods from TextHelper to SanitizeHelper [David Heinemeier Hansson]
-
-* rescue_from accepts :with => lambda { |exception| ... } or a normal block.  #9827 [Pratik Naik]
-
-* Add :status to redirect_to allowing users to choose their own response code without manually setting headers. #8297 [Coda Hale, chasgrundy]
-
-* Add link_to :back which uses your referrer with a fallback to a javascript link. #7366 [eventualbuddha, Tarmo Tänav]
-
-* error_messages_for and friends also work with local variables.  #9699 [Frederick Cheung]
-
-* Fix url_for, redirect_to, etc. with :controller => :symbol instead of 'string'.  #8562, #9525 [Justin Lynn, Tarmo Tänav, shoe]
-
-* Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores.  Closes #8662. [Rick Olson]
-
-* Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes.  Now you can set it in the config. [Rick Olson]
-
-  config.action_controller.optimise_named_routes = false
-
-* ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape.  [Rick Olson]
-
-* Only accept session ids from cookies, prevents session fixation attacks.  [bradediger]
-
-
-*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.12.2 - 1.13.3]
-
-* Fixed that render template did not honor exempt_from_layout #9698 [pezra]
-
-* Better error messages if you leave out the :secret option for request forgery protection.  Closes #9670 [Rick Olson]
-
-* Allow ability to disable request forgery protection, disable it in test mode by default.  Closes #9693 [Pratik Naik]
-
-* Avoid calling is_missing on LoadErrors. Closes #7460. [ntalbott]
-
-* Move Railties' Dispatcher to ActionController::Dispatcher, introduce before_ and after_dispatch callbacks, and warm up to non-CGI requests.  [Jeremy Kemper]
-
-* The tag helper may bypass escaping.  [Jeremy Kemper]
-
-* Cache asset ids.  [Jeremy Kemper]
-
-* Optimized named routes respect AbstractRequest.relative_url_root.  #9612 [Daniel Morrison, Jeremy Kemper]
-
-* Introduce ActionController::Base.rescue_from to declare exception-handling methods. Cleaner style than the case-heavy rescue_action_in_public.  #9449 [Norbert Crombach]
-
-* Rename some RequestForgeryProtection methods.  The class method is now #protect_from_forgery, and the default parameter is now 'authenticity_token'.  [Rick Olson]
-
-* Merge csrf_killer plugin into rails.  Adds RequestForgeryProtection model that verifies session-specific _tokens for non-GET requests.  [Rick Olson]
-
-* Secure #sanitize, #strip_tags, and #strip_links helpers against xss attacks.  Closes #8877. [Rick Olson, Pratik Naik, Jacques Distler]
-
-  This merges and renames the popular white_list helper (along with some css sanitizing from Jacques Distler version of the same plugin).
-  Also applied updated versions of #strip_tags and #strip_links from #8877.
-
-* Remove use of & logic operator. Closes #8114. [watson]
-
-* Fixed JavaScriptHelper#escape_javascript to also escape closing tags #8023 [Ruy Asan]
-
-* Fixed TextHelper#word_wrap for multiline strings with extra carrier returns #8663 [seth]
-
-* Fixed that setting the :host option in url_for would automatically turn off :only_path (since :host would otherwise not be shown) #9586 [Bounga]
-
-* Added FormHelper#label.  #8641, #9850 [jcoglan, Jarkko Laine]
-
-* Added AtomFeedHelper (slightly improved from the atom_feed_helper plugin) [David Heinemeier Hansson]
-
-* Prevent errors when generating routes for uncountable resources, (i.e. sheep where plural == singluar).   map.resources :sheep now creates sheep_index_url for the collection and sheep_url for the specific item.  [Michael Koziarski]
-
-* Added support for HTTP Only cookies (works in IE6+ and FF 2.0.5+) as an improvement for XSS attacks #8895 [Pratik Naik, Mark Somerville]
-
-* Don't warn when a path segment precedes a required segment. Closes #9615. [Nicholas Seckar]
-
-* Fixed CaptureHelper#content_for to work with the optional content parameter instead of just the block #9434 [sandofsky/wildchild].
-
-* Added Mime::Type.register_alias for dealing with different formats using the same mime type [David Heinemeier Hansson]. Example:
-
-    class PostsController < ApplicationController
-      before_filter :adjust_format_for_iphone
-
-      def index
-        @posts = Post.find(:all)
-
-        respond_to do |format|
-          format.html   # => renders index.html.erb and uses "text/html" as the content type
-          format.iphone # => renders index.iphone.erb and uses "text/html" as the content type
-        end
-      end
-
-
-      private
-        def adjust_format_for_iphone
-          if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/iPhone/]
-            request.format = :iphone
-          end
-        end
-    end
-
-* Added that render :json will automatically call .to_json unless it's being passed a string [David Heinemeier Hansson].
-
-* Autolink behaves well with emails embedded in URLs.  #7313 [Jeremy McAnally, Tarmo Tänav]
-
-* Fixed that default layouts did not take the format into account #9564 [Pratik Naik]
-
-* Fixed optimized route segment escaping.  #9562 [wildchild, Jeremy Kemper]
-
-* Added block acceptance to JavaScriptHelper#javascript_tag.  #7527 [Bob Silva, Tarmo Tänav, rmm5t]
-
-* root_path returns '/' not ''.  #9563 [Pratik Naik]
-
-* Fixed that setting request.format should also affect respond_to blocks [David Heinemeier Hansson]
-
-* Add option to force binary mode on tempfile used for fixture_file_upload.  #6380 [Jonathan Viney]
-
-* Fixed that resource namespaces wouldn't stick to all nested resources #9399 [pixeltrix]
-
-* Moved ActionController::Macros::AutoComplete into the auto_complete plugin on the official Rails svn.  #9512 [Pratik Naik]
-
-* Moved ActionController::Macros::InPlaceEditing into the in_place_editor plugin on the official Rails svn.  #9513 [Pratik Naik]
-
-* Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb [David Heinemeier Hansson]
-
-* Removed deprecated methods [David Heinemeier Hansson]:
-
-  - ActionController::Base#keep_flash (use flash.keep instead)
-  - ActionController::Base#expire_matched_fragments (just call expire_fragment with a regular expression)
-  - ActionController::Base.template_root/= methods (use ActionController#Base.view_paths/= instead)
-  - ActionController::Base.cookie (use ActionController#Base.cookies[]= instead)
-
-* Removed the deprecated behavior of appending ".png" to image_tag/image_path calls without an existing extension [David Heinemeier Hansson]
-
-* Removed ActionController::Base.scaffold -- it went through the whole idea of scaffolding (card board walls you remove and tweak one by one). Use the scaffold generator instead (it does resources too now!) [David Heinemeier Hansson]
-
-* Optimise named route generation when using positional arguments.  [Michael Koziarski]
-
-  This change delivers significant performance benefits for the most
-  common usage scenarios for modern rails applications by avoiding the
-  costly trip through url_for.  Initial benchmarks indicate this is
-  between 6 and 20 times as fast.
-
-* Explicitly require active_record/query_cache before using it.  [Jeremy Kemper]
-
-* Fix layout overriding response status.  #9476 [lotswholetime]
-
-* Add field_set_tag for generating field_sets, closes #9477. [Damian Janowski]
-
-* Allow additional parameters to be passed to named route helpers when using positional arguments.  Closes #8930 [Ian White]
-
-* Make render :partial work with a :collection of Hashes, previously this wasn't possible due to backwards compatibility restrictions.  [Pratik Naik]
-
-* request.host works with IPv6 addresses.  #9458 [yuya]
-
-* Fix bug where action caching sets the content type to the ActionCachePath object.  Closes #9282 [mindforge]
-
-* Find layouts even if they're not in the first view_paths directory.  Closes #9258 [caio]
-
-* Major improvement to the documentation for the options / select form helpers. Closes #9038 [Chris Kampmeier, jardeon, wesg]
-
-* Fix number_to_human_size when using different precisions. Closes #7536. [RichardStrand, mpalmer]
-
-* Added partial layouts (see example in action_view/lib/partials.rb) [David Heinemeier Hansson]
-
-* Allow you to set custom :conditions on resource routes.  [Rick Olson]
-
-* Fixed that file.content_type for uploaded files would include a trailing \r #9053 [Brad Greenlee]
-
-* url_for now accepts a series of symbols representing the namespace of the record [Josh Knowles]
-
-* Make :trailing_slash work with query parameters for url_for. Closes #4004 [nov]
-
-* Make sure missing template exceptions actually say which template they were looking for.  Closes #8683 [dasil003]
-
-* Fix errors with around_filters which do not yield, restore 1.1 behaviour with after filters. Closes #8891 [Stefan Kaes]
-
-  After filters will *no longer* be run if an around_filter fails to yield, users relying on
-  this behaviour are advised to put the code in question after a yield statement in an around filter.
-
-
-* Allow you to delete cookies with options. Closes #3685 [Josh Peek, Chris Wanstrath]
-
-* Allow you to render views with periods in the name.  Closes #8076 [Norbert Crombach]
-
-  render :partial => 'show.html.erb'
-
-* Improve capture helper documentation.  #8796 [Chris Kampmeier]
-
-* Prefix nested resource named routes with their action name, e.g. new_group_user_path(@group) instead of group_new_user_path(@group). The old nested action named route is deprecated in Rails 1.2.4.  #8558 [David Chelimsky]
-
-* Allow sweepers to be created solely for expiring after controller actions, not model changes [David Heinemeier Hansson]
-
-* Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller [David Heinemeier Hansson]
-
-* Give the legacy X-POST_DATA_FORMAT header greater precedence during params parsing for backward compatibility.  [Jeremy Kemper]
-
-* Fixed that link_to with an href of # when using :method will not allow for click-through without JavaScript #7037 [Steven Bristol, Josh Peek]
-
-* Fixed that radio_button_tag should generate unique ids #3353 [Bob Silva, Rebecca, Josh Peek]
-
-* Fixed that HTTP authentication should work if the header is called REDIRECT_X_HTTP_AUTHORIZATION as well #6754 [Mislav Marohnić]
-
-* Don't mistakenly interpret the request uri as the query string.  #8731 [Pratik Naik, Jeremy Kemper]
-
-* Make ActionView#view_paths an attr_accessor for real this time.  Also, don't perform an unnecessary #compact on the @view_paths array in #initialize.  Closes #8582 [dasil003, julik, Rick Olson]
-
-* Tolerate missing content type on multipart file uploads. Fix for Safari 3.  [Jeremy Kemper]
-
-* Deprecation: remove pagination. Install the classic_pagination plugin for forward compatibility, or move to the superior will_paginate plugin.  #8157 [Josh Peek]
-
-* Action caching is limited to GET requests returning 200 OK status.  #3335 [tom@craz8.com, halfbyte, Dan Kubb, Josh Peek]
-
-* Improve Text Helper test coverage.  #7274 [Rob Sanheim, Josh Peek]
-
-* Improve helper test coverage.  #7208, #7212, #7215, #7233, #7234, #7235, #7236, #7237, #7238, #7241, #7243, #7244 [Rich Collins, Josh Peek]
-
-* Improve UrlRewriter tests.  #7207 [Rich Collins]
-
-* Resources: url_for([parent, child]) generates /parents/1/children/2 for the nested resource. Likewise with the other simply helpful methods like form_for and link_to.  #6432 [mhw, Jonathan Vaught, lotswholetime]
-
-* Assume html format when rendering partials in RJS. #8076 [Rick Olson]
-
-* Don't double-escape url_for in views.  #8144 [Rich Collins, Josh Peek]
-
-* Allow JSON-style values for the :with option of observe_field.  Closes #8557 [kommen]
-
-* Remove RAILS_ROOT from backtrace paths.  #8540 [Tim Pope]
-
-* Routing: map.resource :logo routes to LogosController so the controller may be reused for multiple nestings or namespaces.  [Jeremy Kemper]
-
-* render :partial recognizes Active Record associations as Arrays.  #8538 [Kamal Fariz Mahyuddin]
-
-* Routing: drop semicolon and comma as route separators.  [Jeremy Kemper]
-
-* request.remote_ip understands X-Forwarded-For addresses with nonstandard whitespace.  #7386 [moses]
-
-* Don't prepare response when rendering a component.  #8493 [jsierles]
-
-* Reduce file stat calls when checking for template changes.  #7736 [alex]
-
-* Added custom path cache_page/expire_page parameters in addition to the options hashes [David Heinemeier Hansson]. Example:
-
-    def index
-      caches_page(response.body, "/index.html")
-    end
-
-* Action Caching speedup.  #8231 [Stefan Kaes]
-
-* Wordsmith resources documentation.  #8484 [marclove]
-
-* Fix syntax error in code example for routing documentation. #8377. [Norbert Crombach]
-
-* Routing: respond with 405 Method Not Allowed status when the route path matches but the HTTP method does not.  #6953 [Josh Peek, defeated, Dan Kubb, Coda Hale]
-
-* Add support for assert_select_rjs with :show and :hide. #7780 [dchelimsky]
-
-* Make assert_select's failure messages clearer about what failed. #7779 [dchelimsky]
-
-* Introduce a default respond_to block for custom types.  #8174 [Josh Peek]
-
-* auto_complete_field takes a :method option so you can GET or POST.  #8120 [zapnap]
-
-* Added option to suppress :size when using :maxlength for FormTagHelper#text_field #3112 [Tim Pope]
-
-* catch possible WSOD when trying to render a missing partial. Closes #8454 [Jonathan del Strother]
-
-* Rewind request body after reading it, if possible.  #8438 [s450r1]
-
-* Resource namespaces are inherited by their has_many subresources.  #8280 [marclove, Geoff Garside]
-
-* Fix filtered parameter logging with nil parameter values.  #8422 [choonkeat]
-
-* Integration tests: alias xhr to xml_http_request and add a request_method argument instead of always using POST.  #7124 [Nik Wakelin, François Beausoleil, Wizard]
-
-* Document caches_action.  #5419 [Jarkko Laine]
-
-* Update to Prototype 1.5.1.  [Sam Stephenson]
-
-* Allow routes to be decalred under namespaces [Tobias Lütke]:
-
-  map.namespace :admin do |admin|
-    admin.root :controller => "products"
-    admin.feed 'feed.xml', :controller => 'products', :action => 'feed', :format => 'xml'
-  end
-
-* Update to script.aculo.us 1.7.1_beta3.  [Thomas Fuchs]
-
-* observe_form always sends the serialized form.  #5271 [Manfred Stienstra, normelton@gmail.com]
-
-* Parse url-encoded and multipart requests ourselves instead of delegating to CGI.  [Jeremy Kemper]
-
-* select :include_blank option can be set to a string instead of true, which just uses an empty string.  #7664 [Wizard]
-
-* Added url_for usage on render :location, which allows for record identification [David Heinemeier Hansson]. Example:
-
-    render :xml => person, :status => :created, :location => person
-
-  ...expands the location to person_url(person).
-
-* Introduce the request.body stream. Lazy-read to parse parameters rather than always setting RAW_POST_DATA. Reduces the memory footprint of large binary PUT requests.  [Jeremy Kemper]
-
-* Add some performance enhancements to ActionView.
-
-  * Cache base_paths in @@cached_base_paths
-  * Cache template extensions in @@cached_template_extension
-  * Remove unnecessary rescues
-
-* Assume that rendered partials go by the HTML format by default
-
-  def my_partial
-    render :update do |page|
-      # in this order
-      # _foo.html.erb
-      # _foo.erb
-      # _foo.rhtml
-      page.replace :foo, :partial => 'foo'
-    end
-  end
-
-* Added record identifications to FormHelper#form_for and PrototypeHelper#remote_form_for [David Heinemeier Hansson]. Examples:
-
-    <% form_for(@post) do |f| %>
-      ...
-    <% end %>
-
-  This will expand to be the same as:
-
-    <% form_for :post, @post, :url => post_path(@post), :html => { :method => :put, :class => "edit_post", :id => "edit_post_45" } do |f| %>
-      ...
-    <% end %>
-
-  And for new records:
-
-    <% form_for(Post.new) do |f| %>
-      ...
-    <% end %>
-
-  This will expand to be the same as:
-
-    <% form_for :post, @post, :url => posts_path, :html => { :class => "new_post", :id => "new_post" } do |f| %>
-      ...
-    <% end %>
-
-* Rationalize route path escaping according to RFC 2396 section 3.3.  #7544, #8307. [Jeremy Kemper, Chris Roos, begemot, jugend]
-
-* Added record identification with polymorphic routes for ActionController::Base#url_for and ActionView::Base#url_for [David Heinemeier Hansson]. Examples:
-
-    redirect_to(post)         # => redirect_to(posts_url(post))         => Location: http://example.com/posts/1
-    link_to(post.title, post) # => link_to(post.title, posts_url(post)) => <a href="/posts/1">Hello world</a>
-
-  Any method that calls url_for on its parameters will automatically benefit from this.
-
-* Removed deprecated parameters_for_method_reference concept (legacy from before named routes) [David Heinemeier Hansson]
-
-* Add ActionController::Routing::Helpers, a module to contain common URL helpers such as polymorphic_url. [Nicholas Seckar]
-
-* Included the HttpAuthentication plugin as part of core (ActionController::HttpAuthentication::Basic) [David Heinemeier Hansson]
-
-* Modernize documentation for form helpers. [Jeremy McAnally]
-
-* Add brief introduction to REST to the resources documentation. [fearoffish]
-
-* Fix various documentation typos throughout ActionPack. [Henrik N]
-
-* Enhance documentation and add examples for url_for. [Jeremy McAnally]
-
-* Fix documentation typo in routes. [Norbert Crombach, pam]
-
-* Sweep flash when filter chain is halted. [Caio Chassot <lists@v2studio.com>]
-
-* Fixed that content_tag with a block will just return the result instead of concate it if not used in a ERb view #7857, #7432 [michael.niessner]
-
-* Replace the current block/continuation filter chain handling by an implementation based on a simple loop.  #8226 [Stefan Kaes]
-
-* Update UrlWriter to accept :anchor parameter. Closes #6771. [Chris McGrath]
-
-* Added RecordTagHelper for using RecordIdentifier conventions on divs and other container elements [David Heinemeier Hansson]. Example:
-
-    <% div_for(post) do %>     <div id="post_45" class="post">
-      <%= post.body %>           What a wonderful world!
-    <% end %>                  </div>
-
-* Added page[record] accessor to JavaScriptGenerator that relies on RecordIdentifier to find the right dom id [David Heinemeier Hansson]. Example:
-
-    format.js do
-      # Calls: new Effect.fade('post_45');
-      render(:update) { |page| page[post].visual_effect(:fade) }
-    end
-
-* Added RecordIdentifier to enforce view conventions on records for dom ids, classes, and partial paths [David Heinemeier Hansson]
-
-* Added map.namespace to deal with the common situation of admin sections and the like [David Heinemeier Hansson]
-
-    Before:
-
-      map.resources :products, :path_prefix => "admin", :controller => "admin/products", :collection => { :inventory => :get }, :member => { :duplicate => :post }
-      map.resources :tags, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_tags"
-      map.resources :images, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_images"
-      map.resources :variants, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_variants"
-
-    After:
-
-      map.namespace(:admin) do |admin|
-        admin.resources :products,
-          :collection => { :inventory => :get },
-          :member     => { :duplicate => :post },
-          :has_many   => [ :tags, :images, :variants ]
-      end
-
-* Added :name_prefix as standard for nested resources [David Heinemeier Hansson]. WARNING: May be backwards incompatible with your app
-
-    Before:
-
-      map.resources :emails do |emails|
-        emails.resources :comments,    :name_prefix => "email_"
-        emails.resources :attachments, :name_prefix => "email_"
-      end
-
-    After:
-
-      map.resources :emails do |emails|
-        emails.resources :comments
-        emails.resources :attachments
-      end
-
-    This does mean that if you intended to have comments_url go to /emails/5/comments, then you'll have to set :name_prefix to nil explicitly.
-
-* Added :has_many and :has_one for declaring plural and singular resources beneath the current [David Heinemeier Hansson]
-
-    Before:
-
-      map.resources :notes do |notes|
-        notes.resources :comments
-        notes.resources :attachments
-        notes.resource :author
-      end
-
-    After:
-
-      map.resources :notes, :has_many => [ :comments, :attachments ], :has_one => :author
-
-* Added that render :xml will try to call to_xml if it can [David Heinemeier Hansson]. Makes these work:
-
-    render :xml => post
-    render :xml => comments
-
-* Added :location option to render so that the common pattern of rendering a response after creating a new resource is now a 1-liner [David Heinemeier Hansson]
-
-    render :xml => post.to_xml, :status => :created, :location => post_url(post)
-
-* Ensure that render_text only adds string content to the body of the response [David Heinemeier Hansson]
-
-* Return the string representation from an Xml Builder when rendering a partial. Closes #5044 [Tim Pope]
-
-* Fixed that parameters from XML should also be presented in a hash with indifferent access [David Heinemeier Hansson]
-
-* Tweak template format rules so that the ACCEPT header is only used if it's text/javascript.  This is so ajax actions without a :format param get recognized as Mime::JS. [Rick Olson]
-
-* The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. [Rick Olson]
-
-* Allow layouts with extension of .html.erb.  Closes #8032 [Josh Knowles]
-
-* Change default respond_to templates for xml and rjs formats. [Rick Olson]
-
-  * Default xml template goes from #{action_name}.rxml => #{action_name}.xml.builder.
-  * Default rjs template goes from #{action_name}.rjs => #{action_name}.js.rjs.
-
-  You can still specify your old templates:
-
-    respond_to do |format|
-      format.xml do
-        render :action => "#{action_name}.rxml"
-      end
-    end
-
-* Fix WSOD due to modification of a formatted template extension so that requests to templates like 'foo.html.erb' fail on the second hit.  [Rick Olson]
-
-* Fix WSOD when template compilation fails [Rick Olson]
-
-* Change ActionView template defaults.  Look for templates using the request format first, such as "show.html.erb" or "show.xml.builder", before looking for the old defaults like "show.erb" or "show.builder" [Rick Olson]
-
-* Highlight helper highlights one or many terms in a single pass.  [Jeremy Kemper]
-
-* Dropped the use of ; as a separator of non-crud actions on resources and went back to the vanilla slash. It was a neat idea, but lots of the non-crud actions turned out not to be RPC (as the ; was primarily intended to discourage), but legitimate sub-resources, like /parties/recent, which didn't deserve the uglification of /parties;recent. Further more, the semicolon caused issues with caching and HTTP authentication in Safari. Just Not Worth It [David Heinemeier Hansson]
-
-* Added that FormTagHelper#submit_tag will return to its original state if the submit fails and you're using :disable_with [David Heinemeier Hansson]
-
-* Cleaned up, corrected, and mildly expanded ActionPack documentation.  Closes #7190 [Jeremy McAnally]
-
-* Small collection of ActionController documentation cleanups.  Closes #7319 [Jeremy McAnally]
-
-* Make sure the route expiry hash is constructed by comparing the to_param-ized values of each hash. [Jamis Buck]
-
-* Allow configuration of the default action cache path for #caches_action calls.  [Rick Olson]
-
-  class ListsController < ApplicationController
-    caches_action :index, :cache_path => Proc.new { |controller|
-      controller.params[:user_id] ?
-        controller.send(:user_lists_url, c.params[:user_id]) :
-        controller.send(:lists_url) }
-  end
-
-* Performance: patch cgi/session/pstore to require digest/md5 once rather than per #initialize.  #7583 [Stefan Kaes]
-
-* Cookie session store: ensure that new sessions doesn't reuse data from a deleted session in the same request.  [Jeremy Kemper]
-
-* Deprecation: verification with :redirect_to => :named_route shouldn't be deprecated.  #7525 [Justin French]
-
-* Cookie session store: raise ArgumentError when :session_key is blank.  [Jeremy Kemper]
-
-* Deprecation: remove deprecated request, redirect, and dependency methods. Remove deprecated instance variables. Remove deprecated url_for(:symbol, *args) and redirect_to(:symbol, *args) in favor of named routes. Remove uses_component_template_root for toplevel components directory. Privatize deprecated render_partial and render_partial_collection view methods. Remove deprecated link_to_image, link_image_to, update_element_function, start_form_tag, and end_form_tag helper methods. Remove deprecated human_size helper alias.  [Jeremy Kemper]
-
-* Consistent public/protected/private visibility for chained methods.  #7813 [Dan Manges]
-
-* Prefer MIME constants to strings.  #7707 [Dan Kubb]
-
-* Allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 [bgipsy, Jeremy McAnally, Dan Kubb, brendan]
-
-# Add a #dbman attr_reader for CGI::Session and make CGI::Session::CookieStore#generate_digest public so it's easy to generate digests
-using the cookie store's secret. [Rick Olson]
-
-* Added Request#url that returns the complete URL used for the request [David Heinemeier Hansson]
-
-* Extract dynamic scaffolding into a plugin.  #7700 [Josh Peek]
-
-* Added user/password options for url_for to add http authentication in a URL [David Heinemeier Hansson]
-
-* Fixed that FormTagHelper#text_area_tag should disregard :size option if it's not a string [Brendon Davidson]
-
-* Set the original button value in an attribute of the button when using the :disable_with key with submit_tag, so that the original can be restored later. [Jamis Buck]
-
-* session_enabled? works with session :off.  #6680 [Jonathan del Strother]
-
-* Added :port and :host handling to UrlRewriter (which unified url_for usage, regardless of whether it's called in view or controller) #7616 [alancfrancis]
-
-* Allow send_file/send_data to use a registered mime type as the :type parameter #7620 [jonathan]
-
-* Allow routing requirements on map.resource(s) #7633 [quixoten]. Example:
-
-  map.resources :network_interfaces, :requirements => { :id => /^\d+\.\d+\.\d+\.\d+$/ }
-
-* Cookie session store: empty and unchanged sessions don't write a cookie.  [Jeremy Kemper]
-
-* Added helper(:all) as a way to include all helpers from app/helpers/**/*.rb in ApplicationController [David Heinemeier Hansson]
-
-* Integration tests: introduce methods for other HTTP methods.  #6353 [caboose]
-
-* Routing: better support for escaped values in route segments.  #7544 [Chris
-Roos]
-
-* Introduce a cookie-based session store as the Rails default. Sessions typically contain at most a user_id and flash message; both fit within the 4K cookie size limit. A secure message digest is included with the cookie to ensure data integrity (a user cannot alter his user_id without knowing the secret key included in the digest). If you have more than 4K of session data or don't want your data to be visible to the user, pick another session store.  Cookie-based sessions are dramatically faster than the alternatives.   [Jeremy Kemper]
-
-  Example config/environment.rb:
-    # Use an application-wide secret key and the default SHA1 message digest.
-    config.action_controller.session = { :secret => "can't touch this" }
-
-    # Store a secret key per user and employ a stronger message digest.
-    config.action_controller.session = {
-      :digest => 'SHA512',
-      :secret => Proc.new { User.current.secret_key }
-    }
-
-* Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
-
-* Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [David Heinemeier Hansson]. Examples:
-
-    stylesheet_link_tag :all, :cache => true # when ActionController::Base.perform_caching is false =>
-      <link href="/stylesheets/style1.css"  media="screen" rel="Stylesheet" type="text/css" />
-      <link href="/stylesheets/styleB.css"  media="screen" rel="Stylesheet" type="text/css" />
-      <link href="/stylesheets/styleX2.css" media="screen" rel="Stylesheet" type="text/css" />
-
-    stylesheet_link_tag :all, :cache => true # when ActionController::Base.perform_caching is true =>
-      <link href="/stylesheets/all.css"  media="screen" rel="Stylesheet" type="text/css" />
-
-  ...when caching is on, all.css is the concatenation of style1.css, styleB.css, and styleX2.css.
-  Same deal for JavaScripts.
-
-* Work around the two connection per host browser limit: use asset%d.myapp.com to distribute asset requests among asset[0123].myapp.com. Use a DNS wildcard or CNAMEs to map these hosts to your asset server. See http://www.die.net/musings/page_load_time/ for background.  [Jeremy Kemper]
-
-* Added default mime type for CSS (Mime::CSS) [David Heinemeier Hansson]
-
-* Added that rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified and the response body will be set to an empty string. [David Heinemeier Hansson]
-
-* Added X-Runtime to all responses with the request run time [David Heinemeier Hansson]
-
-* Add Mime::Type convenience methods to check the current mime type. [Rick Olson]
-
-  request.format.html? # => true if Mime::HTML
-  request.format.jpg?  # => true if Mime::JPG
-
-  # ActionController sample usage:
-  # the session will be disabled for non html/ajax requests
-  session :off, :if => Proc.new { |req| !(req.format.html? || req.format.js?) }
-
-* Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  [Stefan Kaes]
-
-* Add a :url_based_filename => true option to ActionController::Streaming::send_file, which allows URL-based filenames.  [Thomas Fuchs]
-
-* Fix that FormTagHelper#submit_tag using :disable_with should trigger the onsubmit handler of its form if available [David Heinemeier Hansson]
-
-* Fix #render_file so that TemplateError is called with the correct params and you don't get the WSOD.  [Rick Olson]
-
-* Fix issue with deprecation messing up #template_root= usage.  Add #prepend_view_path and #append_view_path to allow modification of a copy of the
-superclass' view_paths.  [Rick Olson]
-
-* Allow Controllers to have multiple view_paths instead of a single template_root.  Closes #2754 [John Long]
-
-* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick Olson]
-
-* improve error message for Routing for named routes.  Closes #7346 [Rob Sanheim]
-
-* Added enhanced docs to routing assertions.  Closes #7359 [Rob Sanheim]
-
-* fix form_for example in ActionController::Resources documentation.  Closes #7362 [gnarg]
-
-* Make sure that the string returned by TextHelper#truncate is actually a string, not a char proxy -- that should only be used internally while working on a multibyte-safe way of truncating [David Heinemeier Hansson]
-
-* Added FormBuilder#submit as a delegate for FormTagHelper#submit_tag [David Heinemeier Hansson]
-
-* Allow Routes to generate all urls for a set of options by specifying :generate_all => true. Allows caching to properly set or expire all paths for a resource. References #1739. [Nicholas Seckar]
-
-* Change the query parser to map empty GET params to "" rather than nil. Closes #5694. [Nicholas Seckar]
-
-* date_select and datetime_select take a :default option.  #7052 [Nik Wakelin]
-    date_select "post", "written_on", :default => 3.days.from_now
-    date_select "credit_card", "bill_due", :default => { :day => 20 }
-
-* select :multiple => true suffixes the attribute name with [] unless already suffixed.  #6977 [nik.kakelin, ben, julik]
-
-* Improve routes documentation.  #7095 [zackchandler]
-
-* mail_to :encode => 'hex' also encodes the mailto: part of the href attribute as well as the linked email when no name is given.  #2061 [Jarkko Laine, pfc.pille@gmx.net]
-
-* Resource member routes require :id, eliminating the ambiguous overlap with collection routes.  #7229 [dkubb]
-
-* Remove deprecated assertions.  [Jeremy Kemper]
-
-* Change session restoration to allow namespaced models to be autoloaded. Closes #6348. [Nicholas Seckar]
-
-* Fix doubly appearing parameters due to string and symbol mixups. Closes #2551. [Anthony Eden]
-
-* Fix overly greedy rescues when loading helpers. Fixes #6268. [Nicholas Seckar]
-
-* Fixed NumberHelper#number_with_delimiter to use "." always for splitting the original number, not the delimiter parameter #7389 [ceefour]
-
-* Autolinking recognizes trailing and embedded . , : ;  #7354 [Jarkko Laine]
-
-* Make TextHelper::auto_link recognize URLs with colons in path correctly, fixes #7268.  [imajes]
-
-* Update to script.aculo.us 1.7.0.  [Thomas Fuchs]
-
-* Modernize cookie testing code, and increase coverage (Heckle++) #7101 [Kevin Clark]
-
-* Improve Test Coverage for ActionController::Routing::Route#matches_controller_and_action? (Heckle++) #7115 [Kevin Clark]
-
-* Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
-
-* Fix #distance_of_time_in_words to report accurately against the Duration class.  #7114 [eventualbuddha]
-
-* Refactor #form_tag to allow easy extending.  [Rick Olson]
-
-* Update to Prototype 1.5.0. [Sam Stephenson]
-
-* RecordInvalid, RecordNotSaved => 422 Unprocessable Entity, StaleObjectError => 409 Conflict.  #7097 [dkubb]
-
-* Allow fields_for to be nested inside form_for, so that the name and id get properly constructed [Jamis Buck]
-
-* Allow inGroupsOf and eachSlice to be called through rjs. #7046 [Cody Fauser]
-
-* Allow exempt_from_layout :rhtml.  #6742, #7026 [Dan Manges, Squeegy]
-
-* Recognize the .txt extension as Mime::TEXT [Rick Olson]
-
-* Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 [Nicholas Seckar, aiwilliams, brentrowland]
-
-* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, Manfred Stienstra, idrifter]
-
-* Lookup the mime type for #auto_discovery_link_tag in the Mime::Type class.  Closes #6941 [Josh Peek]
-
-* Fix bug where nested resources ignore a parent singleton parent's path prefix.  Closes #6940 [Dan Kubb]
-
-* Fix no method error with error_messages_on.  Closes #6935 [nik.wakelin Koz]
-
-* Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs.  Closes #6922 [Steven Bristol]
-
-* Slight doc tweak to #prepend_filter.  Closes #6493 [Jeremy Voorhis]
-
-* Add more extensive documentation to the AssetTagHelper.  Closes #6452 [Bob Silva]
-
-* Clean up multiple calls to #stringify_keys in TagHelper, add better documentation and testing for TagHelper.  Closes #6394 [Bob Silva]
-
-* [DOCS] fix reference to ActionController::Macros::AutoComplete for #text_field_with_auto_complete. Closes #2578 [Jan Prill]
-
-* Make sure html_document is reset between integration test requests. [ctm]
-
-* Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.  [Josh Susser]
-
-* Routing uses URI escaping for path components and CGI escaping for query parameters.  [darix, Jeremy Kemper]
-
-* Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting.  Closes #6128.  [Rick Olson]
-
-* Singleton resources: POST /singleton => create, GET /singleton/new => new.  [Jeremy Kemper]
-
-* Use 400 Bad Request status for unrescued ActiveRecord::RecordInvalid exceptions.  [Jeremy Kemper]
-
-* Silence log_error deprecation warnings from inspecting deprecated instance variables.  [Nate Wiger]
-
-* Only cache GET requests with a 200 OK response.  #6514, #6743 [RSL, anamba]
-
-* Add a 'referer' attribute to TestRequest. [Jamis Buck]
-
-* Ensure render :json => ... skips the layout.  Closes #6808 [Josh Peek]
-
-* Fix HTML::Node to output double quotes instead of single quotes.  Closes #6845 [mitreandy]
-
-* Correctly report which filter halted the chain.  #6699 [Martin Emde]
-
-* Fix a bug in Routing where a parameter taken from the path of the current request could not be used as a query parameter for the next. Closes #6752. [Nicholas Seckar]
-
-* Unrescued ActiveRecord::RecordNotFound responds with 404 instead of 500.  [Jeremy Kemper]
-
-* Improved auto_link to match more valid urls correctly [Tobias Lütke]
-
-* Add singleton resources. [Rick Olson]
-
-  map.resource :account
-
-  GET /account
-  GET /account;edit
-  UPDATE /account
-  DELETE /account
-
-* respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument.  #4185 [Scott Raymond, eventualbuddha]
-    # application/json response with body 'Element.show({:name: "David"})'
-    respond_to do |format|
-      format.json { render :json => { :name => "David" }.to_json, :callback => 'Element.show' }
-    end
-
-* Makes :discard_year work without breaking multi-attribute parsing in AR.  #1260, #3800 [sean@ardismg.com, jmartin@desertflood.com, stephen@touset.org, Bob Silva]
-
-* Adds html id attribute to date helper elements.  #1050, #1382 [mortonda@dgrmm.net, David North, Bob Silva]
-
-* Add :index and @auto_index capability to model driven date/time selects.  #847, #2655 [moriq, Doug Fales, Bob Silva]
-
-* Add :order to datetime_select, select_datetime, and select_date.  #1427 [Timothee Peignier, Patrick Lenz, Bob Silva]
-
-* Added time_select to work with time values in models. Update scaffolding.  #2489, #2833 [Justin Palmer, Andre Caum, Bob Silva]
-
-* Added :include_seconds to select_datetime, datetime_select and time_select.  #2998 [csn, Bob Silva]
-
-* All date/datetime selects can now accept an array of month names with :use_month_names. Allows for localization.  #363 [tomasj, Bob Silva]
-
-* Adds :time_separator to select_time and :date_separator to select_datetime. Preserves BC.  #3811 [Bob Silva]
-
-* Added map.root as an alias for map.connect '' [David Heinemeier Hansson]
-
-* Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [David Heinemeier Hansson]. Examples:
-
-    GET /posts/5.xml   | request.format => Mime::XML
-    GET /posts/5.xhtml | request.format => Mime::HTML
-    GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
-
-* Added the option for extension aliases to mime type registration [David Heinemeier Hansson]. Example (already in the default routes):
-
-    Mime::Type.register "text/html", :html, %w( application/xhtml+xml ), %w( xhtml )
-
-  ...will respond on both .html and .xhtml.
-
-* @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status.  [Jeremy Kemper]
-
-* Added CSV to Mime::SET so that respond_to csv will work [Cody Fauser]
-
-* Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [David Heinemeier Hansson]
-
-* Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [David Heinemeier Hansson]
-
-* Update Routing to complain when :controller is not specified by a route. Closes #6669. [Nicholas Seckar]
-
-* Ensure render_to_string cleans up after itself when an exception is raised.  #6658 [Rob Sanheim]
-
-* Extract template_changed_since? from compile_template? so plugins may override its behavior for non-file-based templates.  #6651 [Jeff Barczewski]
-
-* Update to Prototype and script.aculo.us [5579]. [Thomas Fuchs]
-
-* simple_format helper doesn't choke on nil.  #6644 [jerry426]
-
-* Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again [Thomas Fuchs]
-
-* Reuse named route helper module between Routing reloads. Use remove_method to delete named route methods after each load. Since the module is never collected, this fixes a significant memory leak. [Nicholas Seckar]
-
-* ActionView::Base.erb_variable accessor names the buffer variable used to render templates. Defaults to _erbout; use _buf for erubis.  [Rick Olson]
-
-* assert_select_rjs :remove.  [Dylan Egan]
-
-* Always clear model associations from session.  #4795 [sd@notso.net, andylien@gmail.com]
-
-* Update to Prototype 1.5.0_rc2. [Sam Stephenson]
-
-* Remove JavaScriptLiteral in favor of ActiveSupport::JSON::Variable. [Sam Stephenson]
-
-* Sync ActionController::StatusCodes::STATUS_CODES with http://www.iana.org/assignments/http-status-codes.  #6586 [dkubb]
-
-* Multipart form values may have a content type without being treated as uploaded files if they do not provide a filename.  #6401 [Andreas Schwarz, Jeremy Kemper]
-
-* assert_response supports symbolic status codes.  #6569 [Kevin Clark]
-    assert_response :ok
-    assert_response :not_found
-    assert_response :forbidden
-
-* Cache parsed query parameters.  #6559 [Stefan Kaes]
-
-* Deprecate JavaScriptHelper#update_element_function, which is superseeded by RJS [Thomas Fuchs]
-
-* pluralize helper interprets nil as zero.  #6474 [Tim Pope]
-
-* Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing.  #6524 [Bob Silva]
-
-* Set ActionView::Base.default_form_builder once rather than passing the :builder option to every form or overriding the form helper methods.  [Jeremy Kemper]
-
-* Deprecate expire_matched_fragments. Use expire_fragment instead.  #6535 [Bob Silva]
-
-* Update to latest Prototype, which doesn't serialize disabled form elements, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions [Thomas Fuchs]
-
-* Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  [Rick Olson]
-
-* Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag [Rick Olson]
-
-* Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  [Rick Olson]
-
-* Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
-
-   <% content_tag :div, :class => "strong" %>
-     Hello world!
-   <% end %>
-
-  Will output:
-    <div class="strong">Hello world!</div>
-
-* Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 [Bob Silva]
-
-* Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 [Bob Silva]
-
-* Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 [Bob Silva/chrismear]
-
-* Force *_url named routes to show the host in ActionView [Rick Olson]
-
-  <%= url_for ... %> # no host
-  <%= foo_path %>    # no host
-  <%= foo_url %>     # host!
-
-* Add support for converting blocks into function arguments to JavaScriptGenerator#call and JavaScriptProxy#call. [Sam Stephenson]
-
-* Add JavaScriptGenerator#literal for wrapping a string in an object whose #to_json is the string itself. [Sam Stephenson]
-
-* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick Olson]
-
-* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick Olson]
-
-* Fix deprecation warnings when rendering the template error template. [Nicholas Seckar]
-
-* Fix routing to correctly determine when generation fails. Closes #6300. [psross].
-
-* Fix broken assert_generates when extra keys are being checked. [Jamis Buck]
-
-* Replace KCODE checks with String#chars for truncate.  Closes #6385 [Manfred Stienstra]
-
-* Make page caching respect the format of the resource that is being requested even if the current route is the default route so that, e.g. posts.rss is not transformed by url_for to '/' and subsequently cached as '/index.html' when it should be cached as '/posts.rss'.  [Marcel Molina Jr.]
-
-* Use String#chars in TextHelper::excerpt. Closes #6386 [Manfred Stienstra]
-
-* Install named routes into ActionView::Base instead of proxying them to the view via helper_method. Closes #5932. [Nicholas Seckar]
-
-* Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
-
-* Fix relative URL root matching problems. [Mark Imbriaco]
-
-* Fix filter skipping in controller subclasses.  #5949, #6297, #6299 [Martin Emde]
-
-* render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API).  [Jeremy Kemper]
-
-* Rename test assertion to prevent shadowing. Closes #6306. [psross]
-
-* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [Philip Hallstrom]
-
-* Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 [evansj]
-
-* Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]. Example:
-
-    update_page_tag :defer => 'true' { |page| ... }
-
-  Gives:
-
-    <script defer="true" type="text/javascript">...</script>
-
-  Which is needed for dealing with the IE6 DOM when it's not yet fully loaded.
-
-* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [Mike Naberezny]
-
-* Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 [sven@c3d2.de]
-
-* Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 [cmselmer]
-
-* respond_to :html doesn't assume .rhtml.  #6281 [Hampton Catlin]
-
-* Fixed some deprecation warnings in ActionPack [Rick Olson]
-
-* assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them.  #6240 [japgolly]
-
-* Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead.  [Jeremy Kemper]
-
-* Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples:
-
-    head :status => 404        # expands to "404 Not Found"
-    head :status => :not_found # expands to "404 Not Found"
-    head :status => :created   # expands to "201 Created"
-
-* Add head(options = {}) for responses that have no body. [Jamis Buck]. Examples:
-
-    head :status => 404 # return an empty response with a 404 status
-    head :location => person_path(@person), :status => 201
-
-* Fix bug that kept any before_filter except the first one from being able to halt the before_filter chain.  [Rick Olson]
-
-* strip_links is case-insensitive.  #6285 [tagoh, Bob Silva]
-
-* Clear the cache of possible controllers whenever Routes are reloaded. [Nicholas Seckar]
-
-* Filters overhaul including meantime filter support using around filters + blocks.  #5949 [Martin Emde, Roman Le Negrate, Stefan Kaes, Jeremy Kemper]
-
-* Update RJS render tests. [sam]
-
-* Update CGI process to allow sessions to contain namespaced models. Closes #4638. [dfelstead@site5.com]
-
-* Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. [Nicholas Seckar]
-
-* Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 [sdsykes, fhanshaw@vesaria.com]
-
-* Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
-
-    respond_to do |format|
-      format.html { render :text => "I'm being sent as text/html" }
-      format.rss  { render :text => "I'm being sent as application/rss+xml" }
-      format.atom { render :text => "I'm being sent as application/xml", :content_type => Mime::XML }
-    end
-
-* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [David Heinemeier Hansson]
-
-* Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
-
-    response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
-
-  ...now:
-
-    response.content_type = Mime::ATOM
-    response.charset      = "utf-8"
-
-* Updated prototype.js to 1.5.0_rc1 with latest fixes. [Rick Olson]
-
-  - XPATH support
-  - Make Form.getElements() return elements in the correct order
-  - fix broken Form.serialize return
-
-* Declare file extensions exempt from layouts.  #6219 [brandon]
-    Example: ActionController::Base.exempt_from_layout 'rpdf'
-
-* Add chained replace/update support for assert_select_rjs [Rick Olson]
-
-    Given RJS like...
-
-      page['test1'].replace "<div id=\"1\">foo</div>"
-      page['test2'].replace_html "<div id=\"2\">foo</div>"
-
-    Test it with...
-
-      assert_select_rjs :chained_replace
-      assert_select_rjs :chained_replace, "test1"
-
-      assert_select_rjs :chained_replace_html
-      assert_select_rjs :chained_replace_html, "test2"
-
-* Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 [choonkeat@gmail.com]
-
-* Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [Manfred Stienstra, raphinou@yahoo.com]
-
-* Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 [Eric Hodel]
-
-* Add descriptive messages to the exceptions thrown by cgi_methods. #6091, #6103 [Nicholas Seckar, Bob Silva]
-
-* Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids,  #6068 [petermichaux@gmail.com]
-
-* Update UrlWriter to support :only_path. [Nicholas Seckar, Dave Thomas]
-
-* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
-
-    link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
-
-  ...can be written like this:
-
-    link_to("Hider", :class => "hider_link") { |p| p[:something].hide }
-
-* Update to script.aculo.us 1.6.3 [Thomas Fuchs]
-
-* Update to Prototype 1.5.0_rc1 [sam]
-
-* Added access to nested attributes in RJS #4548 [richcollins@gmail.com]. Examples:
-
-    page['foo']['style']                  # => $('foo').style;
-    page['foo']['style']['color']         # => $('blank_slate').style.color;
-    page['foo']['style']['color'] = 'red' # => $('blank_slate').style.color = 'red';
-    page['foo']['style'].color = 'red'    # => $('blank_slate').style.color = 'red';
-
-* Fixed that AssetTagHelper#image_tag and others using compute_public_path should not modify the incoming source argument (closes #5102) [eule@space.ch]
-
-* Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension [David Heinemeier Hansson]
-
-* Fixed FormOptionsHelper#select to respect :selected value #5813
-
-* Fixed TextHelper#simple_format to deal with multiple single returns within a single paragraph #5835 [moriq@moriq.com]
-
-* Fixed TextHelper#pluralize to handle 1 as a string #5909 [rails@bencurtis.com]
-
-* Improved resolution of DateHelper#distance_of_time_in_words for better precision #5994 [Bob Silva]
-
-* Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" [David Heinemeier Hansson]
-
-* Integration tests: thoroughly test ActionController::Integration::Session.  #6022 [Kevin Clark]
-    (tests skipped unless you `gem install mocha`)
-
-* Added deprecation language for pagination which will become a plugin by Rails 2.0 [David Heinemeier Hansson]
-
-* Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 [David Heinemeier Hansson]
-
-* Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support [David Heinemeier Hansson]
-
-* Added assert_select* for CSS selector-based testing (deprecates assert_tag) #5936 [assaf.arkin@gmail.com]
-
-* radio_button_tag generates unique id attributes.  #3353 [Bob Silva, somekool@gmail.com]
-
-* strip_tags passes through blank args such as nil or "".  #2229, #6702 [duncan@whomwah.com, dharana]
-
-* Cleanup assert_tag :children counting.  #2181 [jamie@bravenet.com]
-
-* button_to accepts :method so you can PUT and DELETE with it.  #6005 [Dan Webb]
-
-* Update sanitize text helper to strip plaintext tags, and <img src="javascript:bang">.  [Rick Olson]
-
-* Update routing documentation.  Closes #6017 [Nathan Witmer]
-
-* Add routing tests to assert that RoutingError is raised when conditions aren't met.  Closes #6016 [Nathan Witmer]
-
-* Deprecation: update docs. #5998 [Jakob Skjerning, Kevin Clark]
-
-* Make auto_link parse a greater subset of valid url formats. [Jamis Buck]
-
-* Integration tests: headers beginning with X aren't excluded from the HTTP_ prefix, so X-Requested-With becomes HTTP_X_REQUESTED_WITH as expected. [Mike Clark]
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]
-
-* Fix send_data documentation typo.  #5982 [brad@madriska.com]
-
-* Switch to using FormEncodedPairParser for parsing request parameters. [Nicholas Seckar, David Heinemeier Hansson]
-
-* respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. [Tobias Lütke]
-
-* Deprecation: test deprecated instance vars in partials. [Jeremy Kemper]
-
-* Add UrlWriter to allow writing urls from Mailers and scripts. [Nicholas Seckar]
-
-* Clean up and run the Active Record integration tests by default.  #5854 [Kevin Clark, Jeremy Kemper]
-
-* Correct example in cookies docs.  #5832 [jessemerriman@warpmail.net]
-
-* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
-
-* Relax Routing's anchor pattern warning; it was preventing use of [^/] inside restrictions. [Nicholas Seckar]
-
-* Add controller_paths variable to Routing. [Nicholas Seckar]
-
-* Fix assert_redirected_to issue with named routes for module controllers.  [Rick Olson]
-
-* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]
-
-* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
-
-* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading.  [Rick Olson]
-
-* Add RoutingError exception when RouteSet fails to generate a path from a Named Route. [Rick Olson]
-
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Deprecation: check whether instance variables have been monkeyed with before assigning them to deprecation proxies. Raises a RuntimeError if so. [Jeremy Kemper]
-
-* Add support for the param_name parameter to the auto_complete_field helper. #5026 [david.a.williams@gmail.com]
-
-* Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. [Jeremy Kemper]
-
-* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [François Beausoleil]
-
-* Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
-
-* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
-
-* Make controller_path available as an instance method.  #5724 [jmckible@gmail.com]
-
-* Update query parser to support adjacent hashes. [Nicholas Seckar]
-
-* Make action caching aware of different formats for the same action so that, e.g.  foo.xml is cached separately from foo.html. Implicitly set content type when reading in cached content with mime revealing extensions so the entire onous isn't on the webserver. [Marcel Molina Jr.]
-
-* Restrict Request Method hacking with ?_method to POST requests.  [Rick Olson]
-
-* Fix bug when passing multiple options to SimplyRestful, like :new => { :preview => :get, :draft => :get }.  [Rick Olson, Josh Susser, Lars Pind]
-
-* Dup the options passed to map.resources so that multiple resources get the same options.  [Rick Olson]
-
-* Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  [Rick Olson]
-
-* Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
-
-    map.resources :messages
-    map.resources :messages, :comments
-    map.resources :messages, :new => { :preview => :post }
-
-* Fixed that integration simulation of XHRs should set Accept header as well [Edward Frederick]
-
-* TestRequest#reset_session should restore a TestSession, not a hash [Michael Koziarski]
-
-* Don't search a load-path of '.' for controller files [Jamis Buck]
-
-* Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar]
-
-* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow]
-
-* Allow form_for and fields_for to work with indexed form inputs.  [Jeremy Kemper, Matt Lyon]
-
-  <% form_for 'post[]', @post do |f| -%>
-  <% end -%>
-
-* Remove leak in development mode by replacing define_method with module_eval. [Nicholas Seckar]
-
-* Provide support for decimal columns to form helpers. Closes #5672. [Dave Thomas]
-
-* Update documentation for erb trim syntax. #5651 [matt@mattmargolis.net]
-
-* Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 [olivier_ansaldi@yahoo.com]
-
-* Reset @html_document between requests so assert_tag works. #4810 [Jarkko Laine, easleydp@gmail.com]
-
-* Update render :partial documentation. #5646 [matt@mattmargolis.net]
-
-* Integration tests behave well with render_component. #4632 [edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com]
-
-* Added exception handling of missing layouts #5373 [chris@ozmm.org]
-
-* Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]
-
-* Fixed that the flash should be reset when reset_session is called #5584 [Shugo Maeda]
-
-* Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 [murpyh@rubychan.de]
-
-* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [David Heinemeier Hansson]
-
-* Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. [Nicholas Seckar]
-
-* Avoid naming collision among compiled view methods. [Jeremy Kemper]
-
-* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [Mislav Marohnić]
-
-* Determine the correct template_root for deeply nested components.  #2841 [s.brink@web.de]
-
-* Fix that routes with *path segments in the recall can generate URLs. [Rick Olson]
-
-* Fix strip_links so that it doesn't hang on multiline <acronym> tags [Jamis Buck]
-
-* Remove problematic control chars in rescue template. #5316 [Stefan Kaes]
-
-* Make sure passed routing options are not mutated by routing code. #5314 [Blair Zajac]
-
-* Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. [Jamis Buck]
-
-* Escape the path before routing recognition. #3671
-
-* Make sure :id and friends are unescaped properly. #5275 [me@julik.nl]
-
-* Fix documentation for with_routing to reflect new reality. #5281 [rramdas@gmail.com]
-
-* Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 [mklame@atxeu.com, matthew@walker.wattle.id.au]
-
-* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [David Heinemeier Hansson]
-
-* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
-
-* Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
-
-* Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 [Manfred Stienstra <m.stienstra@fngtps.com>]
-
-* Routing rewrite. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes. [Nicholas Seckar, Jamis Buck]
-
-  map.connect '/foo/:id', :controller => '...', :action => '...'
-  map.connect '/foo/:id.:format', :controller => '...', :action => '...'
-  map.connect '/foo/:id', ..., :conditions => { :method => :get }
-
-* Cope with missing content type and length headers. Parse parameters from multipart and urlencoded request bodies only. [Jeremy Kemper]
-
-* Accept multipart PUT parameters. #5235 [guy.naor@famundo.com]
-
-* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.find :all
-
-      respond_to do |format|
-        format.html
-        format.xml { render :xml => @posts.to_xml }
-        format.rss { render :action => "feed.rxml" }
-      end
-    end
-  end
-
-  # returns HTML when requested by a browser, since the browser
-  # has the HTML mimetype at the top of its priority list
-  Accept: text/html
-  GET /weblog
-
-  # returns the XML
-  Accept: application/xml
-  GET /weblog
-
-  # returns the HTML
-  Accept: application/xml
-  GET /weblog.html
-
-  # returns the XML
-  Accept: text/html
-  GET /weblog.xml
-
-  All this relies on the fact that you have a route that includes .:format.
-
-* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [David Heinemeier Hansson]
-
-* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [David Heinemeier Hansson]
-
-* follow_redirect doesn't complain about being redirected to the same controller. #5153 [dymo@mk.ukrtelecom.ua]
-
-* Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark]
-
-* Fix NoMethodError when parsing params like &&. [Adam Greenfield]
-
-* Fix flip flopped logic in docs for url_for's :only_path option. Closes #4998. [esad@esse.at]
-
-* form.text_area handles the :size option just like the original text_area (:size => '60x10' becomes cols="60" rows="10").  [Jeremy Kemper]
-
-* Excise ingrown code from FormOptionsHelper#options_for_select. #5008 [anonymous]
-
-* Small fix in routing to allow dynamic routes (broken after [4242]) [Rick Olson]
-
-    map.connect '*path', :controller => 'files', :action => 'show'
-
-* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
-
-* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
-
-* Use #flush between switching from #write to #syswrite. Closes #4907. [Blair Zajac <blair@orcaware.com>]
-
-* Documentation fix: integration test scripts don't require integration_test. Closes #4914. [Frederick Ros <sl33p3r@free.fr>]
-
-* ActionController::Base Summary documentation rewrite. Closes #4900. [Kevin Clark]
-
-* Fix text_helper.rb documentation rendering. Closes #4725. [Frederick Ros]
-
-* Fixes bad rendering of JavaScriptMacrosHelper rdoc (closes #4910) [Frederick Ros]
-
-* Allow error_messages_for to report errors for multiple objects, as well as support for customizing the name of the object in the error summary header. Closes #4186. [andrew@redlinesoftware.com, Marcel Molina Jr.]
-
-  error_messages_for :account, :user, :subscription, :object_name => :account
-
-* Enhance documentation for setting headers in integration tests. Skip auto HTTP prepending when its already there. Closes #4079. [Rick Olson]
-
-* Documentation for AbstractRequest. Closes #4895. [Kevin Clark]
-
-* Refactor various InstanceTag instance method to class methods. Closes #4800. [Stefan Kaes]
-
-* Remove all remaining references to @params in the documentation. [Marcel Molina Jr.]
-
-* Add documentation for redirect_to :back's RedirectBackError exception.  [Marcel Molina Jr.]
-
-* Update layout and content_for documentation to use yield rather than magic @content_for instance variables. [Marcel Molina Jr.]
-
-* Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: [Rick Olson]
-
-    redirect_to :action => 'new'
-    assert_redirected_to :controller => 'monkeys', :action => 'new'
-
-* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick Olson]
-
-* Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick Olson]
-
-    assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
-    assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
-
-* Diff compared options with #assert_redirected_to [Rick Olson]
-
-* Add support in routes for semicolon delimited "subpaths", like /books/:id;:action [Jamis Buck]
-
-* Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. [zraii@comcast.net, Sam Stephenson]
-
-* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [David Heinemeier Hansson]
-
-* Modify routing so that you can say :require => { :method => :post } for a route, and the route will never be selected unless the request method is POST. Only works for route recognition, not for route generation. [Jamis Buck]
-
-* Added :add_headers option to verify which merges a hash of name/value pairs into the response's headers hash if the prerequisites cannot be satisfied. [Sam Stephenson]
-  ex. verify :only => :speak, :method => :post,
-             :render => { :status => 405, :text => "Must be post" },
-             :add_headers => { "Allow" => "POST" }
-
-* Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled #1897 [jeremye@bsa.ca.gov]
-
-
-*1.13.3* (March 12th, 2007)
-
-* Apply [5709] to stable.
-
-* session_enabled? works with session :off.  #6680 [Jonathan del Strother]
-
-* Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  [Stefan Kaes]
-
-
-*1.13.2* (February 5th, 2007)
-
-* Add much-needed html-scanner tests.  Fixed CDATA parsing bug. [Rick Olson]
-
-* improve error message for Routing for named routes. [Rob Sanheim]
-
-* Added enhanced docs to routing assertions. [Rob Sanheim]
-
-* fix form_for example in ActionController::Resources documentation. [gnarg]
-
-* Add singleton resources from trunk [Rick Olson]
-
-* select :multiple => true suffixes the attribute name with [] unless already suffixed.  #6977 [nik.kakelin, ben, julik]
-
-* Improve routes documentation.  #7095 [zackchandler]
-
-* Resource member routes require :id, eliminating the ambiguous overlap with collection routes.  #7229 [dkubb]
-
-* Fixed NumberHelper#number_with_delimiter to use "." always for splitting the original number, not the delimiter parameter #7389 [ceefour]
-
-* Autolinking recognizes trailing and embedded . , : ;  #7354 [Jarkko Laine]
-
-* Make TextHelper::auto_link recognize URLs with colons in path correctly, fixes #7268.  [imajes]
-
-* Improved auto_link to match more valid urls correctly [Tobias Lütke]
-
-
-*1.13.1* (January 18th, 2007)
-
-* Fixed content-type bug in Prototype [sam]
-
-
-*1.13.0* (January 16th, 2007)
-
-* Modernize cookie testing code, and increase coverage (Heckle++) #7101 [Kevin Clark]
-
-* Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
-
-* Update to Prototype 1.5.0. [Sam Stephenson]
-
-* Allow exempt_from_layout :rhtml.  #6742, #7026 [Dan Manges, Squeegy]
-
-* Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 [Nicholas Seckar, aiwilliams, brentrowland]
-
-* link_to_unless_current works with full URLs as well as paths.  #6891 [Jarkko Laine, Manfred Stienstra, idrifter]
-
-* Fix HTML::Node to output double quotes instead of single quotes.  Closes #6845 [mitreandy]
-
-* Fix no method error with error_messages_on.  Closes #6935 [nik.wakelin Koz]
-
-* Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs.  Closes #6922 [Steven Bristol]
-
-* Slight doc tweak to #prepend_filter.  Closes #6493 [Jeremy Voorhis]
-
-* Add more extensive documentation to the AssetTagHelper.  Closes #6452 [Bob Silva]
-
-* Clean up multiple calls to #stringify_keys in TagHelper, add better documentation and testing for TagHelper.  Closes #6394 [Bob Silva]
-
-* [DOCS] fix reference to ActionController::Macros::AutoComplete for #text_field_with_auto_complete. Closes #2578 [Jan Prill]
-
-* Make sure html_document is reset between integration test requests. [ctm]
-
-* Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.  [Josh Susser]
-
-* Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting.  Closes #6128.  [Rick Olson]
-
-* Ensure render :json => ... skips the layout.  #6808 [Josh Peek]
-
-* Silence log_error deprecation warnings from inspecting deprecated instance variables.  [Nate Wiger]
-
-* Only cache GET requests with a 200 OK response.  #6514, #6743 [RSL, anamba]
-
-* Correctly report which filter halted the chain.  #6699 [Martin Emde]
-
-* respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument.  #4185 [Scott Raymond, eventualbuddha]
-    # application/json response with body 'Element.show({:name: "David"})'
-    respond_to do |format|
-      format.json { render :json => { :name => "David" }.to_json, :callback => 'Element.show' }
-    end
-
-* Makes :discard_year work without breaking multi-attribute parsing in AR.  #1260, #3800 [sean@ardismg.com, jmartin@desertflood.com, stephen@touset.org, Bob Silva]
-
-* Adds html id attribute to date helper elements.  #1050, #1382 [mortonda@dgrmm.net, David North, Bob Silva]
-
-* Add :index and @auto_index capability to model driven date/time selects.  #847, #2655 [moriq, Doug Fales, Bob Silva]
-
-* Add :order to datetime_select, select_datetime, and select_date.  #1427 [Timothee Peignier, Patrick Lenz, Bob Silva]
-
-* Added time_select to work with time values in models. Update scaffolding.  #2489, #2833 [Justin Palmer, Andre Caum, Bob Silva]
-
-* Added :include_seconds to select_datetime, datetime_select and time_select.  #2998 [csn, Bob Silva]
-
-* All date/datetime selects can now accept an array of month names with :use_month_names. Allows for localization.  #363 [tomasj, Bob Silva]
-
-* Adds :time_separator to select_time and :date_separator to select_datetime. Preserves BC.  #3811 [Bob Silva]
-
-* @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status.  [Jeremy Kemper]
-
-* Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [David Heinemeier Hansson]
-
-* Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [David Heinemeier Hansson]
-
-
-*1.13.0 RC1* (r5619, November 22nd, 2006)
-
-* Update Routing to complain when :controller is not specified by a route. Closes #6669. [Nicholas Seckar]
-
-* Ensure render_to_string cleans up after itself when an exception is raised.  #6658 [rsanheim]
-
-* Update to Prototype and script.aculo.us [5579]. [Sam Stephenson, Thomas Fuchs]
-
-* simple_format helper doesn't choke on nil.  #6644 [jerry426]
-
-* Reuse named route helper module between Routing reloads. Use remove_method to delete named route methods after each load. Since the module is never collected, this fixes a significant memory leak. [Nicholas Seckar]
-
-* Deprecate standalone components.  [Jeremy Kemper]
-
-* Always clear model associations from session.  #4795 [sd@notso.net, andylien@gmail.com]
-
-* Remove JavaScriptLiteral in favor of ActiveSupport::JSON::Variable. [Sam Stephenson]
-
-* Sync ActionController::StatusCodes::STATUS_CODES with http://www.iana.org/assignments/http-status-codes.  #6586 [dkubb]
-
-* Multipart form values may have a content type without being treated as uploaded files if they do not provide a filename.  #6401 [Andreas Schwarz, Jeremy Kemper]
-
-* assert_response supports symbolic status codes.  #6569 [Kevin Clark]
-    assert_response :ok
-    assert_response :not_found
-    assert_response :forbidden
-
-* Cache parsed query parameters.  #6559 [Stefan Kaes]
-
-* Deprecate JavaScriptHelper#update_element_function, which is superseeded by RJS [Thomas Fuchs]
-
-* Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing.  #6524 [Bob Silva]
-
-* Set ActionView::Base.default_form_builder once rather than passing the :builder option to every form or overriding the form helper methods.  [Jeremy Kemper]
-
-* Deprecate expire_matched_fragments. Use expire_fragment instead.  #6535 [Bob Silva]
-
-* Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  [Rick Olson]
-
-* Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag [Rick Olson]
-
-* Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  [Rick Olson]
-
-* Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
-
-   <% content_tag :div, :class => "strong" %>
-     Hello world!
-   <% end %>
-
-  Will output:
-    <div class="strong">Hello world!</div>
-
-* Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 [Bob Silva]
-
-* Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 [Bob Silva]
-
-* Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 [Bob Silva/chrismear]
-
-* Force *_url named routes to show the host in ActionView [Rick Olson]
-
-  <%= url_for ... %> # no host
-  <%= foo_path %>    # no host
-  <%= foo_url %>     # host!
-
-* Add support for converting blocks into function arguments to JavaScriptGenerator#call and JavaScriptProxy#call. [Sam Stephenson]
-
-* Add JavaScriptGenerator#literal for wrapping a string in an object whose #to_json is the string itself. [Sam Stephenson]
-
-* Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. [Rick Olson]
-
-* Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. [Rick Olson]
-
-* Fix routing to correctly determine when generation fails. Closes #6300. [psross].
-
-* Fix broken assert_generates when extra keys are being checked. [Jamis Buck]
-
-* Replace KCODE checks with String#chars for truncate.  Closes #6385 [Manfred Stienstra]
-
-* Make page caching respect the format of the resource that is being requested even if the current route is the default route so that, e.g. posts.rss is not transformed by url_for to '/' and subsequently cached as '/index.html' when it should be cached as '/posts.rss'.  [Marcel Molina Jr.]
-
-* Use String#chars in TextHelper::excerpt. Closes #6386 [Manfred Stienstra]
-
-* Fix relative URL root matching problems. [Mark Imbriaco]
-
-* Fix filter skipping in controller subclasses.  #5949, #6297, #6299 [Martin Emde]
-
-* render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API).  [Jeremy Kemper]
-
-* Rename test assertion to prevent shadowing. Closes #6306. [psross]
-
-* Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 [Philip Hallstrom]
-
-* Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 [evansj]
-
-* Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]. Example:
-
-    update_page_tag :defer => 'true' { |page| ... }
-
-  Gives:
-
-    <script defer="true" type="text/javascript">...</script>
-
-  Which is needed for dealing with the IE6 DOM when it's not yet fully loaded.
-
-* Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 [Mike Naberezny]
-
-* Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 [sven@c3d2.de]
-
-* Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 [cmselmer]
-
-* respond_to :html doesn't assume .rhtml.  #6281 [Hampton Catlin]
-
-* Fixed some deprecation warnings in ActionPack [Rick Olson]
-
-* assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them.  #6240 [japgolly]
-
-* Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead.  [Jeremy Kemper]
-
-* Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples:
-
-    head :status => 404        # expands to "404 Not Found"
-    head :status => :not_found # expands to "404 Not Found"
-    head :status => :created   # expands to "201 Created"
-
-* Add head(options = {}) for responses that have no body. [Jamis Buck]. Examples:
-
-    head :status => 404 # return an empty response with a 404 status
-    head :location => person_path(@person), :status => 201
-
-* Fix bug that kept any before_filter except the first one from being able to halt the before_filter chain.  [Rick Olson]
-
-* strip_links is case-insensitive.  #6285 [tagoh, Bob Silva]
-
-* Clear the cache of possible controllers whenever Routes are reloaded. [Nicholas Seckar]
-
-* Filters overhaul including meantime filter support using around filters + blocks.  #5949 [Martin Emde, Roman Le Negrate, Stefan Kaes, Jeremy Kemper]
-
-* Update CGI process to allow sessions to contain namespaced models. Closes #4638. [dfelstead@site5.com]
-
-* Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. [Nicholas Seckar]
-
-* Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 [sdsykes, fhanshaw@vesaria.com]
-
-* Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
-
-    respond_to do |format|
-      format.html { render :text => "I'm being sent as text/html" }
-      format.rss  { render :text => "I'm being sent as application/rss+xml" }
-      format.atom { render :text => "I'm being sent as application/xml", :content_type => Mime::XML }
-    end
-
-* Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) [David Heinemeier Hansson]
-
-* Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
-
-    response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
-
-  ...now:
-
-    response.content_type = Mime::ATOM
-    response.charset      = "utf-8"
-
-* Declare file extensions exempt from layouts.  #6219 [brandon]
-    Example: ActionController::Base.exempt_from_layout 'rpdf'
-
-* Add chained replace/update support for assert_select_rjs [Rick Olson]
-
-    Given RJS like...
-
-      page['test1'].replace "<div id=\"1\">foo</div>"
-      page['test2'].replace_html "<div id=\"2\">foo</div>"
-
-    Test it with...
-
-      assert_select_rjs :chained_replace
-      assert_select_rjs :chained_replace, "test1"
-
-      assert_select_rjs :chained_replace_html
-      assert_select_rjs :chained_replace_html, "test2"
-
-* Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 [choonkeat@gmail.com]
-
-* Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [Manfred Stienstra, raphinou@yahoo.com]
-
-* Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 [Eric Hodel]
-
-* Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids,  #6068 [petermichaux@gmail.com]
-
-* Update UrlWriter to support :only_path. [Nicholas Seckar, Dave Thomas]
-
-* Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
-
-    link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
-
-  ...can be written like this:
-
-    link_to("Hider", :class => "hider_link") { |p| p[:something].hide }
-
-* Added access to nested attributes in RJS #4548 [richcollins@gmail.com]. Examples:
-
-    page['foo']['style']                  # => $('foo').style;
-    page['foo']['style']['color']         # => $('blank_slate').style.color;
-    page['foo']['style']['color'] = 'red' # => $('blank_slate').style.color = 'red';
-    page['foo']['style'].color = 'red'    # => $('blank_slate').style.color = 'red';
-
-* Fixed that AssetTagHelper#image_tag and others using compute_public_path should not modify the incoming source argument (closes #5102) [eule@space.ch]
-
-* Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension [David Heinemeier Hansson]
-
-* Fixed FormOptionsHelper#select to respect :selected value #5813
-
-* Fixed TextHelper#simple_format to deal with multiple single returns within a single paragraph #5835 [moriq@moriq.com]
-
-* Fixed TextHelper#pluralize to handle 1 as a string #5909 [rails@bencurtis.com]
-
-* Improved resolution of DateHelper#distance_of_time_in_words for better precision #5994 [Bob Silva]
-
-* Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" [David Heinemeier Hansson]
-
-* Added deprecation language for pagination which will become a plugin by Rails 2.0 [David Heinemeier Hansson]
-
-* Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 [David Heinemeier Hansson]
-
-* Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support [David Heinemeier Hansson]
-
-* Added assert_select* for CSS selector-based testing (deprecates assert_tag) #5936 [assaf.arkin@gmail.com]
-
-* radio_button_tag generates unique id attributes.  #3353 [Bob Silva, somekool@gmail.com]
-
-* strip_tags passes through blank args such as nil or "".  #2229, #6702 [duncan@whomwah.com, dharana]
-
-* Cleanup assert_tag :children counting.  #2181 [jamie@bravenet.com]
-
-* button_to accepts :method so you can PUT and DELETE with it.  #6005 [Dan Webb]
-
-* Update sanitize text helper to strip plaintext tags, and <img src="javascript:bang">.  [Rick Olson]
-
-* Add routing tests to assert that RoutingError is raised when conditions aren't met.  Closes #6016 [Nathan Witmer]
-
-* Make auto_link parse a greater subset of valid url formats. [Jamis Buck]
-
-* Integration tests: headers beginning with X aren't excluded from the HTTP_ prefix, so X-Requested-With becomes HTTP_X_REQUESTED_WITH as expected. [Mike Clark]
-
-* Switch to using FormEncodedPairParser for parsing request parameters. [Nicholas Seckar, David Heinemeier Hansson]
-
-* respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. [Tobias Lütke]
-
-* Deprecation: test deprecated instance vars in partials. [Jeremy Kemper]
-
-* Add UrlWriter to allow writing urls from Mailers and scripts. [Nicholas Seckar]
-
-* Relax Routing's anchor pattern warning; it was preventing use of [^/] inside restrictions. [Nicholas Seckar]
-
-* Add controller_paths variable to Routing. [Nicholas Seckar]
-
-* Fix assert_redirected_to issue with named routes for module controllers.  [Rick Olson]
-
-* Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson]
-
-* Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar]
-
-* Add RoutingError exception when RouteSet fails to generate a path from a Named Route. [Rick Olson]
-
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Deprecation: check whether instance variables have been monkeyed with before assigning them to deprecation proxies. Raises a RuntimeError if so. [Jeremy Kemper]
-
-* Add support for the param_name parameter to the auto_complete_field helper. #5026 [david.a.williams@gmail.com]
-
-* Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. [Jeremy Kemper]
-
-* Make Routing noisy when an anchor regexp is assigned to a segment. #5674 [François Beausoleil]
-
-* Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 [pjhyett@gmail.com]
-
-* Make controller_path available as an instance method.  #5724 [jmckible@gmail.com]
-
-* Update query parser to support adjacent hashes. [Nicholas Seckar]
-
-* Make action caching aware of different formats for the same action so that, e.g.  foo.xml is cached separately from foo.html. Implicitly set content type when reading in cached content with mime revealing extensions so the entire onous isn't on the webserver. [Marcel Molina Jr.]
-
-* Restrict Request Method hacking with ?_method to POST requests.  [Rick Olson]
-
-* Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  [Rick Olson]
-
-* Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
-
-    map.resources :messages
-    map.resources :messages, :comments
-    map.resources :messages, :new => { :preview => :post }
-
-* Fixed that integration simulation of XHRs should set Accept header as well [Edward Frederick]
-
-* TestRequest#reset_session should restore a TestSession, not a hash [Michael Koziarski]
-
-* Don't search a load-path of '.' for controller files [Jamis Buck]
-
-* Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar]
-
-* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow]
-
-* Allow form_for and fields_for to work with indexed form inputs.  [Jeremy Kemper, Matt Lyon]
-
-  <% form_for 'post[]', @post do |f| -%>
-  <% end -%>
-
-* Remove leak in development mode by replacing define_method with module_eval. [Nicholas Seckar]
-
-* Provide support for decimal columns to form helpers. Closes #5672. [Dave Thomas]
-
-* Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 [olivier_ansaldi@yahoo.com]
-
-* Reset @html_document between requests so assert_tag works. #4810 [Jarkko Laine, easleydp@gmail.com]
-
-* Integration tests behave well with render_component. #4632 [edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com]
-
-* Added exception handling of missing layouts #5373 [chris@ozmm.org]
-
-* Fixed that real files and symlinks should be treated the same when compiling templates #5438 [zachary@panandscan.com]
-
-* Fixed that the flash should be reset when reset_session is called #5584 [Shugo Maeda]
-
-* Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 [murpyh@rubychan.de]
-
-* Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) [David Heinemeier Hansson]
-
-* Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. [Nicholas Seckar]
-
-* Avoid naming collision among compiled view methods. [Jeremy Kemper]
-
-* Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 [Mislav Marohnić]
-
-* Determine the correct template_root for deeply nested components.  #2841 [s.brink@web.de]
-
-* Fix that routes with *path segments in the recall can generate URLs. [Rick Olson]
-
-* Fix strip_links so that it doesn't hang on multiline <acronym> tags [Jamis Buck]
-
-* Remove problematic control chars in rescue template. #5316 [Stefan Kaes]
-
-* Make sure passed routing options are not mutated by routing code. #5314 [Blair Zajac]
-
-* Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. [Jamis Buck]
-
-* Escape the path before routing recognition. #3671
-
-* Make sure :id and friends are unescaped properly. #5275 [me@julik.nl]
-
-* Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 [mklame@atxeu.com, matthew@walker.wattle.id.au]
-
-* Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types [David Heinemeier Hansson]
-
-* Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
-
-* Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
-
-* Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 [Manfred Stienstra <m.stienstra@fngtps.com>]
-
-* Routing rewrite. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes. [Nicholas Seckar, Jamis Buck]
-
-  map.connect '/foo/:id', :controller => '...', :action => '...'
-  map.connect '/foo/:id.:format', :controller => '...', :action => '...'
-  map.connect '/foo/:id', ..., :conditions => { :method => :get }
-
-* Cope with missing content type and length headers. Parse parameters from multipart and urlencoded request bodies only. [Jeremy Kemper]
-
-* Accept multipart PUT parameters. #5235 [guy.naor@famundo.com]
-
-* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.find :all
-
-      respond_to do |format|
-        format.html
-        format.xml { render :xml => @posts.to_xml }
-        format.rss { render :action => "feed.rxml" }
-      end
-    end
-  end
-
-  # returns HTML when requested by a browser, since the browser
-  # has the HTML mimetype at the top of its priority list
-  Accept: text/html
-  GET /weblog
-
-  # returns the XML
-  Accept: application/xml
-  GET /weblog
-
-  # returns the HTML
-  Accept: application/xml
-  GET /weblog.html
-
-  # returns the XML
-  Accept: text/html
-  GET /weblog.xml
-
-  All this relies on the fact that you have a route that includes .:format.
-
-* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [David Heinemeier Hansson]
-
-* Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete [David Heinemeier Hansson]
-
-* follow_redirect doesn't complain about being redirected to the same controller. #5153 [dymo@mk.ukrtelecom.ua]
-
-* Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. [Kevin Clark]
-
-* Fix NoMethodError when parsing params like &&. [Adam Greenfield]
-
-* form.text_area handles the :size option just like the original text_area (:size => '60x10' becomes cols="60" rows="10").  [Jeremy Kemper]
-
-* Excise ingrown code from FormOptionsHelper#options_for_select. #5008 [anonymous]
-
-* Small fix in routing to allow dynamic routes (broken after [4242]) [Rick Olson]
-
-    map.connect '*path', :controller => 'files', :action => 'show'
-
-* Use #flush between switching from #write to #syswrite. Closes #4907. [Blair Zajac <blair@orcaware.com>]
-
-* Allow error_messages_for to report errors for multiple objects, as well as support for customizing the name of the object in the error summary header. Closes #4186. [andrew@redlinesoftware.com, Marcel Molina Jr.]
-
-  error_messages_for :account, :user, :subscription, :object_name => :account
-
-* Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: [Rick Olson]
-
-    redirect_to :action => 'new'
-    assert_redirected_to :controller => 'monkeys', :action => 'new'
-
-* Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method [Rick Olson]
-
-    assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
-    assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
-
-* Diff compared options with #assert_redirected_to [Rick Olson]
-
-* Add support in routes for semicolon delimited "subpaths", like /books/:id;:action [Jamis Buck]
-
-* Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. [zraii@comcast.net, Sam Stephenson]
-
-* Modify routing so that you can say :require => { :method => :post } for a route, and the route will never be selected unless the request method is POST. Only works for route recognition, not for route generation. [Jamis Buck]
-
-* Added :add_headers option to verify which merges a hash of name/value pairs into the response's headers hash if the prerequisites cannot be satisfied. [Sam Stephenson]
-  ex. verify :only => :speak, :method => :post,
-             :render => { :status => 405, :text => "Must be post" },
-             :add_headers => { "Allow" => "POST" }
-
-
-*1.12.5* (August 10th, 2006)
-
-* Updated security fix
-
-
-*1.12.4* (August 8th, 2006)
-
-* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick Olson]
-
-* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [David Heinemeier Hansson]
-
-* Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled.  #1897 [jeremye@bsa.ca.gov]
-
-* Fixed that real files and symlinks should be treated the same when compiling templates.  #5438 [zachary@panandscan.com]
-
-* Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 [Manfred Stienstra <m.stienstra@fngtps.com>]
-
-* Update documentation for erb trim syntax. #5651 [matt@mattmargolis.net]
-
-* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
-
-
-*1.12.3* (June 28th, 2006)
-
-* Fix broken traverse_to_controller. We now:
-  Look for a _controller.rb file under RAILS_ROOT to load.
-  If we find it, we require_dependency it and return the controller it defined. (If none was defined we stop looking.)
-  If we don't find it, we look for a .rb file under RAILS_ROOT to load. If we find it, and it loads a constant we keep looking.
-  Otherwise we check to see if a directory of the same name exists, and if it does we create a module for it.
-
-
-*1.12.2* (June 27th, 2006)
-
-* Refinement to avoid exceptions in traverse_to_controller.
-
-* (Hackish) Fix loading of arbitrary files in Ruby's load path by traverse_to_controller. [Nicholas Seckar]
-
-
-*1.12.1* (April 6th, 2006)
-
-* Fixed that template extensions would be cached development mode #4624 [Stefan Kaes]
-
-* Update to Prototype 1.5.0_rc0 [Sam Stephenson]
-
-* Honor skipping filters conditionally for only certain actions even when the parent class sets that filter to conditionally be executed only for the same actions. #4522 [Marcel Molina Jr.]
-
-* Delegate xml_http_request in integration tests to the session instance. [Jamis Buck]
-
-* Update the diagnostics template skip the useless '<controller not set>' text. [Nicholas Seckar]
-
-* CHANGED DEFAULT: Don't parse YAML input by default, but keep it available as an easy option [David Heinemeier Hansson]
-
-* Add additional autocompleter options [aballai, Thomas Fuchs]
-
-* Fixed fragment caching of binary data on Windows #4493 [bellis@deepthought.org]
-
-* Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us [Sam Stephenson, Thomas Fuchs]
-
-* Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [David Heinemeier Hansson]. Example:
-
-    image_tag("rails.png") # => '<img alt="Rails" src="/images/rails.png?1143664135" />'
-
-  ...to avoid frequent stats (not a problem for most people), you can set RAILS_ASSET_ID in the ENV to avoid stats:
-
-    ENV["RAILS_ASSET_ID"] = "2345"
-    image_tag("rails.png") # => '<img alt="Rails" src="/images/rails.png?2345" />'
-
-  This can be used by deployment managers to set the asset id by application revision
-
-
-*1.12.0* (March 27th, 2006)
-
-* Add documentation for respond_to. [Jamis Buck]
-
-* Fixed require of bluecloth and redcloth when gems haven't been loaded #4446 [murphy@cYcnus.de]
-
-* Update to Prototype 1.5.0_pre1 [Sam Stephenson]
-
-* Change #form_for and #fields_for so that the second argument is not required [Dave Thomas]
-
-    <% form_for :post, @post, :url => { :action => 'create' } do |f| -%>
-
-  becomes...
-
-    <% form_for :post, :url => { :action => 'create' } do |f| -%>
-
-* Update to script.aculo.us 1.6 [Thomas Fuchs]
-
-* Enable application/x-yaml processing by default [Jamis Buck]
-
-* Fix double url escaping of remote_function. Add :escape => false option to ActionView's url_for. [Nicholas Seckar]
-
-* Add :script option to in_place_editor to support evalScripts (closes #4194) [Cody Fauser]
-
-* Fix mixed case enumerable methods in the JavaScript Collection Proxy (closes #4314) [Cody Fauser]
-
-* Undo accidental escaping for mail_to; add regression test. [Nicholas Seckar]
-
-* Added nicer message for assert_redirected_to (closes #4294) [court3nay]
-
-    assert_redirected_to :action => 'other_host', :only_path => false
-
-  when it was expecting...
-
-    redirected_to :action => 'other_host', :only_path => true, :host => 'other.test.host'
-
-  gives the error message...
-
-    response is not a redirection to all of the options supplied (redirection is <{:only_path=>false, :host=>"other.test.host", :action=>"other_host"}>), difference: <{:only_path=>"true", :host=>"other.test.host"}>
-
-* Change url_for to escape the resulting URLs when called from a view. [Nicholas Seckar, coffee2code]
-
-* Added easy support for testing file uploads with fixture_file_upload #4105 [turnip@turnipspatch.com]. Example:
-
-    # Looks in Test::Unit::TestCase.fixture_path + '/files/spongebob.png'
-    post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
-
-* Fixed UrlHelper#current_page? to behave even when url-escaped entities are present #3929 [jeremy@planetargon.com]
-
-* Add ability for relative_url_root to be specified via an environment variable RAILS_RELATIVE_URL_ROOT. [isaac@reuben.com, Nicholas Seckar]
-
-* Fixed link_to "somewhere", :post => true to produce valid XHTML by using the parentnode instead of document.body for the instant form #3007 [Bob Silva]
-
-* Added :function option to PrototypeHelper#observe_field/observe_form that allows you to call a function instead of submitting an ajax call as the trigger #4268 [jonathan@daikini.com]
-
-* Make Mime::Type.parse consider q values (if any) [Jamis Buck]
-
-* XML-formatted requests are typecast according to "type" attributes for :xml_simple [Jamis Buck]
-
-* Added protection against proxy setups treating requests as local even when they're not #3898 [Steve Purcell]
-
-* Added TestRequest#raw_post that simulate raw_post from CgiRequest #3042 [François Beausoleil]
-
-* Underscore dasherized keys in formatted requests [Jamis Buck]
-
-* Add MimeResponds::Responder#any for managing multiple types with identical responses [Jamis Buck]
-
-* Make the xml_http_request testing method set the HTTP_ACCEPT header [Jamis Buck]
-
-* Add Verification to scaffolds.   Prevent destructive actions using GET [Michael Koziarski]
-
-* Avoid hitting the filesystem when using layouts by using a File.directory? cache. [Stefan Kaes, Nicholas Seckar]
-
-* Simplify ActionController::Base#controller_path [Nicholas Seckar]
-
-* Added simple alert() notifications for RJS exceptions when config.action_view.debug_rjs = true. [Sam Stephenson]
-
-* Added :content_type option to render, so you can change the content type on the fly [David Heinemeier Hansson]. Example: render :action => "atom.rxml", :content_type => "application/atom+xml"
-
-* CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason [David Heinemeier Hansson]
-
-* Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [David Heinemeier Hansson]. Example:
-
-    class WeblogController < ActionController::Base
-      def index
-        @posts = Post.find :all
-
-        respond_to do |type|
-          type.html # using defaults, which will render weblog/index.rhtml
-          type.xml  { render :action => "index.rxml" }
-          type.js   { render :action => "index.rjs" }
-        end
-      end
-    end
-
-* Added better support for using the same actions to output for different sources depending on the Accept header [David Heinemeier Hansson]. Example:
-
-    class WeblogController < ActionController::Base
-      def create
-        @post = Post.create(params[:post])
-
-        respond_to do |type|
-          type.js   { render }  # renders create.rjs
-          type.html { redirect_to :action => "index" }
-          type.xml  do
-            headers["Location"] = url_for(:action => "show", :id => @post)
-            render(:nothing, :status => "201 Created")
-          end
-        end
-      end
-    end
-
-* Added Base#render(:xml => xml) that works just like Base#render(:text => text), but sets the content-type to text/xml and the charset to UTF-8 [David Heinemeier Hansson]
-
-* Integration test's url_for now runs in the context of the last request (if any) so after post /products/show/1 url_for :action => 'new' will yield /product/new  [Tobias Lütke]
-
-* Re-added mixed-in helper methods for the JavascriptGenerator.  Moved JavascriptGenerators methods to a module that is mixed in after the helpers are added.  Also fixed that variables set in the enumeration methods like #collect are set correctly.  Documentation added for the enumeration methods [Rick Olson].  Examples:
-
-    page.select('#items li').collect('items') do |element|
-      element.hide
-    end
-    # => var items = $$('#items li').collect(function(value, index) { return value.hide(); });
-
-* Added plugin support for parameter parsers, which allows for better support for REST web services. By default, posts submitted with the application/xml content type is handled by creating a XmlSimple hash with the same name as the root element of the submitted xml. More handlers can easily be registered like this:
-
-    # Assign a new param parser to a new content type
-    ActionController::Base.param_parsers['application/atom+xml'] = Proc.new do |data|
-      node = REXML::Document.new(post)
-     { node.root.name => node.root }
-    end
-
-    # Assign the default XmlSimple to a new content type
-    ActionController::Base.param_parsers['application/backpack+xml'] = :xml_simple
-
-Default YAML web services were retired, ActionController::Base.param_parsers carries an example which shows how to get this functionality back. As part of this new plugin support, request.[formatted_post?, xml_post?, yaml_post? and post_format] were all deprecated in favor of request.content_type [Tobias Lütke]
-
-* Fixed Effect.Appear in effects.js to work with floats in Safari #3524, #3813, #3044 [Thomas Fuchs]
-
-* Fixed that default image extension was not appended when using a full URL with AssetTagHelper#image_tag #4032, #3728 [rubyonrails@beautifulpixel.com]
-
-* Added that page caching will only happen if the response code is less than 400 #4033 [g.bucher@teti.ch]
-
-* Add ActionController::IntegrationTest to allow high-level testing of the way the controllers and routes all work together [Jamis Buck]
-
-* Added support to AssetTagHelper#javascript_include_tag for having :defaults appear anywhere in the list, so you can now make one call ala javascript_include_tag(:defaults, "my_scripts") or javascript_include_tag("my_scripts", :defaults) depending on how you want the load order #3506 [Bob Silva]
-
-* Added support for visual effects scoped queues to the visual_effect helper #3530 [Abdur-Rahman Advany]
-
-* Added .rxml (and any non-rhtml template, really) supportfor CaptureHelper#content_for and CaptureHelper#capture #3287 [Brian Takita]
-
-* Added script.aculo.us drag and drop helpers to RJS [Thomas Fuchs]. Examples:
-
-    page.draggable 'product-1'
-    page.drop_receiving 'wastebasket', :url => { :action => 'delete' }
-    page.sortable 'todolist', :url => { action => 'change_order' }
-
-* Fixed that form elements would strip the trailing [] from the first parameter #3545 [ruby@bobsilva.com]
-
-* During controller resolution, update the NameError suppression to check for the expected constant. [Nicholas Seckar]
-
-* Update script.aculo.us to V1.5.3 [Thomas Fuchs]
-
-* Added various InPlaceEditor options, #3746, #3891, #3896, #3906 [Bill Burcham, ruairi, sl33p3r]
-
-* Added :count option to pagination that'll make it possible for the ActiveRecord::Base.count call to using something else than * for the count. Especially important for count queries using DISTINCT #3839 [Stefan Kaes]
-
-* Update script.aculo.us to V1.5.2 [Thomas Fuchs]
-
-* Added element and collection proxies to RJS [David Heinemeier Hansson]. Examples:
-
-    page['blank_slate']                  # => $('blank_slate');
-    page['blank_slate'].show             # => $('blank_slate').show();
-    page['blank_slate'].show('first').up # => $('blank_slate').show('first').up();
-
-    page.select('p')                      # => $$('p');
-    page.select('p.welcome b').first      # => $$('p.welcome b').first();
-    page.select('p.welcome b').first.hide # => $$('p.welcome b').first().hide();
-
-* Add JavaScriptGenerator#replace for replacing an element's "outer HTML". #3246 [tom@craz8.com, Sam Stephenson]
-
-* Remove over-engineered form_for code for a leaner implementation. [Nicholas Seckar]
-
-* Document form_for's :html option. [Nicholas Seckar]
-
-* Major components cleanup and speedup.  #3527 [Stefan Kaes]
-
-* Fix problems with pagination and :include.  [Kevin Clark]
-
-* Add ActiveRecordTestCase for testing AR integration. [Kevin Clark]
-
-* Add Unit Tests for pagination [Kevin Clark]
-
-* Add :html option for specifying form tag options in form_for. [Sam Stephenson]
-
-* Replace dubious controller parent class in filter docs. #3655, #3722  [info@rhalff.com, eigentone@gmail.com]
-
-* Don't interpret the :value option on text_area as an html attribute. Set the text_area's value. #3752 [gabriel@gironda.org]
-
-* Fix remote_form_for creates a non-ajax form. [Rick Olson]
-
-* Don't let arbitrary classes match as controllers -- a potentially dangerous bug. [Nicholas Seckar]
-
-* Fix Routing tests. Fix routing where failing to match a controller would prevent the rest of routes from being attempted. [Nicholas Seckar]
-
-* Add :builder => option to form_for and friends. [Nicholas Seckar, Rick Olson]
-
-* Fix controller resolution to avoid accidentally inheriting a controller from a parent module. [Nicholas Seckar]
-
-* Set sweeper's @controller to nil after a request so that the controller may be collected between requests. [Nicholas Seckar]
-
-* Subclasses of ActionController::Caching::Sweeper should be Reloadable. [Rick Olson]
-
-* Document the :xhr option for verifications. #3666 [leeo]
-
-* Added :only and :except controls to skip_before/after_filter just like for when you add filters [David Heinemeier Hansson]
-
-* Ensure that the instance variables are copied to the template when performing render :update. [Nicholas Seckar]
-
-* Add the ability to call JavaScriptGenerator methods from helpers called in update blocks. [Sam Stephenson]  Example:
-  module ApplicationHelper
-    def update_time
-      page.replace_html 'time', Time.now.to_s(:db)
-      page.visual_effect :highlight, 'time'
-    end
-  end
-
-  class UserController < ApplicationController
-    def poll
-      render :update { |page| page.update_time }
-    end
-  end
-
-* Add render(:update) to ActionView::Base. [Sam Stephenson]
-
-* Fix render(:update) to not render layouts. [Sam Stephenson]
-
-* Fixed that SSL would not correctly be detected when running lighttpd/fcgi behind lighttpd w/mod_proxy #3548 [Steve Purcell]
-
-* Added the possibility to specify atomatic expiration for the memcachd session container #3571 [Stefan Kaes]
-
-* Change layout discovery to take into account the change in semantics with File.join and nil arguments. [Marcel Molina Jr.]
-
-* Raise a RedirectBackError if redirect_to :back is called when there's no HTTP_REFERER defined #3049 [Kevin Clark]
-
-* Treat timestamps like datetimes for scaffolding purposes #3388 [Maik Schmidt]
-
-* Fix IE bug with link_to "something", :post => true #3443 [Justin Palmer]
-
-* Extract Test::Unit::TestCase test process behavior into an ActionController::TestProcess module. [Sam Stephenson]
-
-* Pass along blocks from render_to_string to render. [Sam Stephenson]
-
-* Add render :update for inline RJS. [Sam Stephenson]  Example:
-  class UserController < ApplicationController
-    def refresh
-      render :update do |page|
-        page.replace_html  'user_list', :partial => 'user', :collection => @users
-        page.visual_effect :highlight, 'user_list'
-      end
-    end
-  end
-
-* allow nil objects for error_messages_for [Michael Koziarski]
-
-* Refactor human_size to exclude decimal place if it is zero. [Marcel Molina Jr.]
-
-* Update to Prototype 1.5.0_pre0 [Sam Stephenson]
-
-* Automatically discover layouts when a controller is namespaced. #2199, #3424 [me@jonnii.com rails@jeffcole.net Marcel Molina Jr.]
-
-* Add support for multiple proxy servers to CgiRequest#host [gaetanot@comcast.net]
-
-* Documentation typo fix. #2367 [Blair Zajac]
-
-* Remove Upload Progress. #2871 [Sean Treadway]
-
-* Fix typo in function name mapping in auto_complete_field. #2929 #3446 [doppler@gmail.com phil.ross@gmail.com]
-
-*  Allow auto-discovery of third party template library layouts. [Marcel Molina Jr.]
-
-* Have the form builder output radio button, not check box, when calling the radio button helper. #3331 [LouisStAmour@gmail.com]
-
-* Added assignment of the Autocompleter object created by JavaScriptMacroHelper#auto_complete_field to a local javascript variables [David Heinemeier Hansson]
-
-* Added :on option for PrototypeHelper#observe_field that allows you to specify a different callback hook to have the observer trigger on [David Heinemeier Hansson]
-
-* Added JavaScriptHelper#button_to_function that works just like JavaScriptHelper#link_to_function but uses a button instead of a href [David Heinemeier Hansson]
-
-* Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call [David Heinemeier Hansson]
-
-* Added :disable_with option to FormTagHelper#submit_tag to allow for easily disabled submit buttons with different text [David Heinemeier Hansson]
-
-* Make auto_link handle nil by returning quickly if blank? [Scott Barron]
-
-* Make auto_link match urls with a port number specified. [Marcel Molina Jr.]
-
-* Added support for toggling visual effects to ScriptaculousHelper::visual_effect, #3323. [Thomas Fuchs]
-
-* Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs]
-
-* Added :select option for JavaScriptMacroHelper#auto_complete_field that makes it easier to only use part of the auto-complete suggestion as the value for insertion [Thomas Fuchs]
-
-* Added delayed execution of Javascript from within RJS #3264 [devslashnull@gmail.com]. Example:
-
-    page.delay(20) do
-      page.visual_effect :fade, 'notice'
-    end
-
-* Add session ID to default logging, but remove the verbose description of every step [David Heinemeier Hansson]
-
-* Add the following RJS methods: [Sam Stephenson]
-
-    * alert - Displays an alert() dialog
-    * redirect_to - Changes window.location.href to simulate a browser redirect
-    * call - Calls a JavaScript function
-    * assign - Assigns to a JavaScript variable
-    * << - Inserts an arbitrary JavaScript string
-
-* Fix incorrect documentation for form_for [Nicholas Seckar]
-
-* Don't include a layout when rendering an rjs template using render's :template option. [Marcel Molina Jr.]
-
-*1.1.2* (December 13th, 2005)
-
-* Become part of Rails 1.0
-
-* Update to script.aculo.us 1.5.0 final (equals 1.5.0_rc6) [Thomas Fuchs]
-
-* Update to Prototype 1.4.0 final [Sam Stephenson]
-
-* Added form_remote_for (form_for meets form_remote_tag) [David Heinemeier Hansson]
-
-* Update to script.aculo.us 1.5.0_rc6
-
-* More robust relative url root discovery for SCGI compatibility.  This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint.  #3070 [Dave Ringoen]
-
-* Fix docs for text_area_tag. #3083. [Christopher Cotton]
-
-* Change form_for and fields_for method signatures to take object name and object as separate arguments rather than as a Hash. [David Heinemeier Hansson]
-
-* Introduce :selected option to the select helper.  Allows you to specify a selection other than the current value of object.method.  Specify :selected => nil to leave all options unselected.  #2991 [Jonathan Viney <jonathan@bluewire.net.nz>]
-
-* Initialize @optional in routing code to avoid warnings about uninitialized access to an instance variable. [Nicholas Seckar]
-
-* Make ActionController's render honor the :locals option when rendering a :file. #1665. [Emanuel Borsboom, Marcel Molina Jr.]
-
-* Allow assert_tag(:conditions) to match the empty string when a tag has no children. Closes #2959. [Jamis Buck]
-
-* Update html-scanner to handle CDATA sections better. Closes #2970. [Jamis Buck]
-
-* Don't put flash in session if sessions are disabled.  [Jeremy Kemper]
-
-* Strip out trailing &_= for raw post bodies. Closes #2868. [Sam Stephenson]
-
-* Pass multiple arguments to Element.show and Element.hide in JavaScriptGenerator instead of using iterators. [Sam Stephenson]
-
-* Improve expire_fragment documentation.  #2966 [court3nay]
-
-* Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan]
-
-* Always create new AR sessions rather than trying too hard to avoid database traffic.  #2731 [Jeremy Kemper]
-
-* Update to Prototype 1.4.0_rc4. Closes #2943 (old Array.prototype.reverse behavior can be obtained by passing false as an argument). [Sam Stephenson]
-
-* Use Element.update('id', 'html') instead of $('id').innerHTML = 'html' in JavaScriptGenerator#replace_html so that script tags are evaluated. [Sam Stephenson]
-
-* Make rjs templates always implicitly skip out on layouts. [Marcel Molina Jr.]
-
-* Correct length for the truncate text helper.  #2913 [Stefan Kaes]
-
-* Update to Prototype 1.4.0_rc3. Closes #1893, #2505, #2550, #2748, #2783. [Sam Stephenson]
-
-* Add support for new rjs templates which wrap an update_page block. [Marcel Molina Jr.]
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-* Correct time_zone_options_for_select docs.  #2892 [pudeyo@rpi.com]
-
-* Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 [lmarlow]
-
-* Performance tweaks: use Set instead of Array to speed up prototype helper include? calls.  Avoid logging code if logger is nil.  Inline commonly-called template presence checks.  #2880, #2881, #2882, #2883 [Stefan Kaes]
-
-* MemCache store may be given multiple addresses.  #2869 [Ryan Carver <ryan@fivesevensix.com>]
-
-* Handle cookie parsing irregularity for certain Nokia phones.  #2530 [zaitzow@gmail.com]
-
-* Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response. [Sam Stephenson]  Example:
-
-    update_page do |page|
-      page.insert_html :bottom, 'list', '<li>Last item</li>'
-      page.visual_effect :highlight, 'list'
-      page.hide 'status-indicator', 'cancel-link'
-    end
-
-  generates the following JavaScript:
-
-    new Insertion.Bottom("list", "<li>Last item</li>");
-    new Effect.Highlight("list");
-    ["status-indicator", "cancel-link"].each(Element.hide);
-
-* Refactored JavaScriptHelper into PrototypeHelper and ScriptaculousHelper [Sam Stephenson]
-
-* Update to latest script.aculo.us version (as of [3031])
-
-* Updated docs for in_place_editor, fixes a couple bugs and offers extended support for external controls [Justin Palmer]
-
-* Update documentation for render :file.  #2858 [Tom Werner]
-
-* Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  #2855 [court3nay]
-
-* Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables [David Heinemeier Hansson]. Examples:
-
-  <% form_for :person, @person, :url => { :action => "update" } do |f| %>
-    First name: <%= f.text_field :first_name %>
-    Last name : <%= f.text_field :last_name %>
-    Biography : <%= f.text_area :biography %>
-    Admin?    : <%= f.check_box :admin %>
-  <% end %>
-
-  <% form_for :person, person, :url => { :action => "update" } do |person_form| %>
-    First name: <%= person_form.text_field :first_name %>
-    Last name : <%= person_form.text_field :last_name %>
-
-    <% fields_for :permission => person.permission do |permission_fields| %>
-      Admin?  : <%= permission_fields.check_box :admin %>
-    <% end %>
-  <% end %>
-
-* options_for_select allows any objects which respond_to? :first and :last rather than restricting to Array and Range.  #2824 [Jacob Robbins <jrobbins@cmj.com>, Jeremy Kemper]
-
-* The auto_link text helper accepts an optional block to format the link text for each url and email address.  Example: auto_link(post.body) { |text| truncate(text, 10) }  [Jeremy Kemper]
-
-* assert_tag uses exact matches for string conditions, instead of partial matches. Use regex to do partial matches. #2799 [Jamis Buck]
-
-* CGI::Session::ActiveRecordStore.data_column_name = 'foobar' to use a different session data column than the 'data' default.  [nbpwie102@sneakemail.com]
-
-* Do not raise an exception when default helper is missing; log a debug message instead.  It's nice to delete empty helpers.  [Jeremy Kemper]
-
-* Controllers with acronyms in their names (e.g. PDFController) require the correct default helper (PDFHelper in file pdf_helper.rb).  #2262 [jeff@opendbms.com]
-
-
-*1.11.0* (November 7th, 2005)
-
-* Added request as instance method to views, so you can do <%= request.env["HTTP_REFERER"] %>, just like you can already access response, session, and the likes [David Heinemeier Hansson]
-
-* Fix conflict with assert_tag and Glue gem #2255 [david.felstead@gmail.com]
-
-* Add documentation to assert_tag indicating that it only works with well-formed XHTML #1937, #2570 [Jamis Buck]
-
-* Added action_pack.rb stub so that ActionPack::Version loads properly [Sam Stephenson]
-
-* Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" [David Heinemeier Hansson]
-
-* Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [David Heinemeier Hansson]. Example:
-
-    class ApplicationController < ActionController::Base
-      before_filter :authenticate
-    end
-
-    class WeblogController < ApplicationController
-      # will run the :authenticate filter
-    end
-
-    class SignupController < ActionController::Base
-      # will not run the :authenticate filter
-      skip_before_filter :authenticate
-    end
-
-* Added redirect_to :back as a short-hand for redirect_to(request.env["HTTP_REFERER"]) [David Heinemeier Hansson]
-
-* Change javascript_include_tag :defaults to not use script.aculo.us loader, which facilitates the use of plugins for future script.aculo.us and third party javascript extensions, and provide register_javascript_include_default for plugins to specify additional JavaScript files to load. Removed slider.js and builder.js from actionpack. [Thomas Fuchs]
-
-* Fix problem where redirecting components can cause an infinite loop [Rick Olson]
-
-* Added support for the queue option on visual_effect [Thomas Fuchs]
-
-* Update script.aculo.us to V1.5_rc4 [Thomas Fuchs]
-
-* Fix that render :text didn't interpolate instance variables #2629, #2626 [Stefan Kaes]
-
-* Fix line number detection and escape RAILS_ROOT in backtrace Regexp [Nicholas Seckar]
-
-* Fixed document.getElementsByClassName from Prototype to be speedy again [Sam Stephenson]
-
-* Recognize ./#{RAILS_ROOT} as RAILS_ROOT in error traces [Nicholas Seckar]
-
-* Remove ARStore session fingerprinting [Nicholas Seckar]
-
-* Fix obscure bug in ARStore [Nicholas Seckar]
-
-* Added TextHelper#strip_tags for removing HTML tags from a string (using HTMLTokenizer) #2229 [marcin@junkheap.net]
-
-* Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' #2422 [Caio Chassot]
-
-
-*1.10.2* (October 26th, 2005)
-
-* Reset template variables after using render_to_string [Stefan Kaes]
-
-* Expose the session model backing CGI::Session
-
-* Abbreviate RAILS_ROOT in traces
-
-
-*1.10.1* (October 19th, 2005)
-
-* Update error trace templates [Nicholas Seckar]
-
-* Stop showing generated routing code in application traces [Nicholas Seckar]
-
-
-*1.10.0* (October 16th, 2005)
-
-* Make string-keys locals assigns optional. Add documentation describing depreciated state [Stefan Kaes]
-
-* Improve line number detection for template errors [Nicholas Seckar]
-
-* Update/clean up documentation (rdoc)
-
-* Upgrade to Prototype 1.4.0_rc0 [Sam Stephenson]
-
-* Added assert_vaild. Reports the proper AR error messages as fail message when the passed record is invalid [Tobias Lütke]
-
-* Add temporary support for passing locals to render using string keys [Nicholas Seckar]
-
-* Clean up error pages by providing better backtraces [Nicholas Seckar]
-
-* Raise an exception if an attempt is made to insert more session data into the ActiveRecordStore data column than the column can hold. #2234.  [justin@textdrive.com]
-
-* Removed references to assertions.rb from actionpack assert's backtraces. Makes error reports in functional unit tests much less noisy. [Tobias Lütke]
-
-* Updated and clarified documentation for JavaScriptHelper to be more concise about the various options for including the JavaScript libs. [Thomas Fuchs]
-
-* Hide "Retry with Breakpoint" button on error pages until feature is functional. [David Heinemeier Hansson]
-
-* Fix Request#host_with_port to use the standard port when Rails is behind a proxy. [Nicholas Seckar]
-
-* Escape query strings in the href attribute of URLs created by url_helper.  #2333 [Michael Schuerig <michael@schuerig.de>]
-
-* Improved line number reporting for template errors [Nicholas Seckar]
-
-* Added :locals support for render :inline #2463 [mdabney@cavoksolutions.com]
-
-* Unset the X-Requested-With header when using the xhr wrapper in functional tests so that future requests aren't accidentally xhr'ed #2352 [me@julik.nl, Sam Stephenson]
-
-* Unescape paths before writing cache to file system. #1877. [Damien Pollet]
-
-* Wrap javascript_tag contents in a CDATA section and add a cdata_section method to TagHelper #1691 [Michael Schuerig, Sam Stephenson]
-
-* Misc doc fixes (typos/grammar/etc). #2445. [coffee2code]
-
-* Speed improvement for session_options. #2287. [Stefan Kaes]
-
-* Make cacheing binary files friendly with Windows. #1975. [Rich Olson]
-
-* Convert boolean form options form the tag_helper. #809. [Michael Schuerig <michael@schuerig.de>]
-
-* Fixed that an instance variable with the same name as a partial should be implicitly passed as the partial :object #2269 [court3nay]
-
-* Update Prototype to V1.4.0_pre11, script.aculo.us to [2502] [Thomas Fuchs]
-
-* Make assert_tag :children count appropriately. Closes #2181. [jamie@bravenet.com]
-
-* Forced newer versions of RedCloth to use hard breaks [David Heinemeier Hansson]
-
-* Added new scriptaculous options for auto_complete_field #2343 [Manfred Stienstra]
-
-* Don't prepend the asset host if the string is already a fully-qualified URL
-
-* Updated to script.aculo.us V1.5.0_rc2 and Prototype to V1.4.0_pre7 [Thomas Fuchs]
-
-* Undo condition change made in [2345] to prevent normal parameters arriving as StringIO.
-
-* Tolerate consecutive delimiters in query parameters.  #2295 [darashi@gmail.com]
-
-* Streamline render process, code cleaning. Closes #2294. [skae]
-
-* Keep flash after components are rendered. #2291 [Rick Olson, Scott]
-
-* Shorten IE file upload path to filename only to match other browsers.  #1507 [court3nay]
-
-* Fix open/save dialog in IE not opening files send with send_file/send_data, #2279 [Thomas Fuchs]
-
-* Fixed that auto_discovery_link_tag couldn't take a string as the URL [David Heinemeier Hansson]
-
-* Fixed problem with send_file and WEBrick using stdout #1812 [David Heinemeier Hansson]
-
-* Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 [skae]
-
-* Added assert_dom_equal and assert_dom_not_equal to compare tags generated by the helpers in an order-indifferent manner #1995 [skae]
-
-* Fixed that Request#domain caused an exception if the domain header wasn't set in the original http request #1795 [Michael Koziarski]
-
-* Make the truncate() helper multi-byte safe (assuming $KCODE has been set to something other than "NONE") #2103
-
-* Add routing tests from #1945 [ben@groovie.org]
-
-* Add a routing test case covering #2101 [Nicholas Seckar]
-
-* Cache relative_url_root for all webservers, not just Apache #2193 [skae]
-
-* Speed up cookie use by decreasing string copying #2194 [skae]
-
-* Fixed access to "Host" header with requests made by crappy old HTTP/1.0 clients #2124 [Marcel Molina Jr.]
-
-* Added easy assignment of fragment cache store through use of symbols for included stores (old way still works too)
-
-  Before:
-    ActionController::Base.fragment_cache_store =
-      ActionController::Base::Caching::Fragments::FileStore.new("/path/to/cache/directory")
-
-  After:
-    ActionController::Base.fragment_cache_store = :file_store, "/path/to/cache/directory"
-
-* Added ActionController::Base.session_store=, session_store, and session_options to make it easier to tweak the session options (instead of going straight to ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
-
-* Added TextHelper#cycle to cycle over an array of values on each hit (useful for alternating row colors etc) #2154 [dave-ml@dribin.org]
-
-* Ensure that request.path never returns nil. Closes #1675 [Nicholas Seckar]
-
-* Add ability to specify Route Regexps for controllers. Closes #1917. [Sebastian Kanthak]
-
-* Provide Named Route's hash methods as helper methods. Closes #1744. [Nicholas Seckar, Steve Purcell]
-
-* Added :multipart option to ActiveRecordHelper#form to make it possible to add file input fields #2034 [jstirk@oobleyboo.com]
-
-* Moved auto-completion and in-place editing into the Macros module and their helper counterparts into JavaScriptMacrosHelper
-
-* Added in-place editing support in the spirit of auto complete with ActionController::Base.in_place_edit_for, JavascriptHelper#in_place_editor_field, and Javascript support from script.aculo.us #2038 [Jon Tirsen]
-
-* Added :disabled option to all data selects that'll make the elements inaccessible for change #2167, #253 [eigentone]
-
-* Fixed that TextHelper#auto_link_urls would include punctuation in the links #2166, #1671 [eigentone]
-
-* Fixed that number_to_currency(1000, {:precision => 0})) should return "$1,000", instead of "$1,000." #2122 [sd@notso.net]
-
-* Allow link_to_remote to use any DOM-element as the parent of the form elements to be submitted #2137 [erik@ruby-lang.nl]. Example:
-
-    <tr id="row023">
-      <td><input name="foo"/></td>
-      <td><input name="bar"/></td>
-      <td><%= link_to_remote 'Save', :update => "row023",
-            :submit => "row023", :url => {:action => 'save_row'} %></td>
-    </tr>
-
-* Fixed that render :partial would fail when :object was a Hash (due to backwards compatibility issues) #2148 [Sam Stephenson]
-
-* Fixed JavascriptHelper#auto_complete_for to only include unique items #2153 [Thomas Fuchs]
-
-* Fixed all AssetHelper methods to work with relative paths, such that javascript_include_tag('stdlib/standard') will look in /javascripts/stdlib/standard instead of '/stdlib/standard/' #1963
-
-* Avoid extending view instance with helper modules each request. Closes #1979
-
-* Performance improvements to CGI methods. Closes #1980 [Stefan Kaes]
-
-* Added :post option to UrlHelper#link_to that makes it possible to do POST requests through normal ahref links using Javascript
-
-* Fixed overwrite_params
-
-* Added ActionController::Base.benchmark and ActionController::Base.silence to allow for easy benchmarking and turning off the log
-
-* Updated vendor copy of html-scanner to support better xml parsing
-
-* Added :popup option to UrlHelper#link_to #1996 [gabriel.gironda@gmail.com]. Examples:
-
-    link_to "Help", { :action => "help" }, :popup => true
-    link_to "Busy loop", { :action => "busy" }, :popup => ['new_window', 'height=300,width=600']
-
-* Drop trailing \000 if present on RAW_POST_DATA (works around bug in Safari Ajax implementation) #918
-
-* Fix observe_field to fall back to event-based observation if frequency <= 0 #1916 [Michael Schubert]
-
-* Allow use of the :with option for submit_to_remote #1936 [jon@instance-design.co.uk]
-
-* AbstractRequest#domain returns nil when host is an ip address #2012 [Kevin Clark]
-
-* ActionController documentation update #2051 [François Beausoleil]
-
-* Yield @content_for_ variables to templates #2058 [Sam Stephenson]
-
-* Make rendering an empty partial collection behave like :nothing => true #2080 [Sam Stephenson]
-
-* Add option to specify the singular name used by pagination.
-
-* Use string key to obtain action value. Allows indifferent hashes to be disabled.
-
-* Added ActionView::Base.cache_template_loading back.
-
-* Rewrote compiled templates to decrease code complexity. Removed template load caching in favour of compiled caching. Fixed template error messages. [Nicholas Seckar]
-
-* Fix Routing to handle :some_param => nil better. [Nicholas Seckar, Luminas]
-
-* Add support for :include with pagination (subject to existing constraints for :include with :limit and :offset) #1478 [Michael Schubert]
-
-* Prevent the benchmark module from blowing up if a non-HTTP/1.1 request is processed
-
-* Added :use_short_month option to select_month helper to show month names as abbreviations
-
-* Make link_to escape the javascript in the confirm option #1964 [nicolas.pouillard@gmail.com]
-
-* Make assert_redirected_to properly check URL's passed as strings #1910 [Scott Barron]
-
-* Make sure :layout => false is always used when rendering inside a layout
-
-* Use raise instead of assert_not_nil in Test::Unit::TestCase#process to ensure that the test variables (controller, request, response) have been set
-
-* Make sure assigns are built for every request when testing #1866
-
-* Allow remote_addr to be queried on TestRequest #1668
-
-* Fixed bug when a partial render was passing a local with the same name as the partial
-
-* Improved performance of test app req/sec with ~10% refactoring the render method #1823 [Stefan Kaes]
-
-* Improved performance of test app req/sec with 5-30% through a series of Action Pack optimizations #1811 [Stefan Kaes]
-
-* Changed caching/expiration/hit to report using the DEBUG log level and errors to use the ERROR log level instead of both using INFO
-
-* Added support for per-action session management #1763
-
-* Improved rendering speed on complicated templates by up to 100% (the more complex the templates, the higher the speedup) #1234 [Stefan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
-
-* Added options hash as third argument to FormHelper#input, so you can do input('person', 'zip', :size=>10) #1719 [jeremye@bsa.ca.gov]
-
-* Added Base#expires_in(seconds)/Base#expires_now to control HTTP content cache headers #1755 [Thomas Fuchs]
-
-* Fixed line number reporting for Builder template errors #1753 [piotr]
-
-* Fixed assert_routing so that testing controllers in modules works as expected [Nicholas Seckar, Rick Olson]
-
-* Fixed bug with :success/:failure callbacks for the JavaScriptHelper methods #1730 [court3nay/Thomas Fuchs]
-
-* Added named_route method to RouteSet instances so that RouteSet instance methods do not prevent certain names from being used. [Nicholas Seckar]
-
-* Fixed routes so that routes which do not specify :action in the path or in the requirements have a default of :action => 'index', In addition, fixed url generation so that :action => 'index' does not need to be provided for such urls. [Nicholas Seckar, Markjuh]
-
-* Worked around a Safari bug where it wouldn't pass headers through if the response was zero length by having render :nothing return ' ' instead of ''
-
-* Fixed Request#subdomains to handle "foo.foo.com" correctly
-
-
-*1.9.1* (11 July, 2005)
-
-* Fixed that auto_complete_for didn't force the input string to lower case even as the db comparison was
-
-* Fixed that Action View should always use the included Builder, never attempt to require the gem, to ensure compatibility
-
-* Added that nil options are not included in tags, so tag("p", :ignore => nil) now returns <p /> not <p ignore="" />  but that tag("p", :ignore => "") still includes it #1465 [Michael Schuerig]
-
-* Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 [joergd@pobox.com]
-
-* Improved error message for DoubleRenderError
-
-* Fixed routing to allow for testing of *path components #1650 [Nicholas Seckar]
-
-* Added :handle as an option to sortable_element to restrict the drag handle to a given class #1642 [thejohnny]
-
-* Added a bunch of script.aculo.us features #1644, #1677, #1695 [Thomas Fuchs]
-  * Effect.ScrollTo, to smoothly scroll the page to an element
-  * Better Firefox flickering handling on SlideUp/SlideDown
-  * Removed a possible memory leak in IE with draggables
-  * Added support for cancelling dragging my hitting ESC
-  * Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt)
-  * Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances)
-  * Removed circular references from element to prevent memory leaks (still not completely gone in IE)
-  * Changes to class extension in effects.js
-  * Make Effect.Highlight restore any previously set background color when finishing (makes effect work with CSS classes that set a background color)
-  * Fixed myriads of memory leaks in IE and Gecko-based browsers [David Zülke]
-  * Added incremental and local autocompleting and loads of documentation to controls.js [Ivan Krstic]
-  * Extended the auto_complete_field helper to accept tokens option
-  * Changed object extension mechanism to favor Object.extend to make script.aculo.us easily adaptable to support 3rd party libs like IE7.js [David Zülke]
-
-* Fixed that named routes didn't use the default values for action and possible other parameters #1534 [Nicholas Seckar]
-
-* Fixed JavascriptHelper#visual_effect to use camelize such that :blind_up will work #1639 [pelletierm@eastmedia.net]
-
-* Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers. This means that it's no longer necessary to use the 'model :post' work-around in ApplicationController to have a Post model in your session.
-
-
-*1.9.0* (6 July, 2005)
-
-* Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions)
-
-* Added javascript_include_tag :defaults shortcut that'll include all the default javascripts included with Action Pack (prototype, effects, controls, dragdrop)
-
-* Cache several controller variables that are expensive to calculate #1229 [Stefan Kaes]
-
-* The session class backing CGI::Session::ActiveRecordStore may be replaced with any class that duck-types with a subset of Active Record.  See docs for details #1238 [Stefan Kaes]
-
-* Fixed that hashes was not working properly when passed by GET to lighttpd #849 [Nicholas Seckar]
-
-* Fixed assert_template nil will be true when no template was rendered #1565 [maceywj@telus.net]
-
-* Added :prompt option to FormOptions#select (and the users of it, like FormOptions#select_country etc) to create "Please select" style descriptors #1181 [Michael Schuerig]
-
-* Added JavascriptHelper#update_element_function, which returns a Javascript function (or expression) that'll update a DOM element according to the options passed #933 [mortonda@dgrmm.net]. Examples:
-
-    <%= update_element_function("products", :action => :insert, :position => :bottom, :content => "<p>New product!</p>") %>
-
-    <% update_element_function("products", :action => :replace, :binding => binding) do %>
-      <p>Product 1</p>
-      <p>Product 2</p>
-    <% end %>
-
-* Added :field_name option to DateHelper#select_(year|month|day) to deviate from the year/month/day defaults #1266 [Marcel Molina Jr.]
-
-* Added JavascriptHelper#draggable_element and JavascriptHelper#drop_receiving_element to facilitate easy dragging and dropping through the script.aculo.us libraries #1578 [Thomas Fuchs]
-
-* Added that UrlHelper#mail_to will now also encode the default link title #749 [f.svehla@gmail.com]
-
-* Removed the default option of wrap=virtual on FormHelper#text_area to ensure XHTML compatibility #1300 [thomas@columbus.rr.com]
-
-* Adds the ability to include XML CDATA tags using Builder #1563 [Josh Knowles]. Example:
-
-    xml.cdata! "some text" # => <![CDATA[some text]]>
-
-* Added evaluation of <SCRIPT> blocks in content returned to Ajax calls #1577 [Thomas Fuchs/court3nay/Sean Treadway]
-
-* Directly generate paths with a leading slash instead of tacking it on later.  #1543 [Nicholas Seckar]
-
-* Fixed errant parameter modification in functional tests.  #1542 [Nicholas Seckar]
-
-* Routes fail with leading slash #1540 [Nicholas Seckar]
-
-* Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example:
-
-    link_to_remote(
-      "test",
-      :url => { :action => "faulty" },
-      :update => { :success => "good", :failure => "bad" },
-      403 => "alert('Forbidden- got ya!')",
-      404 => "alert('Nothing there...?')",
-      :failure => "alert('Unkown error ' + request.status)")
-
-* Attempt to explicitly flush the output at the end of CgiProcess#out
-
-* Fixed assert_redirected_to to handle absolute controller paths properly #1472 [Rick Olson/Nicholas Seckar]
-
-* Added event-based observations when frequency is not set on observe_field/form #1474 [flash@vanklinkenbergsoftware.nl]
-
-* Added script.aculo.us Javascripts (controls.js, dragdrop.js, effects.js) (NEEDS MORE DESCRIPTION) #1509 [Thomas Fuchs]
-
-* Fixed prototype to consider all fields it doesn't know as text (such as Safari's search) just like the browser in its serialization #1497 [Sean Treadway]
-
-* Improved performance of Routes generation by a factor of 5 #1434 [Nicholas Seckar]
-
-* Added named routes (NEEDS BETTER DESCRIPTION) #1434 [Nicholas Seckar]
-
-* Improved AbstractRequest documentation #1483 [court3nay]
-
-* Added ActionController::Base.allow_concurrency to control whether the application is thread-safe, so multi-threaded servers like WEBrick knows whether to apply a mutex around the performance of each action. Turned off by default. EXPERIMENTAL FEATURE.
-
-* Added TextHelper#word_wrap(text, line_length = 80) #1449 [tuxie@dekadance.se]
-
-* Added a fall-through action for form_remote_tag that'll be used in case Javascript is unavailable #1459 [Scott Barron]. Example:
-
-    form_remote_tag :html => { :action => url_for(:controller => "some", :action => "place") }
-
-* Added :xhr => true/false option to verify so you can ensure that a request is coming from an Ajax call or not #1464 [Thomas Fuchs]
-
-* Added tag_options as a third parameter to AssetHelper#auto_discovery_link_tag to control options like the title of the link #1430 [Kevin Clark]
-
-* Added option to pass in parameters to CaptureHelper#capture, so you can create more advanced view helper methods #1466 [duane.johnson@gmail.com]. Example:
-
-    <% show_calendar(:year => 2005, :month => 6) do |day, options| %>
-      <% options[:bgcolor] = '#dfd' if 10..15.include? day %>
-      [<%= day %>]
-    <% end %>
-
-* Changed the default name of the input tag generated by FormTagHelper#submit_tag from "submit" to "commit" so it doesn't clash with form.submit() calls in Javascript #1271
-
-* Fixed relative urls support for lighttpd #1048 [Nicholas Seckar/maznawak@nerim.net]
-
-* Correct distance_of_time_in_words for integer arguments and make the second arg optional, treating the first arg as a duration in seconds.  #1458 [madrobby <thomas@fesch.at>]
-
-* Fixed query parser to deal gracefully with equal signs inside keys and values #1345 [gorou].
-  Example: /?sig=abcdef=:foobar=&x=y will pass now.
-
-* Added Cuba to country list #1351 [todd]
-
-* Fixed radio_button to work with numeric values #1352 [demetrius]
-
-* Added :extension option to NumberHelper#number_to_phone #1361 [delynnb]
-
-* Added button_to as a form-based solution to deal with harmful actions that should be hidden behind POSTs. This makes it just as easy as link_to to create a safe trigger for actions like destroy, although it's limited by being a block element, the fixed look, and a no-no inside other forms. #1371 [tom@moertel.com]
-
-* Fixed image_tag so an exception is not thrown just because the image is missing and alt value can't be generated #1395 [Marcel Molina Jr.]
-
-* Added a third parameter to TextHelper#auto_link called href_options for specifying additional tag options on the links generated #1401 [tyler.kovacs@gmail.com]. Example: auto_link(text, :all, { :target => "_blank" }) to have all the generated links open in a new window.
-
-* Fixed TextHelper#highlight to return the text, not nil, if the phrase is blank #1409 [Patrick Lenz]
-
-* Fixed TagHelper such that :name and 'name' keys in the options doesn't result in two attributes #1455 [take_tk]
-
-* Ensure that helpers are only available to the controllers where they are defined and their subclasses.  #1394 [kdole@tamu.edu]
-
-* render("foo/bar") works with a layout again
-
-* Fixed double-singularization on scaffolded pagination call (Address would be turned into Addres) #1216, #1404 [nilsga]
-
-* Removed the require hack used by functional testing to work around an earlier bug in rake.
-
-* Allow distance_of_time_in_words to work with any value that responds to #to_time (like dates) #969
-
-* Support :render option for :verify #1440 [Tobias Lütke]
-
-* Updated vendor copy of html-scanner lib to 0.5.2, for bug fixes and optimizations. The :content option may be used as expected--to find a tag whose textual content is a particular value--in assert_tag, now.
-
-* Changed test requests to come from 0.0.0.0 instead of 127.0.0.1 such that they don't trigger debugging screens on exceptions, but instead call rescue_action_in_public
-
-* Modernize scaffolding to match the generator: use the new render method and change style from the warty @params["id"] to the sleek params[:id].  #1367
-
-* Include :id in the action generated by the form helper method.  Then, for example, the controller can do Model.find(params[:id]) for both edit and update actions.  Updated scaffolding to take advantage.  #1367
-
-* Add assertions with friendly messages to TestCase#process to ensure that @controller, @request, and @response are set.  #1367
-
-* Arrays, hashes sent via multipart posts are converted to strings #1032 [dj@omelia.org, me@julik.nl]
-
-* render(:layout => true) is a synonym for render(:layout => nil)
-
-* Make sure the benchmarking render method always returns the output of the render.
-
-* render(:action), render(:template) and render() are the only three calls that default to using a layout. All other render calls assume :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
-
-* verify with :redirect_to won't redirect if a redirect or render has already been performed #1350
-
-* render(:partial => true) is identical to the behavior of the deprecated render_partial()
-
-* Fixed render(:partial => "...") to use an empty Hash for the local assigns #1365
-
-* Fixed Caching::Fragments::FileStore.delete to not raise an exception if the delete fails.
-
-* Deprecated all render_* methods in favor of consolidating all rendering behavior in Base#render(options). This enables more natural use of combining options, such as layouts. Examples:
-
-    +---------------------------------------------------------------+-------------------------------------------------------+
-    | BEFORE                                                        | AFTER                                                 |
-    +---------------------------------------------------------------+-------------------------------------------------------+
-    | render_with_layout "weblog/show", "200 OK", "layouts/dialog"  | render :action => "show", :layout => "dialog"         |
-    | render_without_layout "weblog/show"                           | render :action => "show", :layout => false            |
-    | render_action "error", "404 Not Found"                        | render :action => "error", :status => "404 Not Found" |
-    | render_template "xml.div('stuff')", "200 OK", :rxml           | render :inline => "xml.div('stuff')", :type => :rxml  |
-    | render_text "hello world!"                                    | render :text => "hello world!"                        |
-    | render_partial_collection "person", @people, nil, :a => 1     | render :partial => "person", :collection => @people,  |
-    |                                                               |        :locals => { :a => 1 }                         |
-    +---------------------------------------------------------------+-------------------------------------------------------+
-
-* Deprecated redirect_to_path and redirect_to_url in favor of letting redirect_to do the right thing when passed either a path or url.
-
-* Fixed use of an integer as return code for renders, so render_text "hello world", 404 now works #1327
-
-* Fixed assert_redirect_to to work with redirect_to_path #869 [Nicholas Seckar]
-
-* Fixed escaping of :method option in remote_form_tag #1218 [Rick Olson]
-
-* Added Serbia and Montenegro to the country_select #1239 [todd@robotcoop.com]
-
-* Fixed Request#remote_ip in testing #1251 [Jeremy Kemper]
-
-* Fixed that compute_public_path should recognize external URLs, so image_tag("http://www.example.com/images/icon.gif") is not prefixed with the relative url path #1254 [victor-ronr-trac@carotena.net]
-
-* Added support for descending year values in DateHelper#select_year, like select_year(Date.today, :start_year => 2005, :end_year => 1900), which would count down from 2005 to 1900 instead of the other way #1274 [nwoods@mail.com]
-
-* Fixed that FormHelper#checkbox should return a checked checkbox if the value is the same as checked_value #1286 [Florian Weber]
-
-* Fixed Form.disable in Prototype #1317 [Wintermute]
-
-* Added accessors to logger, params, response, session, flash, and headers from the view, so you can write <% logger.info "stuff" %> instead of <% @logger.info "others" %> -- more consistent with the preferred way of accessing these attributes and collections from the controller
-
-* Added support for POST data in form of YAML or XML, which is controller through the Content-Type header. Example request:
-
-    Content-Type: application/xml
-    <request><item><content>HelloWorld</content></item></request>
-
-  ...is the same as:
-
-    Content-Type: application/x-yaml
-    ---
-    item:
-      content: HelloWorld
-
-  ...is the same as:
-
-    item[content]=HelloWorld
-
-  Which in the end turns into { "item" => { "content" => "HelloWorld" } }. This makes it a lot easier to publish REST web services on top of your regular actions (as they won't care).
-
-  Example Curl call:
-
-    curl -H 'Content-Type: application/xml' -d '<request><item><content>KillMeMore</content></item></request>' http://www.example.com/service
-
-  You can query to find out whether a given request came through as one of these types with:
-    - request.post_format? (:url_encoded, :xml or :yaml)
-    - request.formatted_post? (for either xml or yaml)
-    - request.xml_post?
-    - request.yaml_post?
-
-* Added bundling of XmlSimple by Maik Schmidt
-
-* Fixed that render_partial_collection should always return a string (and not sometimes an array, despite <%= %> not caring)
-
-* Added TextHelper#sanitize that can will remove any Javascript handlers, blocks, and forms from an input of HTML.  This allows for use of HTML on public sites, but still be free of XSS issues. #1277 [Jamis Buck]
-
-* Fixed the HTML scanner used by assert_tag where a infinite loop could be caused by a stray less-than sign in the input #1270 [Jamis Buck]
-
-* Added functionality to assert_tag, so you can now do tests on the siblings of a node, to assert that some element comes before or after the element in question, or just to assert that some element exists as a sibling #1226 [Jamis Buck]
-
-* Added better error handling for regexp caching expiration
-
-* Fixed handling of requests coming from unknown HTTP methods not to kill the server
-
-* Added that both AssetHelper#stylesheet_link_tag and AssetHelper#javascript_include_tag now accept an option hash as the last parameter, so you can do stuff like: stylesheet_link_tag "style", :media => "all"
-
-* Added FormTagHelper#image_submit_tag for making submit buttons that uses images
-
-* Added ActionController::Base.asset_host that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that.
-
-* Fixed action/fragment caching using the filestore when a directory and a file wanted to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 [imbcmdth@hotmail.com]
-
-* Fixed missing id uniqueness in FormTag#radio_button #1207 [Jarkko Laine]
-
-* Fixed assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]
-
-* Fixed render_partial_collection to output an empty string instead of nil when handed an empty array #1202 [Ryan Carver]
-
-* Improved the speed of regular expression expirations for caching by a factor of 10 #1221 [Jamis Buck]
-
-* Removed dumping of template assigns on the rescue page as it would very easily include a ton of data making page loads take seconds (and the information was rarely helpful) #1222
-
-* Added BenchmarkHelper that can measure the execution time of a block in a template and reports the result to the log. Example:
-
-    <% benchmark "Notes section" do %>
-      <%= expensive_notes_operation %>
-    <% end %>
-
-   Will add something like "Notes section (0.345234)" to the log.
-
-* Added ActionController::Caching::Sweeper as an improved an easier to use sweeper. The new sweepers work on a single-step approach instead of two-steps like the old ones. Before
-
-    def after_save(record)
-      @list = record.is_a?(List) ? record : record.list
-    end
-
-    def filter(controller)
-      controller.expire_page(:controller => "lists", :action => %w( show public feed ), :id => @list.id)
-      controller.expire_action(:controller => "lists", :action => "all")
-      @list.shares.each { |share| controller.expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
-    end
-
-  ..after:
-
-    def after_save(record)
-      list = record.is_a?(List) ? record : record.list
-      expire_page(:controller => "lists", :action => %w( show public feed ), :id => list.id)
-      expire_action(:controller => "lists", :action => "all")
-      list.shares.each { |share| expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
-    end
-
-  The new sweepers can also observe on the actions themselves by implementing methods according to (before|after)_$controller_$action. Example of a callback that'll be called after PagesController#update_title has been performed:
-
-      def after_pages_update_title
-        expire_fragment(%r{pages/#{controller.assigns["page"].id}/.*})
-      end
-
-  Note that missing_method is delegated to the controller instance, which is assigned in a before filter. This means that you can call expire_fragment instead of @controller.expire_fragment.
-
-* Added that Fragments#expire_fragment now accepts as a regular expression as the name thereby deprecating expire_matched_fragments
-
-* Fixed that fragments shouldn't use the current host and the path as part of the key like pages does
-
-* Added conditions to around_filters just like before_filter and after_filter
-
-
-*1.8.1* (20th April, 2005)
-
-* Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson]. Example:
-
-    xhr :post, :index
-
-* Fixed that Ajax.Base.options.asynchronous wasn't being respected in Ajax.Request (thanks Jon Casey)
-
-* Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 [rails@cogentdude.com]
-
-* Fixed a problem with Flash.now
-
-* Fixed stringification on all assigned hashes. The sacrifice is that assigns[:person] won't work in testing. Instead assigns["person"] or assigns(:person) must be used. In other words, the keys of assigns stay strings but we've added a method-based accessor to appease the need for symbols.
-
-* Fixed that rendering a template would require a connection to the database #1146
-
-
-*1.8.0* (19th April, 2005)
-
-* Added assert_tag and assert_no_tag as a much improved alternative to the deprecated assert_template_xpath_match #1126 [Jamis Buck]
-
-* Deprecated the majority of all the testing assertions and replaced them with a much smaller core and access to all the collections the old assertions relied on. That way the regular test/unit assertions can be used against these. Added documentation about how to use it all.
-
-* Added a wide range of new Javascript effects:
-    * Effect.Puff zooms the element out and makes it smoothly transparent at the same time, giving a "puff" illusion #996 [thomas@fesch.at]
-      After the animation is completed, the display property will be set to none.
-      This effect will work on relative and absolute positioned elements.
-
-    * Effect.Appear as the opposite of Effect.Fade #990 [thomas@fesch.at]
-      You should return elements with style="display:none;" or a like class for this to work best and have no chance of flicker.
-
-    * Effect.Squish for scaling down an element and making it disappear at the end #972 [thomas@fesch.at]
-
-    * Effect.Scale for smoothly scaling images or text up and down #972 [thomas@fesch.at]
-
-    * Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
-
-* Added Request#xml_http_request? (and an alias xhr?) to that'll return true when the request came from one of the Javascript helper methods (Ajax). This can be used to give one behavior for modern browsers supporting Ajax, another to old browsers #1127 [Sam Stephenson]
-
-* Changed render_partial to take local assigns as the second parameter instead of an explicit object and then the assigns. So the API changes from:
-
-    <%= render_partial "account", person, "rules" => regulations.rules %>
-
-  ...to:
-
-    <%= render_partial "account", :account => person, :rules => regulations.rules %>
-
-  The old API will still work, though, and render_partial "account" will still assume :account => @account.
-
-* Added support for web servers that use PATH_INFO instead of REQUEST_URI like IIS #1014 [BradG/Nicholas Seckar]
-
-* Added graceful handling of PUT, DELETE, and OPTIONS requests for a complete coverage of REST functionality #1136 [Josh Knowles]
-
-* Fixed that you can now pass an alternative :href option to link_to_function/remote in order to point to somewhere other than # if the javascript fails or is turned off. You can do the same with form_remote_tag by passing in :action. #1113 [Sam Stephenson]
-
-* Fixed DateHelper to return values on the option tags such that they'll work properly in IE with form_remote_tag #1024 [Scott Raymond]
-
-* Fixed FormTagHelper#check_box to respect checked #1049 [DelynnB]
-
-* Added that render_partial called from a controller will use the action name as default #828 [Dan Peterson]
-
-* Added Element.toggle, Element.show, and Element.hide to the prototype javascript library. Toggle.display has been deprecated, but will still work #992 [Lucas Carlson]
-
-* Added that deleting a cookie should not just set it to an empty string but also instantly expire it #1118 [todd@robotcoop.com]
-
-* Added AssetTagHelper#image_path, AssetTagHelper#javascript_path, and AssetTagHelper#stylesheet_path #1110 [Larry Halff]
-
-* Fixed url_for(nil) in functional tests #1116 [Alisdair McDiarmid]
-
-* Fixed error handling of broken layouts #1115 [Michael Schubert]
-
-* Added submit_to_remote that allows you to trigger an Ajax form submition at the click of the submission button, which allows for multiple targets in a single form through the use of multiple submit buttons #930 [yrashk@gmail.com]
-
-* Fixed pagination to work with joins #1034 [scott@sigkill.org]
-
-* Fixed that *rest parameter in map.connect couldn't accept an empty list #1037 [Dee Zsombor]
-
-* Added :confirm option to link_to_remote just like link_to has #1082 [yrashk@fp.org.ua]
-
-* Added minute_step as an option to select_minute (and the helpers that use it) to jump in larger increments than just 1 minute. At 15, it would return 0, 15, 30, 45 options #1085 [ordwaye@evergreen.edu]
-
-* Fixed that an exception would be thrown when an empty form was submitted #1090 [jan@ulbrich-boerwang.de]
-
-* Moved TextHelper#human_size to NumberHelper#number_to_human_size, but kept an deprecated alias to the old method name
-
-* Fixed that the content-type for some browsers could include an additional \r which made wonky things happen #1067 [Thomas Fuchs]
-
-* Fixed that radio buttons shouldn't have a default size attribute #1074 [hendrik@mans.de]
-
-* Added ActionView::Helpers::InstanceTag::DEFAULT_RADIO_OPTIONS that contains a hash of default options for radio buttons #1074 [hendrik@mans.de]
-
-* Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 [Nicholas Seckar]
-
-* Added JavascriptHelper#periodically_call_remote in order to create areas of a page that update automatically at a set interval #945 [Jon Tirsen]
-
-* Fixed Cache#expire_matched_fragments that couldn't recognize the difference between string and url_for options #1030 [Stefan Kaes]
-
-* Added simulation of @request.request_uri in functional tests #1038 [Jamis Buck]
-
-* Fixed autolinking to work better in more cases #1013 [Jamis Buck]
-
-* Added the possible of using symbols in form helpers that relate to instance variables like text_field :account, :name in addition to text_field "account", "name"'
-
-* Fixed javascript_include_tag to output type instead of language and conform to XHTML #1018 [Rick Olson]
-
-* Added NumberHelper for common string representations like phone number, currency, and percentage #1015 [DeLynn]
-
-* Added pagination for scaffolding (10 items per page) #964 [mortonda@dgrmm.net]
-
-* Added assert_no_cookie and fixed assert_cookie_equal to deal with non-existing cookies #979 [Jeremy Kemper]
-
-* Fixed :overwrite_param so it doesn't delete but reject elements from @request.parameters #982 [raphinou@yahoo.com]
-
-* Added :method option to verify for ensuring that either GET, POST, etc is allowed #984 [Jamis Buck]
-
-* Added options to set cc, bcc, subject, and body for UrlHelper#mail_to #966 [DeLynn]
-
-* Fixed include_blank for select_hour/minute/second #527 [edward@debian.org]
-
-* Improved the message display on the exception handler pages #963 [Johan Sorensen]
-
-* Fixed that on very rare occasions, webrick would raise a NoMethodError: private method 'split' called for nil #1001 [Flurin Egger]
-
-* Fixed problem with page caching #958 [Rick Olson]
-
-
-*1.7.0* (27th March, 2005)
-
-* Added ActionController::Base.page_cache_extension for setting the page cache file extension (the default is .html) #903 [Andreas]
-
-* Fixed "bad environment variable value" exception caused by Safari, Apache, and Ajax calls #918
-
-* Fixed that pagination_helper would ignore :params #947 [Sebastian Kanthak]
-
-* Added :owerwrite_params back to url_for and friends -- it was AWL since the introduction of Routes #921 [raphinou]
-
-* Added :position option to link_to_remote/form_remote_tag that can be either :before, :top, :bottom, or :after and specifies where the return from the method should be inserted #952 [Matthew McCray/Sam Stephenson]
-
-* Added Effect.Highlight to prototype.js to do Yellow Fade Technique (of 37signals' fame) on any container #952 [Sam Stephenson/court3nay]
-
-* Added include_seconds option as the third parameter to distance_of_time_in_words which will render "less than a minute" in higher resolution ("less than 10 seconds" etc) #944 [thomas@fesch.at]
-
-* Added fourth option to process in test cases to specify the content of the flash #949 [Jamis Buck]
-
-* Added Verifications that allows you to specify preconditions to actions in form of statements like <tt>verify :only => :update_post, :params => "admin_privileges", :redirect_to => { :action => "settings" }</tt>, which ensure that the update_post action is only called if admin_privileges is available as a parameter -- otherwise the user is redirected to settings. #897 [Jamis Buck]
-
-* Fixed Form.Serialize for the JavascriptHelper to also seriliaze password fields #934 [dweitzman@gmail.com]
-
-* Added JavascriptHelper#escape_javascript as a public method (was private) and made it escape both single and double quotes and new lines #940 [mortonda@dgrmm.net]
-
-* Added trailing_slash option to url_for, so you can generate urls ending in a slash. Note that is currently not recommended unless you need it for special reasons since it breaks caching #937 [stian@grytoyr.net]
-
-* Added expire_matched_fragments(regular_expression) to clear out a lot of fragment caches at once #927 [Rick Olson]
-
-* Fixed the problems with : and ? in file names for fragment caches on Windows #927 [Rick Olson]
-
-* Added TextHelper#human_size for formatting file sizes, like human_size(1234567) => 1.2 MB #943 [thomas@fesch.at]
-
-* Fixed link_to :confirm #936 [Nicholas Seckar]
-
-* Improved error reporting especially around never shallowing exceptions. Debugging helpers should be much easier now #980 [Nicholas Seckar]
-
-* Fixed Toggle.display in prototype.js #902 [Lucas Carlson]
-
-
-*1.6.0* (22th March, 2005)
-
-* Added a JavascriptHelper and accompanying prototype.js library that opens the world of Ajax to Action Pack with a large array of options for dynamically interacting with an application without reloading the page #884 [Sam Stephenson/David]
-
-* Added pagination support through both a controller and helper add-on #817 [Sam Stephenson]
-
-* Fixed routing and helpers to make Rails work on non-vhost setups #826 [Nicholas Seckar/Tobias Lütke]
-
-* Added a much improved Flash module that allows for finer-grained control on expiration and allows you to flash the current action #839 [Caio Chassot]. Example of flash.now:
-
-    class SomethingController < ApplicationController
-      def save
-        ...
-        if @something.save
-          # will redirect, use flash
-          flash[:message] = 'Save successful'
-          redirect_to :action => 'list'
-        else
-          # no redirect, message is for current action, use flash.now
-          flash.now[:message] = 'Save failed, review'
-          render_action 'edit'
-        end
-      end
-    end
-
-* Added to_param call for parameters when composing an url using url_for from something else than strings #812 [Sam Stephenson]. Example:
-
-    class Page
-      def initialize(number)
-        @number = number
-      end
-      # ...
-      def to_param
-        @number.to_s
-      end
-    end
-
-  You can now use instances of Page with url_for:
-
-    class BarController < ApplicationController
-      def baz
-        page = Page.new(4)
-        url = url_for :page => page # => "http://foo/bar/baz?page=4"
-      end
-    end
-
-* Fixed form helpers to query Model#id_before_type_cast instead of Model#id as a temporary workaround for Ruby 1.8.2 warnings #818 [DeLynn B]
-
-* Fixed TextHelper#markdown to use blank? instead of empty? so it can deal with nil strings passed #814 [Johan Sörensen]
-
-* Added TextHelper#simple_format as a non-dependency text presentation helper #814 [Johan Sörensen]
-
-* Added that the html options disabled, readonly, and multiple can all be treated as booleans. So specifying <tt>disabled => :true</tt> will give <tt>disabled="disabled"</tt>. #809 [mindel]
-
-* Added path collection syntax for Routes that will gobble up the rest of the url and pass it on to the controller #830 [rayners]. Example:
-
-    map.connect 'categories/*path_info', :controller => 'categories', :action => 'show'
-
-  A request for /categories/top-level-cat, would give @params[:path_info] with "top-level-cat".
-  A request for /categories/top-level-cat/level-1-cat, would give @params[:path_info] with "top-level-cat/level-1-cat" and so forth.
-
-  The @params[:path_info] return is really an array, but where to_s has been overwritten to do join("/").
-
-* Fixed options_for_select on selected line issue #624 [Florian Weber]
-
-* Added CaptureHelper with CaptureHelper#capture and CaptureHelper#content_for. See documentation in helper #837 [Tobias Lütke]
-
-* Fixed :anchor use in url_for #821 [Nicholas Seckar]
-
-* Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 [Nicholas Seckar]
-
-* Added assigns shortcut for @response.template.assigns to controller test cases [Jeremy Kemper]. Example:
-
-  Before:
-
-    def test_list
-      assert_equal 5, @response.template.assigns['recipes'].size
-      assert_equal 8, @response.template.assigns['categories'].size
-    end
-
-  After:
-
-    def test_list
-      assert_equal 5, assigns(:recipes).size
-      assert_equal 8, assigns(:categories).size
-    end
-
-* Added TagHelper#image_tag and deprecated UrlHelper#link_image_to (recommended approach is to combine image_tag and link_to instead)
-
-* Fixed textilize to be resilient to getting nil parsed (by using Object#blank? instead of String#empty?)
-
-* Fixed that the :multipart option in FormTagHelper#form_tag would be ignored [Yonatan Feldman]
-
-
-*1.5.1* (7th March, 2005)
-
-* Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 [piotr@t-p-l.com]
-
-* Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 [Jamis Buck]
-
-* Added shortcut :id assignment to render_component and friends (before you had to go through :params) #784 [Lucas Carlson]
-
-* Fixed that map.connect should convert arguments to strings #780 [Nicholas Seckar]
-
-* Added UrlHelper#link_to_if/link_to_unless to enable other conditions that just link_to_unless_current #757 [mindel]
-
-* Fixed that single quote was not escaped in a UrlHelper#link_to javascript confirm #549 [Scott Barron]
-
-* Removed the default border on link_image_to (it broke xhtml strict) -- can be specified with :border => 0 #517 [?/caleb]
-
-* Fixed that form helpers would treat string and symbol keys differently in html_options (and possibly create duplicate entries) #112 [Jeremy Kemper]
-
-* Fixed that broken pipe errors (clients disconnecting in mid-request) could bring down a fcgi process
-
-* Added the original exception message to session recall errors (so you can see which class wasnt required)
-
-* Fixed that RAILS_ROOT might not be defined when AP was loaded, so do a late initialization of the ROUTE_FILE #761 [Scott Barron]
-
-* Fix request.path_info and clear up LoadingModule behavior #754 [Nicholas Seckar]
-
-* Fixed caching to be aware of extensions (so you can cache files like api.wsdl or logo.png) #734 [Nicholas Seckar]
-
-* Fixed that Routes would raise NameErrors if a controller component contains characters that are not valid constant names #733 [Nicholas Seckar]
-
-* Added PATH_INFO access from the request that allows urls like the following to be interpreted by rails: http://www.example.com/dispatcher.cgi/controller/action -- that makes it possible to use rails as a CGI under lighttpd and would also allow (for example) Rublog to be ported to rails without breaking existing links to Rublog-powered blogs. #728 [Jamis Buck]
-
-* Fixed that caching the root would result in .html not index.html #731, #734 [alisdair/Nicholas Seckar]
-
-
-*1.5.0* (24th February, 2005)
-
-* Added Routing as a replacement for mod_rewrite pretty urls [Nicholas Seckar]. Read more in ActionController::Base.url_for and on http://manuals.rubyonrails.com/read/book/9
-
-* Added components that allows you to call other actions for their rendered response while execution another action. You can either delegate the entire response rendering or you can mix a partial response in with your other content. Read more on http://manuals.rubyonrails.com/read/book/14
-
-* Fixed that proxy IPs do not follow all RFC1918 nets #251 [caleb@aei-tech.com]
-
-* Added Base#render_to_string to parse a template and get the result back as a string #479
-
-* Fixed that send_file/data can work even if render* has been called before in action processing to render the content of a file to be send for example #601
-
-* Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Support #688 [Jamis Buck]
-
-* Added FormHelper#file_field and FormTagHelper#file_field_tag for creating file upload fields
-
-* Added :order option for date_select that allows control over the order in which the date dropdowns is used and which of them should be used #619 [Tim Bates]. Examples:
-
-    date_select("post", "written_on", :order => [:day, :month, :year])
-    date_select("user", "birthday",   :order => [:month, :day])
-
-* Added ActionView::Base.register_template_handler for easy integration of an alternative template language to ERb and Builder. See test/controller/custom_handler_test.rb for a usage example #656 [Jamis Buck]
-
-* Added AssetTagHelper that provides methods for linking a HTML page together with other assets, such as javascripts, stylesheets, and feeds.
-
-* Added FormTagHelper that provides a number of methods for creating form tags that doesn't rely on conventions with an object assigned to the template like FormHelper does. With the FormTagHelper, you provide the names and values yourself.
-
-* Added Afghanistan, Iran, and Iraq to the countries list used by FormOptions#country_select and FormOptions#country_options_for_select
-
-* Renamed link_to_image to link_image_to (since thats what it actually does) -- kept alias for the old method name
-
-* Fixed textilize for RedCloth3 to keep doing hardbreaks
-
-* Fixed that assert_template_xpath_matches did not indicate when a path was not found #658 [Eric Hodel]
-
-* Added TextHelper#auto_link to turn email addresses and urls into ahrefs
-
-* Fixed that on validation errors, scaffold couldn't find template #654 [mindel]
-
-* Added Base#hide_action(*names) to hide public methods from a controller that would otherwise have been callable through the URL. For the majority of cases, its preferred just to make the methods you don't want to expose protected or private (so they'll automatically be hidden) -- but if you must have a public method, this is a way to make it uncallable. Base#hidden_actions retrieve the list of all hidden actions for the controller #644 [Nicholas Seckar]
-
-* Fixed that a bunch of methods from ActionController::Base was accessible as actions (callable through a URL) when they shouldn't have been #644 [Nicholas Seckar]
-
-* Added UrlHelper#current_page?(options) method to check if the url_for options passed corresponds to the current page
-
-* Fixed https handling on other ports than 443 [Alan Gano]
-
-* Added follow_redirect method for functional tests that'll get-request the redirect that was made. Example:
-
-    def test_create_post
-      post :create, "post" => { "title" => "Exciting!" }
-      assert_redirected_to :action => "show"
-
-      follow_redirect
-      assert_rendered_file "post/show"
-    end
-
-  Limitation: Only works for redirects to other actions within the same controller.
-
-* Fixed double requiring of models with the same name as the controller
-
-* Fixed that query params could be forced to nil on a POST due to the raw post fix #562 [moriq@moriq.com]
-
-* Fixed that cookies shouldn't be frozen in TestRequest #571 [Eric Hodel]
-
-
-*1.4.0* (January 25th, 2005)
-
-* Fixed problems with ActiveRecordStore under the development environment in Rails
-
-* Fixed the ordering of attributes in the xml-decleration of Builder #540 [woeye]
-
-* Added @request.raw_post as a convenience access to @request.env['RAW_POST_DATA'] #534 [Tobias Lütke]
-
-* Added support for automatic id-based indexing for lists of items #532 [dblack]. Example:
-
-    <% @students.each do |@student| %>
-      <%= text_field "student[]", "first_name", :size => "20" %>
-      <%= text_field "student[]", "last_name" %>
-      <%= text_field "student[]", "grade", :size => "5" %>
-    <% end %>
-
-  ...would produce, for say David Black with id 123 and a grace of C+:
-
-    <input id="student_123_first_name" name="student[123][first_name]" size="20"     size="30" type="text" value="David" />
-    <input id="student_123_last_name" name="student[123][last_name]" size="30"  type="text" value="Black" />
-    <input id="student_123_grade" name="student[123][grade]" size="5" type="text"  value="C+" />
-
-* Added :application_prefix to url_for and friends that makes it easier to setup Rails in non-vhost environments #516 [Jamis Buck]
-
-* Added :encode option to mail_to that'll allow you to masquarede the email address behind javascript or hex encoding #494 [Lucas Carlson]
-
-* Fixed that the content-header was being set to application/octet_stream instead of application/octet-stream on send_date/file [Alexey]
-
-* Removed the need for passing the binding when using CacheHelper#cache
-
-* Added TestResponse#binary_content that'll return as a string the data sent through send_data/send_file for testing #500 [Alexey]
-
-* Added @request.env['RAW_POST_DATA'] for people who need access to the data before Ruby's CGI has parsed it #505 [Jeremy Kemper]
-
-* Fixed that a default fragment store wan't being set to MemoryStore as intended.
-
-* Fixed that all redirect and render calls now return true, so you can use the pattern of "do and return". Example:
-
-    def show
-      redirect_to(:action => "login") and return unless @person.authenticated?
-      render_text "I won't happen unless the person is authenticated"
-    end
-
-* Added that renders and redirects called in before_filters will have the same effect as returning false: stopping the chain. Example:
-
-    class WeblogController
-      before_filter { |c| c.send(:redirect_to_url("http://www.farfaraway.com")}) }
-
-      def hello
-        render_text "I will never be called"
-      end
-    end
-
-
-* Added that only one render or redirect can happen per action. The first call wins and subsequent calls are ignored. Example:
-
-    def do_something
-      redirect_to :action => "elsewhere"
-      render_action "overthere"
-    end
-
-  Only the redirect happens. The rendering call is simply ignored.
-
-
-*1.3.1* (January 18th, 2005)
-
-* Fixed a bug where cookies wouldn't be set if a symbol was used instead of a string as the key
-
-* Added assert_cookie_equal to assert the contents of a named cookie
-
-* Fixed bug in page caching that prevented it from working at all
-
-
-*1.3.0* (January 17th, 2005)
-
-* Added an extensive caching module that offers three levels of granularity (page, action, fragment) and a variety of stores.
-  Read more in ActionController::Caching.
-
-* Added the option of passing a block to ActiveRecordHelper#form in order to add more to the auto-generated form #469 [dom@sisna.com]
-
-    form("entry", :action => "sign") do |form|
-      form << content_tag("b", "Department")
-      form << collection_select("department", "id", @departments, "id", "name")
-    end
-
-* Added arrays as a value option for params in url_for and friends #467 [Eric Anderson]. Example:
-
-    url_for(:controller => 'user', :action => 'delete', :params => { 'username' =>  %( paul john steve ) } )
-    # => /user/delete?username[]=paul&username[]=john&username[]=steve
-
-* Fixed that controller tests can now assert on the use of cookies #466 [Alexey]
-
-* Fixed that send_file would "remember" all the files sent by adding to the headers again and again #458 [Jeremy Kemper]
-
-* Fixed url rewriter confusion when the controller or action name was a substring of the controller_prefix or action_prefix
-
-* Added conditional layouts like <tt>layout "weblog_standard", :except => :rss</tt> #452 [Marcel Molina Jr.]
-
-* Fixed that MemCacheStore wasn't included by default and added default MemCache object pointing to localhost #447 [Lucas Carlson]
-
-* Added fourth argument to render_collection_of_partials that allows you to specify local_assigns -- just like render_partial #432 [Ryan Davis]
-
-* Fixed that host would choke when cgi.host returned nil #432 [Tobias Lütke]
-
-* Added that form helpers now take an index option #448 [Tim Bates]
-
-  Example:
-    text_field "person", "name", "index" => 3
-
-  Becomes:
-    <input type="text" name="person[3][name]" id="person_3_name" value="<%= @person.name %>" />
-
-* Fixed three issues with retrying breakpoints #417 [Florian Gross]
-
-  1. Don't screw up pages that use multiple values for the same parameter (?foo=bar&foo=qux was converted to ?foo=barqux)
-  2. Don't screw up all forms when you click the "Retry with Breakpoint" link multiple times instead of reloading
-     (This caused the parameters to be added multiple times for GET forms leading to trouble.)
-  3. Don't add ?BP-RETRY=1 multiple times
-
-* Added that all renders and redirects now return false, so they can be used as the last line in before_filters to stop execution.
-
-  Before:
-    def authenticate
-      unless @session[:authenticated]
-        redirect_to :controller => "account", :action => "login"
-        return false
-      end
-    end
-
-  After:
-    def authenticate
-      redirect_to(:controller => "account", :action => "login") unless @session[:authenticated]
-    end
-
-* Added conditional filters #431 [Marcel Molina Jr.]. Example:
-
-    class JournalController < ActionController::Base
-      # only require authentication if the current action is edit or delete
-      before_filter :authorize, :only_on => [ :edit, :delete ]
-
-      private
-        def authorize
-          # redirect to login unless authenticated
-        end
-    end
-
-* Added Base#render_nothing as a cleaner way of doing render_text "" when you're not interested in returning anything but an empty response.
-
-* Added the possibility of passing nil to UrlHelper#link_to to use the link itself as the name
-
-
-*1.2.0* (January 4th, 2005)
-
-* Added MemCacheStore for storing session data in Danga's MemCache system [Bob Cottrell]
-  Depends on: MemCached server (http://www.danga.com/memcached/), MemCache client (http://raa.ruby-lang.org/project/memcache/)
-
-* Added thread-safety to the DRbStore #66, #389 [Ben Stiglitz]
-
-* Added DateHelper#select_time and DateHelper#select_second #373 [Scott Baron]
-
-* Added :host and :protocol options to url_for and friends to redirect to another host and protocol than the current.
-
-* Added class declaration for the MissingFile exception #388 [Kent Sibilev]
-
-* Added "short hypertext note with a hyperlink to the new URI(s)" to redirects to fulfill compliance with RFC 2616 (HTTP/1.1) section 10.3.3 #397 [Tim Bates]
-
-* Added second boolean parameter to Base.redirect_to_url and Response#redirect to control whether the redirect is permanent or not (301 vs 302) #375 [Hodel]
-
-* Fixed redirects when the controller and action is named the same. Still haven't fixed same controller, module, and action, though #201 [Josh Peek]
-
-* Fixed problems with running multiple functional tests in Rails under 1.8.2 by including hack for test/unit weirdness
-
-* Fixed that @request.remote_ip didn't work in the test environment #369 [Bruno Mattarollo]
-
-
-*1.1.0*
-
-* Added search through session to clear out association caches at the end of each request. This makes it possible to place Active Record objects
-  in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 [Tobias Lütke]
-
-* Added more informative exception when using helper :some_helper and the helper requires another file that fails, you'll get an
-  error message tells you what file actually failed to load, rather than falling back on assuming it was the helper file itself #346 [dblack]
-
-* Added use of *_before_type_cast for all input and text fields. This is helpful for getting "100,000" back on a integer-based
-  validation where the value would normally be "100".
-
-* Added Request#port_string to get something like ":8080" back on 8080 and "" on 80 (or 443 with https).
-
-* Added Request#domain (returns string) and Request#subdomains (returns array).
-
-* Added POST support for the breakpoint retries, so form processing that raises an exception can be retried with the original request [Florian Gross]
-
-* Fixed regression with Base#reset_session that wouldn't use the DEFAULT_SESSION_OPTIONS [adam@the-kramers.net]
-
-* Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey)
-
-* Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 [Ulysses]
-
-* Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum [Ryan Davis]
-
-
-*1.0.1*
-
-* Fixed a bug that would cause an ApplicationController to require itself three times and hence cause filters to be run three times [evl]
-
-
-*1.0*
-
-* Added that controllers will now attempt to require a model dependency with their name and in a singular attempt for their name.
-  So both PostController and PostsController will automatically have the post.rb model required. If no model is found, no error is raised,
-  as it is then expected that no match is available and the programmer will have included his own models.
-
-* Fixed DateHelper#date_select so that you can pass include_blank as an option even if you don't use start_year and end_year #59 [what-a-day]
-
-* Added that controllers will now search for a layout in $template_root/layouts/$controller_name.r(html|xml), so PostsController will look
-  for layouts/posts.rhtml or layouts/posts.rxml and automatically configure this layout if found #307 [Marcel Molina Jr.]
-
-* Added FormHelper#radio_button to work with radio buttons like its already possible with check boxes [Michael Koziarski]
-
-* Added TemplateError#backtrace that makes it much easier to debug template errors from unit and functional tests
-
-* Added display of error messages with scaffolded form pages
-
-* Added option to ERB templates to swallow newlines by using <% if something -%> instead of just <% if something %>. Example:
-
-    class SomeController < ApplicationController
-    <% if options[:scaffold] %>
-      scaffold :<%= singular_name %>
-    <% end %>
-      helper :post
-
-  ...produces this on post as singular_name:
-
-    class SomeController < ApplicationController
-
-      scaffold :post
-
-      helper :post
-
-  ...where as:
-
-    class SomeController < ApplicationController
-    <% if options[:scaffold] -%>
-      scaffold :<%= singular_name %>
-    <% end -%>
-      helper :post
-
-  ...produces:
-
-    class SomeController < ApplicationController
-      scaffold :post
-      helper :post
-
-  [This undocumented gem for ERb was uncovered by bitsweat]
-
-* Fixed CgiRequest so that it'll now accept session options with Symbols as keys (as the documentation points out) [Suggested by Andreas]
-
-* Added that render_partial will always by default include a counter with value 1 unless there is a counter passed in via the
-  local_assigns hash that overrides it. As a result, render_collection_of_partials can still be written in terms of render_partial
-  and partials that make use of a counter can be called without problems from both render_collection_of_partials as well as
-  render_partial #295 [Marcel Molina Jr.]
-
-* Fixed CgiRequest#out to fall back to #write if $stdout doesn't have #syswrite [Jeremy Kemper]
-
-* Fixed all helpers so that they use XHTML compliant double quotes for values instead of single quotes [htonl/Jeremy Kemper]
-
-* Added link_to_image(src, options = {}, html_options = {}). Documentation:
-
-    Creates a link tag to the image residing at the +src+ using an URL created by the set of +options+. See the valid options in
-    link:classes/ActionController/Base.html#M000021. It's also possible to pass a string instead of an options hash to
-    get a link tag that just points without consideration. The <tt>html_options</tt> works jointly for the image and ahref tag by
-    letting the following special values enter the options on the image and the rest goes to the ahref:
-
-    ::alt: If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
-    ::size: Supplied as "XxY", so "30x45" becomes width="30" and height="45"
-    ::align: Sets the alignment, no special features
-
-    The +src+ can be supplied as a...
-    * full path, like "/my_images/image.gif"
-    * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
-    * file name without extension, like "logo", that gets expanded to "/images/logo.png"
-
-* Fixed to_input_field_tag so it no longer explicitly uses InstanceTag.value if value was specified in the options hash [evl]
-
-* Added the possibility of having validate be protected for assert_(in)valid_column #263 [Tobias Lütke]
-
-* Added that ActiveRecordHelper#form now calls url_for on the :action option.
-
-* Added all the HTTP methods as alternatives to the generic "process" for functional testing #276 [Tobias Lütke]. Examples:
-
-    # Calls Controller#miletone with a GET request
-    process :milestone
-
-    # Calls Controller#miletone with a POST request that has parameters
-    post :milestone, { "name" => "David" }
-
-    # Calls Controller#milestone with a HEAD request that has both parameters and session data
-    head :milestone, { "id" => 1 }, { "user_id" => 23 }
-
-  This is especially useful for testing idiomatic REST web services.
-
-* Added proper handling of HEAD requests, so that content isn't returned (Request#head? added as well) #277 [Eric Hodel]
-
-* Added indifference to whether @headers["Content-Type"], @headers["Content-type"], or @headers["content-type"] is used.
-
-* Added TestSession#session_id that returns an empty string to make it easier to functional test applications that doesn't use
-  cookie-based sessions #275 [jcf]
-
-* Fixed that cached template loading would still check the file system to see if the file existed #258 [Andreas Schwarz]
-
-* Added options to tailor header tag, div id, and div class on ActiveRecordHelper#error_messages_for [Josh Peek]
-
-* Added graceful handling of non-alphanumeric names and misplaced brackets in input parameters [Jeremy Kemper]
-
-* Added a new container for cookies that makes them more intuative to use. The old methods of cookie and @cookies have been deprecated.
-
-  Examples for writing:
-
-    cookies["user_name"] = "david" # => Will set a simple session cookie
-    cookies["login"] = { "value" => "XJ-122", "expires" => Time.now + 360} # => Will set a cookie that expires in 1 hour
-
-  Examples for reading:
-
-    cookies["user_name"] # => "david"
-    cookies.size         # => 2
-
-  Read more in ActionController::Cookies
-
-  NOTE: If you were using the old accessor (cookies instead of @cookies), this could potentially break your code -- if you expect a full cookie object!
-
-* Added the opportunity to defined method_missing on a controller which will handle all requests for actions not otherwise defined #223 [timb]
-
-* Fixed AbstractRequest#remote_ip for users going through proxies - Patch #228 [Eric Hodel]
-
-* Added Request#ssl? which is shorthand for @request.protocol == "https://"
-
-* Added the choice to call form_tag with no arguments (resulting in a form posting to current action) [Jeremy Kemper]
-
-* Upgraded to Builder 1.2.1
-
-* Added :module as an alias for :controller_prefix to url_for and friends, so you can do redirect_to(:module => "shop", :controller => "purchases")
-  and go to /shop/purchases/
-
-* Added support for controllers in modules through @params["module"].
-
-* Added reloading for dependencies under cached environments like FastCGI and mod_ruby. This makes it possible to use those environments for development.
-  This is turned on by default, but can be turned off with ActionController::Base.reload_dependencies = false in production environments.
-
-  NOTE: This will only have an effect if you use the new model, service, and observer class methods to mark dependencies. All libraries loaded through
-  require will be "forever" cached. You can, however, use ActionController::Base.load_or_require("library") to get this behavior outside of the new
-  dependency style.
-
-* Added that controllers will automatically require their own helper if possible. So instead of doing:
-
-    class MsgController < ApplicationController
-      helper :msg
-    end
-
-  ...you can just do:
-
-    class MsgController < ApplicationController
-    end
-
-* Added dependencies_on(layer) to query the dependencies of a controller. Examples:
-
-    MsgController.dependencies_on(:model)    # => [ :post, :comment, :attachment ]
-    MsgController.dependencies_on(:service)  # => [ :notification_service ]
-    MsgController.dependencies_on(:observer) # => [ :comment_observer ]
-
-* Added a new dependency model with the class methods model, service, and observer. Example:
-
-    class MsgController < ApplicationController
-      model    :post, :comment, :attachment
-      service  :notification_service
-      observer :comment_observer
-    end
-
-  These new "keywords" remove the need for explicitly calling 'require' in most cases. The observer method even instantiates the
-  observer as well as requiring it.
-
-* Fixed that link_to would escape & in the url again after url_for already had done so
-
-
-*0.9.5* (28)
-
-* Added helper_method to designate that a given private or protected method you should available as a helper in the view. [Jeremy Kemper]
-
-* Fixed assert_rendered_file so it actually verifies if that was the rendered file [htonl]
-
-* Added the option for sharing partial spacer templates just like partials themselves [radsaq]
-
-* Fixed that Russia was named twice in country_select [alexey]
-
-* Fixed request_origin to use remote_ip instead of remote_addr [Jeremy Kemper]
-
-* Fixed link_to breakage when nil was passed for html_options [alexey]
-
-* Fixed redirect_to on a virtual server setup with apache with a port other than the default where it would forget the port number [seanohalpin]
-
-* Fixed that auto-loading webrick on Windows would cause file uploads to fail [Jeremy Kemper]
-
-* Fixed issues with sending files on WEBrick by setting the proper binmode [Jeremy Kemper]
-
-* Added send_data as an alternative to send_file when the stream is not read off the filesystem but from a database or generated live [Jeremy Kemper]
-
-* Added a new way to include helpers that doesn't require the include hack and can go without the explicit require. [Jeremy Kemper]
-
-  Before:
-
-    module WeblogHelper
-      def self.included(controller) #:nodoc:
-        controller.ancestors.include?(ActionController::Base) ? controller.add_template_helper(self) : super
-      end
-    end
-
-    require 'weblog_helper'
-    class WeblogController < ActionController::Base
-      include WeblogHelper
-    end
-
-  After:
-
-    module WeblogHelper
-    end
-
-    class WeblogController < ActionController::Base
-      helper :weblog
-    end
-
-* Added a default content-type of "text/xml" to .rxml renders [Ryan Platte]
-
-* Fixed that when /controller/index was requested by the browser, url_for would generates wrong URLs [Ryan Platte]
-
-* Fixed a bug that would share cookies between users when using FastCGI and mod_ruby [The Robot Co-op]
-
-* Added an optional third hash parameter to the process method in functional tests that takes the session data to be used [alexey]
-
-* Added UrlHelper#mail_to to make it easier to create mailto: style ahrefs
-
-* Added better error messages for layouts declared with the .rhtml extension (which they shouldn't) [geech]
-
-* Added another case to DateHelper#distance_in_minutes to return "less than a minute" instead of "0 minutes" and "1 minute" instead of "1 minutes"
-
-* Added a hidden field to checkboxes generated with FormHelper#check_box that will make sure that the unchecked value (usually 0)
-  is sent even if the checkbox is not checked. This relieves the controller from doing custom checking if the checkbox wasn't
-  checked. BEWARE: This might conflict with your run-on-the-mill work-around code. [Tobias Lütke]
-
-* Fixed error_message_on to just use the first if more than one error had been added [Marcel Molina Jr.]
-
-* Fixed that URL rewriting with /controller/ was working but /controller was not and that you couldn't use :id on index [geech]
-
-* Fixed a bug with link_to where the :confirm option wouldn't be picked up if the link was a straight url instead of an option hash
-
-* Changed scaffolding of forms to use <label> tags instead of <b> to please W3C [evl]
-
-* Added DateHelper#distance_of_time_in_words_to_now(from_time) that works like distance_of_time_in_words,
-  but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
-
-* Added assert_flash_equal(expected, key, message), assert_session_equal(expected, key, message),
-  assert_assigned_equal(expected, key, message) to test the contents of flash, session, and template assigns.
-
-* Improved the failure report on assert_success when the action triggered a redirection [alexey].
-
-* Added "markdown" to accompany "textilize" as a TextHelper method for converting text to HTML using the Markdown syntax.
-  BlueCloth must be installed in order for this method to become available.
-
-* Made sure that an active session exists before we attempt to delete it [Samuel]
-
-* Changed link_to with Javascript confirmation to use onclick instead of onClick for XHTML validity [Scott Barron]
-
-
-*0.9.0 (43)*
-
-* Added support for Builder-based templates for files with the .rxml extension. These new templates are an alternative to ERb that
-  are especially useful for generating XML content, such as this RSS example from Basecamp:
-
-    xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
-      xml.channel do
-        xml.title(@feed_title)
-        xml.link(@url)
-        xml.description "Basecamp: Recent items"
-        xml.language "en-us"
-        xml.ttl "40"
-
-        for item in @recent_items
-          xml.item do
-            xml.title(item_title(item))
-            xml.description(item_description(item)) if item_description(item)
-            xml.pubDate(item_pubDate(item))
-            xml.guid(@person.firm.account.url + @recent_items.url(item))
-            xml.link(@person.firm.account.url + @recent_items.url(item))
-
-            xml.tag!("dc:creator", item.author_name) if item_has_creator?(item)
-          end
-        end
-      end
-    end
-
-    ...which will generate something like:
-
-    <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-      <channel>
-        <title>Web Site Redesign</title>
-        <link>http://www.basecamphq.com/clients/travelcenter/1/</link>
-        <description>Basecamp: Recent items</description>
-        <language>en-us</language>
-        <ttl>40</ttl>
-        <item>
-          <title>Post: don't you know</title>
-          <description>&amp;lt;p&amp;gt;deeper and down&amp;lt;/p&amp;gt;</description>
-          <pubDate>Fri, 20 Aug 2004 21:13:50 CEST</pubDate>
-          <guid>http://www.basecamphq.com/clients/travelcenter/1/msg/assets/96976/comments</guid>
-          <link>http://www.basecamphq.com/clients/travelcenter/1/msg/assets/96976/comments</link>
-          <dc:creator>David H. Heinemeier</dc:creator>
-        </item>
-        <item>
-          <title>Milestone completed: Design Comp 2</title>
-          <pubDate>Mon,  9 Aug 2004 14:42:06 CEST</pubDate>
-          <guid>http://www.basecamphq.com/clients/travelcenter/1/milestones/#49</guid>
-          <link>http://www.basecamphq.com/clients/travelcenter/1/milestones/#49</link>
-        </item>
-      </channel>
-    </rss>
-
-  The "xml" local variable is automatically available in .rxml templates. You construct the template by calling a method with the name
-  of the tag you want. Options for the tag can be specified as a hash parameter to that method.
-
-  Builder-based templates can be mixed and matched with the regular ERb ones. The only thing that differentiates them is the extension.
-  No new methods have been added to the public interface to handle them.
-
-  Action Pack ships with a version of Builder, but it will use the RubyGems version if you have one installed.
-
-  Read more about Builder on: http://onestepback.org/index.cgi/Tech/Ruby/StayingSimple.rdoc
-
-  [Builder is created by Jim Weirich]
-
-* Added much improved support for functional testing [what-a-day].
-
-    # Old style
-    def test_failing_authenticate
-      @request.request_uri = "/login/authenticate"
-      @request.action = "authenticate"
-      @request.request_parameters["user_name"] = "nop"
-      @request.request_parameters["password"]  = ""
-
-      response = LoginController.process_test(@request)
-
-      assert_equal "The username and/or password you entered is invalid.", response.session["flash"]["alert"]
-      assert_equal "http://37signals.basecamp.com/login/", response.headers["location"]
-    end
-
-    # New style
-    def test_failing_authenticate
-      process :authenticate, "user_name" => "nop", "password" => ""
-      assert_flash_has 'alert'
-      assert_redirected_to :action => "index"
-    end
-
-  See a full example on http://codepaste.org/view/paste/334
-
-* Increased performance by up to 100% with a revised cookie class that fixes the performance problems with the
-  default one that ships with 1.8.1 and below. It replaces the inheritance on SimpleDelegator with DelegateClass(Array)
-  following the suggestion from Matz on:
-  http://groups.google.com/groups?th=e3a4e68ba042f842&seekm=c3sioe%241qvm%241%40news.cybercity.dk#link14
-
-* Added caching for compiled ERb templates. On Basecamp, it gave between 8.5% and 71% increase in performance [Andreas Schwarz].
-
-* Added implicit counter variable to render_collection_of_partials [Marcel Molina Jr.]. From the docs:
-
-    <%= render_collection_of_partials "ad", @advertisements %>
-
-    This will render "advertiser/_ad.rhtml" and pass the local variable +ad+ to the template for display. An iteration counter
-    will automatically be made available to the template with a name of the form +partial_name_counter+. In the case of the
-    example above, the template would be fed +ad_counter+.
-
-* Fixed problems with two sessions being maintained on reset_session that would particularly screw up ActiveRecordStore.
-
-* Fixed reset_session to start an entirely new session instead of merely deleting the old. So you can now safely access @session
-  after calling reset_ression and expect it to work.
-
-* Added @request.get?, @request.post?, @request.put?, @request.delete? as convenience query methods for @request.method [geech]
-
-* Added @request.method that'll return a symbol representing the HTTP method, such as :get, :post, :put, :delete [geech]
-
-* Changed @request.remote_ip and @request.host to work properly even when a proxy is in front of the application [geech]
-
-* Added JavaScript confirm feature to link_to. Documentation:
-
-    The html_options have a special feature for creating javascript confirm alerts where if you pass
-    :confirm => 'Are you sure?', the link will be guarded with a JS popup asking that question.
-    If the user accepts, the link is processed, otherwise not.
-
-* Added link_to_unless_current as a UrlHelper method [Sam Stephenson]. Documentation:
-
-    Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current
-    controller, action, and id are the same as the link's, in which case only the name is returned (or the
-    given block is yielded, if one exists). This is useful for creating link bars where you don't want to link
-    to the page currently being viewed.
-
-* Fixed that UrlRewriter (the driver for url_for, link_to, etc) would blow up when the anchor was an integer [alexey]
-
-* Added that layouts defined with no directory defaults to layouts. So layout "weblog/standard" will use
-  weblog/standard (as always), but layout "standard" will use layouts/standard.
-
-* Fixed that partials (or any template starting with an underscore) was publically viewable [Marten]
-
-* Added HTML escaping to text_area helper.
-
-* Added :overwrite_params to url_for and friends to keep the parameters as they were passed to the current action and only overwrite a subset.
-  The regular :params will clear the slate so you need to manually add in existing parameters if you want to reuse them. [raphinou]
-
-* Fixed scaffolding problem with composite named objects [Moo Jester]
-
-* Added the possibility for shared partials. Example:
-
-    <%= render_partial "advertisement/ad", ad %>
-
-  This will render the partial "advertisement/_ad.rhtml" regardless of which controller this is being called from.
-
-  [Jacob Fugal]
-
-* Fixed crash when encountering forms that have empty-named fields [James Prudente]
-
-* Added check_box form helper method now accepts true/false as well as 1/0 [what-a-day]
-
-* Fixed the lacking creation of all directories with install.rb [Dave Steinberg]
-
-* Fixed that date_select returns valid XHTML selected options [Andreas Schwarz]
-
-* Fixed referencing an action with the same name as a controller in url_for [what-a-day]
-
-* Fixed the destructive nature of Base#attributes= on the argument [Kevin Watt]
-
-* Changed ActionControllerError to decent from StandardError instead of Exception. It can now be caught by a generic rescue.
-
-* Added SessionRestoreError that is raised when a session being restored holds objects where there is no class available.
-
-* Added block as option for inline filters. So what used to be written as:
-
-    before_filter Proc { |controller| return false if controller.params["stop_action"] }
-
-  ...can now be as:
-
-    before_filter { |controller| return false if controller.params["stop_action"] }
-
-  [Jeremy Kemper]
-
-* Made the following methods public (was protected): url_for, controller_class_name, controller_name, action_name
-  This makes it easier to write filters without cheating around the encapsulation with send.
-
-* ActionController::Base#reset_session now sticks even if you access @session afterwards [Kent Sibilev]
-
-* Improved the exception logging so the log file gets almost as much as in-browser debugging.
-
-* Changed base class setup from AbstractTemplate/ERbTemplate to ActionView::Base. This change should be harmless unless you were
-  accessing Action View directly in which case you now need to reference the Base class.\
-
-* Added that render_collection_of_partials returns nil if the collection is empty. This makes showing a “no items” message easier.
-  For example: <%= render_collection_of_partials("message", @messages) || "No messages found." %> [Sam Stephenson]
-
-* Added :month_before_year as an option to date_select to get the month select before the year. Especially useful for credit card forms.
-
-* Added :add_month_numbers to select_month to get options like "3 - March".
-
-* Removed Base.has_active_layout? as it couldn't answer the question without the instance. Use Base#active_layout instead.
-
-* Removed redundant call to update on ActionController::Base#close_session [Andreas Schwarz]
-
-* Fixed that DRb Store accidently started its own server (instead of just client) [Andreas]
-
-* Fixed strip_links so it now works across multiple lines [Chad Fowler]
-
-* Fixed the TemplateError exception to show the proper trace on to_s (useful for unit test debugging)
-
-* Implemented class inheritable attributes without eval [Caio Chassot]
-
-* Made TextHelper#concat accept binding as it would otherwise not work
-
-* The FormOptionsHelper will now call to_s on the keys and values used to generate options
-
-
-*0.8.5*
-
-* Introduced passing of locally scoped variables between templates:
-
-    You can pass local variables to sub templates by using a hash of with the variable
-    names as keys and the objects as values:
-
-      <%= render "shared/header", { "headline" => "Welcome", "person" => person } %>
-
-    These can now be accessed in shared/header with:
-
-      Headline: <%= headline %>
-      First name: <%= person.first_name %>
-
-* Introduced the concept of partials as a certain type of sub templates:
-
-    There's also a convenience method for rendering sub templates within the current
-    controller that depends on a single object (we call this kind of sub templates for
-    partials). It relies on the fact that partials should follow the naming convention
-    of being prefixed with an underscore -- as to separate them from regular templates
-    that could be rendered on their own. In the template for Advertiser#buy, we could have:
-
-      <% for ad in @advertisements %>
-        <%= render_partial "ad", ad %>
-      <% end %>
-
-    This would render "advertiser/_ad.rhtml" and pass the local variable +ad+
-    for the template to display.
-
-    == Rendering a collection of partials
-
-    The example of partial use describes a familar pattern where a template needs
-    to iterate over a array and render a sub template for each of the elements.
-    This pattern has been implemented as a single method that accepts an array and
-    renders a partial by the same name of as the elements contained within. So the
-    three-lined example in "Using partials" can be rewritten with a single line:
-
-      <%= render_collection_of_partials "ad", @advertisements %>
-
-    So this will render "advertiser/_ad.rhtml" and pass the local variable +ad+ for
-    the template to display.
-
-* Improved send_file by allowing a wide range of options to be applied [Jeremy Kemper]:
-
-    Sends the file by streaming it 4096 bytes at a time. This way the
-    whole file doesn't need to be read into memory at once.  This makes
-    it feasible to send even large files.
-
-    Be careful to sanitize the path parameter if it coming from a web
-    page.  send_file(@params['path'] allows a malicious user to
-    download any file on your server.
-
-    Options:
-    * <tt>:filename</tt> - specifies the filename the browser will see.
-      Defaults to File.basename(path).
-    * <tt>:type</tt> - specifies an HTTP content type.
-      Defaults to 'application/octet-stream'.
-    * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
-      Valid values are 'inline' and 'attachment' (default).
-    * <tt>:buffer_size</tt> - specifies size (in bytes) of the buffer used to stream
-      the file.  Defaults to 4096.
-
-    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
-    a variety of quirks (especially when downloading over SSL).
-
-    Simple download:
-      send_file '/path/to.zip'
-
-    Show a JPEG in browser:
-      send_file '/path/to.jpeg', :type => 'image/jpeg', :disposition => 'inline'
-
-    Read about the other Content-* HTTP headers if you'd like to
-    provide the user with more information (such as Content-Description).
-    http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
-
-    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
-    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.
-
-* Added pluralize method to the TextHelper that makes it easy to get strings like "1 message", "3 messages"
-
-* Added proper escaping for the rescues [Andreas Schwarz]
-
-* Added proper escaping for the option and collection tags [Andreas Schwarz]
-
-* Fixed NaN errors on benchmarking [Jim Weirich]
-
-* Fixed query string parsing for URLs that use the escaped versions of & or ; as part of a key or value
-
-* Fixed bug with custom Content-Type headers being in addition to rather than instead of the default header.
-  (This bug didn't matter with neither CGI or mod_ruby, but FCGI exploded on it) [With help from Ara T. Howard]
-
-
-*0.8.0*
-
-* Added select, collection_select, and country_select to make it easier for Active Records to set attributes through
-  drop-down lists of options. Example:
-
-    <%= select "person", "gender", %w( Male Female ) %>
-
-  ...would give the following:
-
-    <select name="person[gender]" id="person_gender"><option>Male</option><option>Female</option></select>
-
-* Added an option for getting multiple values on a single form name into an array instead of having the last one overwrite.
-  This is especially useful for groups of checkboxes, which can now be written as:
-
-    <input type="checkbox" name="rights[]" value="CREATE" />
-    <input type="checkbox" name="rights[]" value="UPDATE" />
-    <input type="checkbox" name="rights[]" value="DELETE" />
-
-  ...and retrieved in the controller action with:
-
-    @params["rights"] # => [ "CREATE", "UPDATE", "DELETE" ]
-
-  The old behavior (where the last one wins, "DELETE" in the example) is still available. Just don't add "[]" to the
-  end of the name. [Scott Baron]
-
-* Added send_file which uses the new render_text block acceptance to make it feasible to send large files.
-  The files is sent with a bunch of voodoo HTTP headers required to get arbitrary files to download as
-  expected in as many browsers as possible (eg, IE hacks). Example:
-
-  def play_movie
-    send_file "/movies/that_movie.avi"
-  end
-
-  [Jeremy Kemper]
-
-* render_text now accepts a block for deferred rendering. Useful for streaming large files, displaying
-  a “please wait” message during a complex search, etc. Streaming example:
-
-    render_text do |response|
-      File.open(path, 'rb') do |file|
-        while buf = file.read(1024)
-          print buf
-        end
-      end
-    end
-
-  [Jeremy Kemper]
-
-* Added a new Tag Helper that can generate generic tags programmatically insted of through HTML. Example:
-
-    tag("br", "clear" => "all") => <br clear="all" />
-
-  ...that's usually not terribly interesting (unless you have a lot of options already in a hash), but it
-  gives way for more specific tags, like the new form tag:
-
-    form_tag({ :controller => "weblog", :action => "update" }, { :multipart => "true", "style" => "width: 200px"}) =>
-      <form action="/weblog/update" enctype="multipart/formdata" style="width: 200px">
-
-  There's even a "pretty" version for people who don't like to open tags in code and close them in HTML:
-
-    <%= start_form_tag :action => "update" %>
-      # all the input fields
-    <%= end_form_tag %>
-
-  (end_form_tag just returns "</form>")
-
-* The selected parameter in options_for_select may now also an array of values to be selected when
-  using a multiple select. Example:
-
-    options_for_select([ "VISA", "Mastercard", "Discover" ], ["VISA", "Discover"]) =>
-      <option selected>VISA</option>\n<option>Mastercard</option>\n<option selected>Discover</option>
-
-  [Scott Baron]
-
-* Changed the URL rewriter so controller_prefix and action_prefix can be used in isolation. You can now do:
-
-    url_for(:controller_prefix => "clients")
-
-  ...or:
-
-    url_for(:action_prefix => "category/messages")
-
-  Neither would have worked in isolation before (:controller_prefix required a :controller and :action_prefix required an :action)
-
-* Started process of a cleaner separation between Action Controller and ERb-based Action Views by introducing an
-  abstract base class for views. And Amita adapter could be fitted in more easily now.
-
-* The date helper methods date_select and datetime_select now also use the field error wrapping
-  (div with class fieldWithErrors by default).
-
-* The date helper methods date_select and datetime_select can now discard selects
-
-* Added option on AbstractTemplate to specify a different field error wrapping. Example:
-
-    ActionView::AbstractTemplate.field_error_proc = Proc.new do |html, instance|
-      "<p>#{instance.method_name + instance.error_message}</p><div style='background-color: red'>#{html}</div>"
-    end
-
-  ...would give the following on a Post#title (text field) error:
-
-    <p>Title can't be empty</p>
-    <div style='background-color: red'>
-      <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
-    </div>
-
-* The UrlHelper methods url_for and link_to will now by default only return paths, not complete URIs.
-  That should make it easier to fit a Rails application behind a proxy or load-balancer.
-  You can overwrite this by passing :only_path => false as part of the options. [Suggested by U235]
-
-* Fixed bug with having your own layout for use with scaffolding [Kevin Radloff]
-
-* Fixed bug where redirect_to_path didn't append the port on non-standard ports [dhawkins]
-
-* Scaffolding plays nicely with single-table inheritance (LoadErrors are caught) [Jeremy Kemper]
-
-* Scaffolding plays nice with plural models like Category/categories [Jeremy Kemper]
-
-* Fixed missing suffix appending in scaffolding [Kevin Radloff]
-
-
-*0.7.9*
-
-* The "form" method now present boolean fields from PostgreSQL as drop-down menu. [Scott]
-
-* Scaffolding now automatically attempts to require the class that's being scaffolded.
-
-* Scaffolding will use the current active layout, instead of its own, if one has been specified. Example:
-
-    class WeblogController < ActionController::Base
-      layout "layouts/weblog"
-      scaffold :post
-    end
-
-  [Suggested by Scott]
-
-* Changed url_for (and all the that drives, like redirect_to, link_to, link_for) so you can pass it a symbol instead of a hash.
-  This symbol is a method reference which is then called to calculate the url. Example:
-
-    class WeblogController < ActionController::Base
-      def update
-        # do some update
-        redirect_to :dashboard_url
-      end
-
-      protected
-        def dashboard_url
-          if @project.active?
-            url_for :controller => "project", :action => "dashboard"
-          else
-            url_for :controller => "account", :action => "dashboard"
-          end
-        end
-    end
-
-* Added default_url_options to specialize behavior for all url_for (and friends) calls:
-
-    Overwrite to implement a number of default options that all url_for-based methods will use.
-    The default options should come in form of a hash, just like the one you would use for
-    url_for directly. Example:
-
-      def default_url_options(options)
-        { :controller_prefix => @project.active? ? "projects/" : "accounts/" }
-      end
-
-    As you can infer from the example, this is mostly useful for situations where you want to
-    centralize dynamic dissions about the urls as they stem from the business domain. Please note
-    that any individual url_for call can always override the defaults set by this method.
-
-
-* Changed url_for so that an "id" passed in the :params is not treated special. You need to use the dedicated :id to get
-  the special auto path-params treatment. Considering the url http://localhost:81/friends/list
-
-    url_for(:action => "show", :params => { "id" => 5 })
-      ...used to give http://localhost:81/friends/show/5
-      ......now gives http://localhost:81/friends/show?id=5
-
-    If you want the automated id behavior, do:
-
-    url_for(:action => "show", :id => 5 )
-      ....which gives http://localhost:81/friends/show/5
-
-
-* Fixed problem with anchor being inserted before path parameters with url_for (and friends)
-
-
-*0.7.8*
-
-* Fixed session bug where you couldn't store any objects that didn't exist in the standard library
-  (such as Active Record objects).
-
-* Added reset_session method for Action Controller objects to clear out all objects in the session.
-
-* Fixed that exceptions raised during filters are now also caught by the default rescues
-
-* Added new around_filter for doing before and after filtering with a single object [Florian Weber]:
-
-    class WeblogController < ActionController::Base
-      around_filter BenchmarkingFilter.new
-
-      # Before this action is performed, BenchmarkingFilter#before(controller) is executed
-      def index
-      end
-      # After this action has been performed, BenchmarkingFilter#after(controller) is executed
-    end
-
-    class BenchmarkingFilter
-      def initialize
-        @runtime
-      end
-
-      def before
-        start_timer
-      end
-
-      def after
-        stop_timer
-        report_result
-      end
-    end
-
-* Added the options for specifying a different name and id for the form helper methods than what is guessed [Florian Weber]:
-
-    text_field "post", "title"
-      ...just gives: <input id="post_title" name="post[title]" size="30" type="text" value="" />
-
-    text_field "post", "title", "id" => "title_for_post", "name" => "first_post_title"
-      ...can now give: <input id="title_for_post" name="first_post_title" size="30" type="text" value="" />
-
-* Added DebugHelper with a single "debug" method for doing pretty dumps of objects in the view
-  (now used in the default rescues to better present the contents of session and template variables)
-
-* Added note to log about the templates rendered within layouts (before just the layout was shown)
-
-* Fixed redirects on https setups [Andreas]
-
-* Fixed scaffolding problem on the edit action when using :suffix => true [Scott]
-
-* Fixed scaffolding problem where implementing list.rhtml wouldn't work for the index action
-
-* URLs generated now uses &amp; instead of just & so pages using it can validate with W3C [Spotted by Andreas]
-
-
-*0.7.7*
-
-* Fixed bug in CGI extension that prevented multipart forms from working
-
-
-*0.7.6*
-
-* Included ERB::Util so all templates can easily escape HTML content with <%=h @person.content %>
-
-* All requests are now considered local by default, so everyone will be exposed to detailed debugging screens on errors.
-  When the application is ready to go public, set ActionController::Base.consider_all_requests_local to false,
-  and implement the protected method local_request? in the controller to determine when debugging screens should be shown.
-
-* Fixed three bugs with the url_for/redirect_to/link_to handling. Considering the url http://localhost:81/friends/show/1
-
-    url_for(:action => "list")
-      ...used to give http://localhost:81/friends/list/1
-      ......now gives http://localhost:81/friends/list
-
-    url_for(:controller => "friends", :action => "destroy", :id => 5)
-      ...used to give http://localhost:81/friends/destroy
-      ......now gives http://localhost:81/friends/destroy/5
-
-  Considering the url http://localhost:81/teachers/show/t
-
-    url_for(:action => "list", :id => 5)
-      ...used to give http://localhost:81/5eachers/list/t
-      ......now gives http://localhost:81/teachers/list/5
-
-  [Reported by David Morton & Radsaq]
-
-* Logs exception to logfile in addition to showing them for local requests
-
-* Protects the eruby load behind a begin/rescue block. eRuby is not required to run ActionController.
-
-* Fixed install.rb to also install clean_logger and the templates
-
-* Added ActiveRecordStore as a session option. Read more in lib/action_controller/session/active_record_store.rb [Tim Bates]
-
-* Change license to MIT License (and included license file in package)
-
-* Application error page now returns status code 500 instead of 200
-
-* Fixed using Procs as layout handlers [Florian Weber]
-
-* Fixed bug with using redirects ports other than 80
-
-* Added index method that calls list on scaffolding
-
-
-*0.7.5*
-
-* First public release
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
new file mode 100644
index 0000000000..99c3ac3c04
--- /dev/null
+++ b/actionpack/CHANGELOG.md
@@ -0,0 +1,5663 @@
+## Rails 3.2.0 (unreleased) ##
+
+*   Responders now return 204 No Content for API requests without a response body (as in the new scaffold) *José Valim*
+
+*   Added ActionDispatch::RequestId middleware that'll make a unique X-Request-Id header available to the response and enables the ActionDispatch::Request#uuid method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog *DHH*
+
+*   Limit the number of options for select_year to 1000.
+
+    Pass the :max_years_allowed option to set your own limit.
+
+    *Libo Cannici*
+
+*   Passing formats or handlers to render :template and friends is deprecated. For example: *Nick Sutterer & José Valim*
+
+        render :template => "foo.html.erb"
+
+    Instead, you can provide :handlers and :formats directly as option:
+             render :template => "foo", :formats => [:html, :js], :handlers => :erb
+
+*   Changed log level of warning for missing CSRF token from :debug to :warn. *Mike Dillon*
+
+*   content_tag_for and div_for can now take the collection of records. It will also yield the record as the first argument if you set a receiving argument in your block *Prem Sichanugrist*
+
+    So instead of having to do this:
+
+        @items.each do |item|
+          content_tag_for(:li, item) do
+             Title: <%= item.title %>
+          end
+        end
+
+    You can now do this:
+
+        content_tag_for(:li, @items) do |item|
+          Title: <%= item.title %>
+        end
+
+*   send_file now guess the mime type *Esad Hajdarevic*
+
+*   Mime type entries for PDF, ZIP and other formats were added *Esad Hajdarevic*
+
+*   Generate hidden input before select with :multiple option set to true.
+    This is useful when you rely on the fact that when no options is set,
+    the state of select will be sent to rails application. Without hidden field
+    nothing is sent according to HTML spec *Bogdan Gusiev*
+
+*   Refactor ActionController::TestCase cookies *Andrew White*
+
+    Assigning cookies for test cases should now use cookies[], e.g:
+
+        cookies[:email] = 'user@example.com'
+        get :index
+        assert_equal 'user@example.com', cookies[:email]
+
+    To clear the cookies, use clear, e.g:
+
+        cookies.clear
+        get :index
+        assert_nil cookies[:email]
+
+    We now no longer write out HTTP_COOKIE and the cookie jar is
+    persistent between requests so if you need to manipulate the environment
+    for your test you need to do it before the cookie jar is created.
+
+
+## Rails 3.1.1 (unreleased) ##
+
+*   javascript_path and stylesheet_path now refer to /assets if asset pipelining
+    is on. [Santiago Pastorino]
+*   button_to support form option. Now you're able to pass for example
+    'data-type' => 'json'. [ihower]
+*   image_path and image_tag should use /assets if asset pipelining is turned
+    on. Closes #3126 [Santiago Pastorino and christos]
+*   Avoid use of existing precompiled assets during rake assets:precompile run.
+    Closes #3119 [Guillermo Iguaran]
+*   Copy assets to nondigested filenames too *Santiago Pastorino*
+
+*   Give precedence to `config.digest = false` over the existence of
+    manifest.yml asset digests [christos]
+*   escape options for the stylesheet_link_tag method *Alexey Vakhov*
+
+*   Re-launch assets:precompile task using (Rake.)ruby instead of Kernel.exec so
+    it works on Windows [cablegram]
+*   env var passed to process shouldn't be modified in process method. [Santiago
+    Pastorino]
+*   `rake assets:precompile` loads the application but does not initialize
+    it.
+    To the app developer, this means configuration add in
+    config/initializers/* will not be executed.
+    Plugins developers need to special case their initializers that are
+    meant to be run in the assets group by adding :group => :assets. *José Valim*
+
+*   Sprockets uses config.assets.prefix for asset_path *asee*
+
+*   FileStore key_file_path properly limit filenames to 255 characters. *phuibonhoa*
+
+*   Fix Hash#to_query edge case with html_safe strings. *brainopia*
+
+*   Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.
+    Useful for linking assets from static html files or from emails when the user    could probably look at an older html email with an older asset. [Santiago Pastorino]
+*   Don't mount Sprockets server at config.assets.prefix if config.assets.compile is false. *Mark J. Titorenko*
+
+*   Set relative url root in assets when controller isn't available for Sprockets (eg. Sass files using asset_path). Fixes #2435 *Guillermo Iguaran*
+
+*   Fix basic auth credential generation to not make newlines. GH #2882
+
+*   Fixed the behavior of asset pipeline when config.assets.digest and config.assets.compile are false and requested asset isn't precompiled.
+    Before the requested asset were compiled anyway ignoring that the config.assets.compile flag is false. *Guillermo Iguaran*
+
+*   CookieJar is now Enumerable. Fixes #2795
+
+*   Fixed AssetNotPrecompiled error raised when rake assets:precompile is compiling certain .erb files. See GH #2763 #2765 #2805 *Guillermo Iguaran*
+
+*   Manifest is correctly placed in assets path when default assets prefix is changed. Fixes #2776 *Guillermo Iguaran*
+
+*   Fixed stylesheet_link_tag and javascript_include_tag to respect additional options passed by the users when debug is on. *Guillermo Iguaran*
+
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   Param values are `paramified` in controller tests. *David Chelimsky*
+
+*   x_sendfile_header now defaults to nil and config/environments/production.rb doesn't set a particular value for it. This allows servers to set it through X-Sendfile-Type. *Santiago Pastorino*
+
+*   The submit form helper does not generate an id "object_name_id" anymore. *fbrusatti*
+
+*   Make sure respond_with with :js tries to render a template in all cases *José Valim*
+
+*   json_escape will now return a SafeBuffer string if it receives SafeBuffer string *tenderlove*
+
+*   Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string *Prem Sichanugrist*
+
+*   Fix escape_js to work correctly with the new SafeBuffer restriction *Paul Gallagher*
+
+*   Brought back alternative convention for namespaced models in i18n *thoefer*
+
+    Now the key can be either "namespace.model" or "namespace/model" until further deprecation.
+
+*   It is prohibited to perform a in-place SafeBuffer mutation *tenderlove*
+
+    The old behavior of SafeBuffer allowed you to mutate string in place via
+    method like `sub!`. These methods can add unsafe strings to a safe buffer,
+    and the safe buffer will continue to be marked as safe.
+
+    An example problem would be something like this:
+
+        <%= link_to('hello world', @user).sub!(/hello/, params[:xss])  %>
+
+    In the above example, an untrusted string (`params[:xss]`) is added to the
+    safe buffer returned by `link_to`, and the untrusted content is successfully
+    sent to the client without being escaped.  To prevent this from happening
+    `sub!` and other similar methods will now raise an exception when they are called on a safe buffer.
+
+    In addition to the in-place versions, some of the versions of these methods which return a copy of the string will incorrectly mark strings as safe. For example:
+
+         <%= link_to('hello world', @user).sub(/hello/, params[:xss]) %>
+
+    The new versions will now ensure that *all* strings returned by these methods on safe buffers are marked unsafe.
+
+    You can read more about this change in http://groups.google.com/group/rubyonrails-security/browse_thread/thread/2e516e7acc96c4fb
+
+*   Warn if we cannot verify CSRF token authenticity *José Valim*
+
+*   Allow AM/PM format in datetime selectors *Aditya Sanghi*
+
+*   Only show dump of regular env methods on exception screen (not all the rack crap) *DHH*
+
+*   auto_link has been removed with no replacement.  If you still use auto_link
+    please install the rails_autolink gem:
+        http://github.com/tenderlove/rails_autolink
+
+    *tenderlove*
+
+*   Added streaming support, you can enable it with: *José Valim*
+
+        class PostsController < ActionController::Base
+          stream :only => :index
+        end
+
+    Please read the docs at `ActionController::Streaming` for more information.
+
+*   Added `ActionDispatch::Request.ignore_accept_header` to ignore accept headers and only consider the format given as parameter *José Valim*
+
+*   Created `ActionView::Renderer` and specified an API for `ActionView::Context`, check those objects for more information *José Valim*
+
+*   Added `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default *Prem Sichanugrist*
+
+    This can be customized by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
+
+*   RJS has been extracted out to a gem. *fxn*
+
+*   Implicit actions named not_implemented can be rendered. *Santiago Pastorino*
+
+*   Wildcard route will always match the optional format segment by default. *Prem Sichanugrist*
+
+    For example if you have this route:
+
+        match '*pages' => 'pages#show'
+
+    by requesting '/foo/bar.json', your `params[:pages]` will be equals to "foo/bar" with the request format of JSON. If you want the old 3.0.x behavior back, you could supply `:format => false` like this:
+
+        match '*pages' => 'pages#show', :format => false
+
+*   Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call *DHH*
+
+        class PostsController < ApplicationController
+          USER_NAME, PASSWORD = "dhh", "secret"
+
+          before_filter :authenticate, :except => [ :index ]
+
+          def index
+            render :text => "Everyone can see me!"
+          end
+
+          def edit
+            render :text => "I'm only accessible if you know the password"
+          end
+
+          private
+            def authenticate
+              authenticate_or_request_with_http_basic do |user_name, password|
+                user_name == USER_NAME && password == PASSWORD
+              end
+            end
+        end
+
+    ..can now be written as
+
+        class PostsController < ApplicationController
+          http_basic_authenticate_with :name => "dhh", :password => "secret", :except => :index
+
+          def index
+            render :text => "Everyone can see me!"
+          end
+
+          def edit
+            render :text => "I'm only accessible if you know the password"
+          end
+        end
+
+*   Allow you to add `force_ssl` into controller to force browser to transfer data via HTTPS protocol on that particular controller. You can also specify `:only` or `:except` to specific it to particular action. *DHH and Prem Sichanugrist*
+
+*   Allow FormHelper#form_for to specify the :method as a direct option instead of through the :html hash *DHH*
+
+        form_for(@post, remote: true, method: :delete) instead of form_for(@post, remote: true, html: { method: :delete })
+
+*   Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -- note this then supersedes the Object#j() method that the JSON gem adds within templates using the JavaScriptHelper *DHH*
+
+*   Sensitive query string parameters (specified in config.filter_parameters) will now be filtered out from the request paths in the log file. *Prem Sichanugrist, fxn*
+
+*   URL parameters which return false for to_param now appear in the query string (previously they were removed) *Andrew White*
+
+*   URL parameters which return nil for to_param are now removed from the query string *Andrew White*
+
+*   ActionDispatch::MiddlewareStack now uses composition over inheritance. It is
+    no longer an array which means there may be methods missing that were not    tested.
+*   Add an :authenticity_token option to form_tag for custom handling or to omit the token (pass :authenticity_token => false).  *Jakub Kuźma, Igor Wiedler*
+
+*   HTML5 button_tag helper. *Rizwan Reza*
+
+*   Template lookup now searches further up in the inheritance chain. *Artemave*
+
+*   Brought back config.action_view.cache_template_loading, which allows to decide whether templates should be cached or not. *Piotr Sarnacki*
+
+*   url_for and named url helpers now accept :subdomain and :domain as options, *Josh Kalderimis*
+
+*   The redirect route method now also accepts a hash of options which will only change the parts of the url in question, or an object which responds to call, allowing for redirects to be reused (check the documentation for examples). *Josh Kalderimis*
+
+*   Added config.action_controller.include_all_helpers. By default 'helper :all' is done in ActionController::Base, which includes all the helpers by default. Setting include_all_helpers to false will result in including only application_helper and helper corresponding to controller (like foo_helper for foo_controller). *Piotr Sarnacki*
+
+*   Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a :data hash of options:
+
+        tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
+        # => <div data-name="Stephen" data-city-state="[&quot;Chicago&quot;,&quot;IL&quot;]" />
+
+    Keys are dasherized. Values are JSON-encoded, except for strings and symbols. *Stephen Celis*
+
+*   Deprecate old template handler API. The new API simply requires a template handler to respond to call. *José Valim*
+
+*   :rhtml and :rxml were finally removed as template handlers. *José Valim*
+
+*   Moved etag responsibility from ActionDispatch::Response to the middleware stack. *José Valim*
+
+*   Rely on Rack::Session stores API for more compatibility across the Ruby world. This is backwards incompatible since Rack::Session expects #get_session to accept 4 arguments and requires #destroy_session instead of simply #destroy. *José Valim*
+
+*   file_field automatically adds :multipart => true to the enclosing form. *Santiago Pastorino*
+
+*   Renames csrf_meta_tag -> csrf_meta_tags, and aliases csrf_meta_tag for backwards compatibility. *fxn*
+
+*   Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. *Yehuda Katz, Carl Lerche*
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   No changes.
+
+
+*   Rails 3.0.6 (April 5, 2011)
+
+*   Fixed XSS vulnerability in `auto_link`.  `auto_link` no longer marks input as
+    html safe.  Please make sure that calls to auto_link() are wrapped in a
+    sanitize(), or a raw() depending on the type of input passed to auto_link().
+    For example:
+
+        <%= sanitize(auto_link(some_user_input)) %>
+
+    Thanks to Torben Schulz for reporting this.  The fix can be found here:
+    61ee3449674c591747db95f9b3472c5c3bd9e84d
+
+*   Fixes the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default *Prem Sichanugrist*
+
+*   Fixes an issue with number_to_human when converting values which are less than 1 but greater than -1 *Josh Kalderimis*
+
+*   Sensitive query string parameters (specified in config.filter_parameters) will now be filtered out from the request paths in the log file. *Prem Sichanugrist, fxn*
+
+*   URL parameters which return nil for to_param are now removed from the query string *Andrew White*
+
+*   Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*
+
+*   Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0 *Sven Fuchs*
+
+*   Fix regression: javascript_include_tag shouldn't raise if you register an expansion key with nil or [] value *Santiago Pastorino*
+
+*   Fix Action caching bug where an action that has a non-cacheable response always renders a nil response body. It now correctly renders the response body. *Cheah Chu Yeow*
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   When ActiveRecord::Base objects are sent to predicate methods, the id of the object should be sent to ARel, not the ActiveRecord::Base object.
+
+*   :constraints routing should only do sanity checks against regular expressions.  String arguments are OK.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. *Don Wilson*
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   password_field renders with nil value by default making the use of passwords secure by default, if you want to render you should do for instance f.password_field(:password, :value => @user.password) *Santiago Pastorino*
+
+*   Symbols and strings in routes should yield the same behavior. Note this may break existing apps that were using symbols with the new routes API. *José Valim*
+
+*   Add clear_helpers as a way to clean up all helpers added to this controller, maintaining just the helper with the same name as the controller. *José Valim*
+
+*   Support routing constraints in functional tests. *Andrew White*
+
+*   Add a header that tells Internet Explorer (all versions) to use the best available standards support. *Yehuda Katz*
+
+*   Allow stylesheet/javascript extensions to be changed through railties. *Josh Kalderimis*
+
+*   link_to, button_to, and tag/tag_options now rely on html_escape instead of escape_once. *fxn*
+
+*   url_for returns always unescaped strings, and the :escape option is gone. *fxn*
+
+*   Added accept-charset parameter and _snowman hidden field to force the contents
+    of Rails POSTed forms to be in UTF-8 *Yehuda Katz*
+
+*   Upgrade to Rack 1.2.1 *Jeremy Kemper*
+
+*   Allow :path to be given to match/get/post/put/delete instead of :path_names in the new router *Carlos Antônio da Silva*
+
+*   Added resources_path_names to the new router DSL *José Valim*
+
+*   Allow options to be given to the namespace method in the new router *Carlos Antônio da Silva*
+
+*   Deprecate :name_prefix in the new router DSL *José Valim*
+
+*   Add shallow routes back to the new router *Diego Carrion, Andrew White*
+
+        resources :posts do
+          shallow do
+            resources :comments
+          end
+        end
+
+        You can now use comment_path for /comments/1 instead of post_comment_path for /posts/1/comments/1.
+
+*   Add support for multi-subdomain session by setting cookie host in session cookie so you can share session between www.example.com, example.com and user.example.com. #4818 *Guillermo Álvarez*
+
+*   Removed textilize, textilize_without_paragraph and markdown helpers. *Santiago Pastorino*
+
+*   Remove middleware laziness *José Valim*
+
+*   Make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean. *José Valim*
+
+*   OAuth 2: HTTP Token Authorization support to complement Basic and Digest Authorization.  *Rick Olson*
+
+*   Fixed inconsistencies in form builder and view helpers #4432 *Neeraj Singh*
+
+*   Both :xml and :json renderers now forwards the given options to the model, allowing you to invoke them as render :xml => @projects, :include => :tasks *José Valim, Yehuda Katz*
+
+*   Renamed the field error CSS class from fieldWithErrors to field_with_errors for consistency.  *Jeremy Kemper*
+
+*   Add support for shorthand routes like /projects/status(.:format)  #4423 *Diego Carrion*
+
+*   Changed translate helper so that it doesn’t mark every translation as safe HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. *Craig Davey*
+
+*   New option :as added to form_for allows to change the object name. The old <% form_for :client, @post %> becomes <% form_for @post, :as => :client %> *spastorino*
+
+*   Removed verify method in controllers. *JV*
+    It's now available as a plugin at http://github.com/rails/verification
+
+*   Removed input, form, error_messages_for and error_message_on from views. *JV*
+    It's now available as a plugin at http://github.com/rails/dynamic_form
+
+*   Routes can be scoped by controller module. *Jeremy Kemper*
+
+        # /session => Auth::SessionsController
+        scope :module => 'auth' do
+          resource :session
+        end
+
+*   Added #favicon_link_tag, it uses #image_path so in particular the favicon gets an asset ID *fxn*
+
+*   Fixed that default locale templates should be used if the current locale template is missing *DHH*
+
+*   Added all the new HTML5 form types as individual form tag methods (search, url, number, etc) #3646 *Stephen Celis*
+
+*   Changed the object used in routing constraints to be an instance of
+    ActionDispatch::Request rather than Rack::Request *YK*
+
+*   Changed ActionDispatch::Request#method to return a String, to be compatible
+    with Rack::Request. Added ActionDispatch::Request#method_symbol to
+    return a symbol form of the request method. *YK*
+
+*   Changed ActionDispatch::Request#method to return the original
+    method and #request_method to return the overridden method in the
+    case of methodoverride being used (this means that #method returns
+    "HEAD" and #request_method returns "GET" in HEAD requests). This
+    is for compatibility with Rack::Request *YK*
+
+*   #concat is now deprecated in favor of using <%= %> helpers *YK*
+
+*   Block helpers now return Strings, so you can use <%= form_for @foo do |f| %>.
+    <% form_for do |f| %> still works with deprecation notices *YK*
+
+*   Add a new #mount method on the router that does not anchor the PATH_INFO
+    at the end *YK & CL*
+
+*   Create a new LookupContext object that is responsible for performantly
+    finding a template for a given pattern *JV*
+
+*   Removed relative_url_for in favor of respecting SCRIPT_NAME *YK & CL*
+
+*   Changed file streaming to use Rack::Sendfile middleware *YK*
+
+*   ActionDispatch::Request#content_type returns a String to be compatible with
+    Rack::Request. Use #content_mime_type for the Mime::Type instance *YK*
+
+*   Updated Prototype to 1.6.1 and Scriptaculous to 1.8.3 *ML*
+
+*   Change the preferred way that URL helpers are included into a class*YK & CL*
+
+        # for all helpers including named routes
+        include Rails.application.router.url_helpers
+
+        # for just url_for
+        include Rails.application.router.url_for
+
+*   Fixed that PrototypeHelper#update_page should return html_safe *DHH*
+
+*   Fixed that much of DateHelper wouldn't return html_safe? strings *DHH*
+
+*   Fixed that fragment caching should return a cache hit as html_safe (or it would all just get escaped) *DHH*
+
+*   Added that ActionController::Base now does helper :all instead of relying on the default ApplicationController in Rails to do it *DHH*
+
+*   Added ActionDispatch::Request#authorization to access the http authentication header regardless of its proxy hiding *DHH*
+
+*   Added :alert, :notice, and :flash as options to ActionController::Base#redirect_to that'll automatically set the proper flash before the redirection [DHH]. Examples:
+
+        flash[:notice] = 'Post was created'
+        redirect_to(@post)
+
+    ...becomes:
+
+        redirect_to(@post, :notice => 'Post was created')
+
+*   Added ActionController::Base#notice/= and ActionController::Base#alert/= as a convenience accessors in both the controller and the view for flash[:notice]/= and flash[:alert]/= *DHH*
+
+
+*   Introduce grouped_collection_select helper.  #1249 *Dan Codeape, Erik Ostrom*
+
+*   Make sure javascript_include_tag/stylesheet_link_tag does not append ".js" or ".css" onto external urls. #1664 *Matthew Rudy Jacobs*
+
+*   Ruby 1.9: fix Content-Length for multibyte send_data streaming.  #2661 *Sava Chankov*
+
+*   Ruby 1.9: ERB template encoding using a magic comment at the top of the file.  *Jeremy Kemper*
+        <%# encoding: utf-8 %>
+
+*   Change integration test helpers to accept Rack environment instead of just HTTP Headers *Pratik Naik*
+
+    Before :  get '/path', {}, 'Accept' => 'text/javascript'
+    After  :  get '/path', {}, 'HTTP_ACCEPT' => 'text/javascript'
+
+*   Instead of checking Rails.env.test? in Failsafe middleware, check env["rails.raise_exceptions"] *Bryan Helmkamp*
+
+*   Fixed that TestResponse.cookies was returning cookies unescaped #1867 *Doug McInnes*
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+*   Fixed that redirection would just log the options, not the final url (which lead to "Redirected to #<Post:0x23150b8>") *DHH*
+
+*   Don't check authenticity tokens for any AJAX requests *Ross Kaffenberger/Bryan Helmkamp*
+
+*   Added ability to pass in :public => true to fresh_when, stale?, and expires_in to make the request proxy cachable #2095 *Gregg Pollack*
+
+*   Fixed that passing a custom form builder would be forwarded to nested fields_for calls #2023 *Eloy Duran/Nate Wiger*
+
+*   Form option helpers now support disabled option tags and the use of lambdas for selecting/disabling option tags from collections #837 *Tekin*
+
+*   Added partial scoping to TranslationHelper#translate, so if you call translate(".foo") from the people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo") *DHH*
+
+*   Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters #1385, #1868 *chris finne/Andrew White*
+
+*   Added localized rescue template when I18n.locale is set (ex: public/404.da.html) #1835 *José Valim*
+
+*   Make the form_for and fields_for helpers support the new Active Record nested update options.  #1202 *Eloy Duran*
+
+  		<% form_for @person do |person_form| %>
+        ...
+        <% person_form.fields_for :projects do |project_fields| %>
+          <% if project_fields.object.active? %>
+            Name: <%= project_fields.text_field :name %>
+          <% end %>
+        <% end %>
+  		<% end %>
+
+
+*   Added grouped_options_for_select helper method for wrapping option tags in optgroups. #977 *Jon Crawford*
+
+*   Implement HTTP Digest authentication. #1230 [Gregg Kellogg, Pratik Naik] Example :
+
+    class DummyDigestController < ActionController::Base
+        USERS = { "lifo" => 'world' }
+
+        before_filter :authenticate
+
+        def index
+          render :text => "Hello Secret"
+        end
+
+        private
+
+        def authenticate
+          authenticate_or_request_with_http_digest("Super Secret") do |username|
+            # Return the user's password
+            USERS[username]
+          end
+        end
+    end
+
+*   Improved i18n support for the number_to_human_size helper. Changes the storage_units translation data; update your translations accordingly.  #1634 *Yaroslav Markin*
+        storage_units:
+          # %u is the storage unit, %n is the number (default: 2 MB)
+          format: "%n %u"
+          units:
+            byte:
+              one: "Byte"
+              other: "Bytes"
+            kb: "KB"
+            mb: "MB"
+            gb: "GB"
+            tb: "TB"
+
+*   Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use *DHH*
+
+*   Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string #1299 *DHH*
+
+*   Make ActionController#render(string) work as a shortcut for render :file/:template/:action => string. [#1435] [Pratik Naik] Examples:
+
+    \# Instead of render(:action => 'other_action')
+    render('other_action') # argument has no '/'
+    render(:other_action)
+
+    \# Instead of render(:template => 'controller/action')
+    render('controller/action') # argument must not begin with a '/', but contain a '/'
+
+    \# Instead of render(:file => '/Users/lifo/home.html.erb')
+    render('/Users/lifo/home.html.erb') # argument must begin with a '/'
+
+*   Add :prompt option to date/time select helpers. #561 *Sam Oliver*
+
+*   Fixed that send_file shouldn't set an etag #1578 *Hongli Lai*
+
+*   Allow users to opt out of the spoofing checks in Request#remote_ip.  Useful for sites whose traffic regularly triggers false positives. *Darren Boyd*
+
+*   Deprecated formatted_polymorphic_url.  *Jeremy Kemper*
+
+*   Added the option to declare an asset_host as an object that responds to call (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) *David Heinemeier Hansson*
+
+*   Added support for multiple routes.rb files (useful for plugin engines). This also means that draw will no longer clear the route set, you have to do that by hand (shouldn't make a difference to you unless you're doing some funky stuff) *David Heinemeier Hansson*
+
+*   Dropped formatted_* routes in favor of just passing in :format as an option. This cuts resource routes generation in half #1359 *aaronbatalion*
+
+*   Remove support for old double-encoded cookies from the cookie store.  These values haven't been generated since before 2.1.0, and any users who have visited the app in the intervening 6 months will have had their cookie upgraded. *Michael Koziarski*
+
+*   Allow helpers directory to be overridden via ActionController::Base.helpers_dir #1424 *Sam Pohlenz*
+
+*   Remove deprecated ActionController::Base#assign_default_content_type_and_charset
+
+*   Changed the default of ActionView#render to assume partials instead of files when not given an options hash [David Heinemeier Hansson]. Examples:
+
+        # Instead of <%= render :partial => "account" %>
+        <%= render "account" %>
+
+        # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
+        <%= render "account", :account => @buyer %>
+
+        # @account is an Account instance, so it uses the RecordIdentifier to replace
+        # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
+        <%= render(@account) %>
+
+        # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+        # <%= render :partial => "posts/post", :collection => @posts %>
+        <%= render(@posts) %>
+
+*   Remove deprecated render_component. Please use the plugin from http://github.com/rails/render_component/tree/master *Pratik Naik*
+
+*   Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that they're available if you want to use textilize and markdown and let autoload require them *David Heinemeier Hansson*
+
+
+## 2.2.2 (November 21st, 2008) ##
+
+*   I18n: translate number_to_human_size. Add storage_units: [Bytes, KB, MB, GB, TB] to your translations.  #1448 *Yaroslav Markin*
+
+*   Restore backwards compatible functionality for setting relative_url_root.  Include deprecation
+
+*   Switched the CSRF module to use the request content type to decide if the request is forgeable.  #1145 *Jeff Cohen*
+
+*   Added :only and :except to map.resources to let people cut down on the number of redundant routes in an application. Typically only useful for huge routesets.  #1215 *Tom Stuart*
+
+     map.resources :products, :only => :show do |product|
+         product.resources :images, :except => :destroy
+     end
+
+*   Added render :js for people who want to render inline JavaScript replies without using RJS *David Heinemeier Hansson*
+
+*   Fixed that polymorphic_url should compact given array #1317 *hiroshi*
+
+*   Fixed the sanitize helper to avoid double escaping already properly escaped entities #683 *antonmos/Ryan McGeary*
+
+*   Fixed that FormTagHelper generated illegal html if name contained square brackets #1238 *Vladimir Dobriakov*
+
+*   Fix regression bug that made date_select and datetime_select raise a Null Pointer Exception when a nil date/datetime was passed and only month and year were displayed #1289 *Bernardo Padua/Tor Erik*
+
+*   Simplified the logging format for parameters (don't include controller, action, and format as duplicates) *David Heinemeier Hansson*
+
+*   Remove the logging of the Session ID when the session store is CookieStore *David Heinemeier Hansson*
+
+*   Fixed regex in redirect_to to fully support URI schemes #1247 *Seth Fitzsimmons*
+
+*   Fixed bug with asset timestamping when using relative_url_root #1265 *Joe Goldwasser*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+*   Fix incorrect closing CDATA delimiter and that HTML::Node.parse would blow up on unclosed CDATA sections *packagethief*
+
+*   Added stale? and fresh_when methods to provide a layer of abstraction above request.fresh? and friends [David Heinemeier Hansson]. Example:
+
+        class ArticlesController < ApplicationController
+          def show_with_respond_to_block
+            @article = Article.find(params[:id])
+
+
+            # If the request sends headers that differs from the options provided to stale?, then
+            # the request is indeed stale and the respond_to block is triggered (and the options
+            # to the stale? call is set on the response).
+            #
+            # If the request headers match, then the request is fresh and the respond_to block is
+            # not triggered. Instead the default render will occur, which will check the last-modified
+            # and etag headers and conclude that it only needs to send a "304 Not Modified" instead
+            # of rendering the template.
+            if stale?(:last_modified => @article.published_at.utc, :etag => @article)
+              respond_to do |wants|
+                # normal response processing
+              end
+            end
+          end
+
+          def show_with_implied_render
+            @article = Article.find(params[:id])
+
+            # Sets the response headers and checks them against the request, if the request is stale
+            # (i.e. no match of either etag or last-modified), then the default render of the template happens.
+            # If the request is fresh, then the default render will return a "304 Not Modified"
+            # instead of rendering the template.
+            fresh_when(:last_modified => @article.published_at.utc, :etag => @article)
+          end
+        end
+
+
+*   Added inline builder yield to atom_feed_helper tags where appropriate [Sam Ruby]. Example:
+
+        entry.summary :type => 'xhtml' do |xhtml|
+          xhtml.p pluralize(order.line_items.count, "line item")
+          xhtml.p "Shipped to #{order.address}"
+          xhtml.p "Paid by #{order.pay_type}"
+        end
+
+*   Make PrototypeHelper#submit_to_remote a wrapper around PrototypeHelper#button_to_remote. *Tarmo Tänav*
+
+*   Set HttpOnly for the cookie session store's cookie.  #1046
+
+*   Added FormTagHelper#image_submit_tag confirm option #784 *Alastair Brunton*
+
+*   Fixed FormTagHelper#submit_tag with :disable_with option wouldn't submit the button's value when was clicked #633 *Jose Fernandez*
+
+*   Stopped logging template compiles as it only clogs up the log *David Heinemeier Hansson*
+
+*   Changed the X-Runtime header to report in milliseconds *David Heinemeier Hansson*
+
+*   Changed BenchmarkHelper#benchmark to report in milliseconds *David Heinemeier Hansson*
+
+*   Changed logging format to be millisecond based and skip misleading stats [David Heinemeier Hansson]. Went from:
+
+        Completed in 0.10000 (4 reqs/sec) | Rendering: 0.04000 (40%) | DB: 0.00400 (4%) | 200 OK [http://example.com]
+
+    ...to:
+
+        Completed in 100ms (View: 40, DB: 4) | 200 OK [http://example.com]
+
+*   Add support for shallow nesting of routes. #838 *S. Brent Faulkner*
+
+    Example :
+
+    map.resources :users, :shallow => true do |user|
+        user.resources :posts
+    end
+
+    - GET /users/1/posts (maps to PostsController#index action as usual)
+        named route "user_posts" is added as usual.
+
+    - GET /posts/2 (maps to PostsController#show action as if it were not nested)
+        Additionally, named route "post" is added too.
+
+*   Added button_to_remote helper.  #3641 *Donald Piret, Tarmo Tänav*
+
+*   Deprecate render_component. Please use render_component plugin from http://github.com/rails/render_component/tree/master *Pratik Naik*
+
+*   Routes may be restricted to lists of HTTP methods instead of a single method or :any.  #407 *Brennan Dunn, Gaius Centus Novus*
+        map.resource :posts, :collection => { :search => [:get, :post] }
+        map.session 'session', :requirements => { :method => [:get, :post, :delete] }
+
+*   Deprecated implicit local assignments when rendering partials *Josh Peek*
+
+*   Introduce current_cycle helper method to return the current value without bumping the cycle.  #417 *Ken Collins*
+
+*   Allow polymorphic_url helper to take url options. #880 *Tarmo Tänav*
+
+*   Switched integration test runner to use Rack processor instead of CGI *Josh Peek*
+
+*   Made AbstractRequest.if_modified_sense return nil if the header could not be parsed *Jamis Buck*
+
+*   Added back ActionController::Base.allow_concurrency flag *Josh Peek*
+
+*   AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root *Josh Peek*
+
+*   Update Prototype to 1.6.0.2 #599 *Patrick Joyce*
+
+*   Conditional GET utility methods.  *Jeremy Kemper*
+        response.last_modified = @post.updated_at
+        response.etag = [:admin, @post, current_user]
+
+        if request.fresh?(response)
+          head :not_modified
+        else
+          # render ...
+        end
+
+*   All 2xx requests are considered successful *Josh Peek*
+
+*   Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host along with the source or per-request proc's won't run *David Heinemeier Hansson*
+
+*   Removed config.action_view.cache_template_loading, use config.cache_classes instead *Josh Peek*
+
+*   Get buffer for fragment cache from template's @output_buffer *Josh Peek*
+
+*   Set config.action_view.warn_cache_misses = true to receive a warning if you perform an action that results in an expensive disk operation that could be cached *Josh Peek*
+
+*   Refactor template preloading. New abstractions include Renderable mixins and a refactored Template class *Josh Peek*
+
+*   Changed ActionView::TemplateHandler#render API method signature to render(template, local_assigns = {}) *Josh Peek*
+
+*   Changed PrototypeHelper#submit_to_remote to PrototypeHelper#button_to_remote to stay consistent with link_to_remote (submit_to_remote still works as an alias) #8994 *clemens*
+
+*   Add :recursive option to javascript_include_tag and stylesheet_link_tag to be used along with :all. #480 *Damian Janowski*
+
+*   Allow users to disable the use of the Accept header *Michael Koziarski*
+
+        The accept header is poorly implemented by browsers and causes strange
+    errors when used on public sites where crawlers make requests too.  You    can use formatted urls (e.g. /people/1.xml) to support API clients in a    much simpler way.
+    To disable the header you need to set:
+    config.action_controller.use_accept_header = false
+*   Do not stat template files in production mode before rendering. You will no longer be able to modify templates in production mode without restarting the server *Josh Peek*
+
+*   Deprecated TemplateHandler line offset *Josh Peek*
+
+*   Allow caches_action to accept cache store options. #416. [José Valim]. Example:
+
+    caches_action :index, :redirected, :if => Proc.new { |c| !c.request.format.json? }, :expires_in => 1.hour
+
+*   Remove define_javascript_functions, javascript_include_tag and friends are far superior. *Michael Koziarski*
+
+*   Deprecate :use_full_path render option. The supplying the option no longer has an effect *Josh Peek*
+
+*   Add :as option to render a collection of partials with a custom local variable name. #509 *Simon Jefford, Pratik Naik*
+
+    render :partial => 'other_people', :collection => @people, :as => :person
+
+    This will let you access objects of @people as 'person' local variable inside 'other_people' partial template.
+
+*   time_zone_select: support for regexp matching of priority zones. Resolves #195 *Ernie Miller*
+
+*   Made ActionView::Base#render_file private *Josh Peek*
+
+*   Refactor and simplify the implementation of assert_redirected_to.  Arguments are now normalised relative to the controller being tested,  not the root of the application.  *Michael Koziarski*
+
+    This could cause some erroneous test failures if you were redirecting between controllers
+    in different namespaces and wrote your assertions relative to the root of the application.
+
+*   Remove follow_redirect from controller functional tests.
+
+    If you want to follow redirects you can use integration tests.  The functional test    version was only useful if you were using redirect_to :id=>...
+*   Fix polymorphic_url with singleton resources.  #461 *Tammer Saleh*
+
+*   Replaced TemplateFinder abstraction with ViewLoadPaths *Josh Peek*
+
+*   Added block-call style to link_to [Sam Stephenson/David Heinemeier Hansson]. Example:
+
+        <% link_to(@profile) do %>
+          <strong><%= @profile.name %></strong> -- <span>Check it out!!</span>
+        <% end %>
+
+*   Performance: integration test benchmarking and profiling.  *Jeremy Kemper*
+
+*   Make caching more aware of mime types. Ensure request format is not considered while expiring cache.  *Jonathan del Strother*
+
+*   Drop ActionController::Base.allow_concurrency flag *Josh Peek*
+
+*   More efficient concat and capture helpers. Remove ActionView::Base.erb_variable.  *Jeremy Kemper*
+
+*   Added page.reload functionality. Resolves #277. *Sean Huber*
+
+*   Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_FORWARDED_FOR doesn't match (not just if they're both present) *Mark Imbriaco, Bradford Folkens*
+
+*   Allow caches_action to accept a layout option *José Valim*
+
+*   Added Rack processor *Ezra Zygmuntowicz, Josh Peek*
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+*   InstanceTag#default_time_from_options overflows to DateTime *Geoff Buesing*
+
+*   Fixed that forgery protection can be used without session tracking (Peter Jones) *#139*
+
+*   Added session(:on) to turn session management back on in a controller subclass if the superclass turned it off (Peter Jones) *#136*
+
+*   Change the request forgery protection to go by Content-Type instead of request.format so that you can't bypass it by POSTing to "#{request.uri}.xml" *Rick Olson*
+*   InstanceTag#default_time_from_options with hash args uses Time.current as default; respects hash settings when time falls in system local spring DST gap *Geoff Buesing*
+
+*   select_date defaults to Time.zone.today when config.time_zone is set *Geoff Buesing*
+
+*   Fixed that TextHelper#text_field would corrypt when raw HTML was used as the value (mchenryc, Kevin Glowacz) *#80*
+
+*   Added ActionController::TestCase#rescue_action_in_public! to control whether the action under test should use the regular rescue_action path instead of simply raising the exception inline (great for error testing) *David Heinemeier Hansson*
+
+*   Reduce number of instance variables being copied from controller to view. *Pratik Naik*
+
+*   select_datetime and select_time default to Time.zone.now when config.time_zone is set *Geoff Buesing*
+
+*   datetime_select defaults to Time.zone.now when config.time_zone is set *Geoff Buesing*
+
+*   Remove ActionController::Base#view_controller_internals flag. *Pratik Naik*
+
+*   Add conditional options to caches_page method. *Paul Horsfall*
+
+*   Move missing template logic to ActionView. *Pratik Naik*
+
+*   Introduce ActionView::InlineTemplate class. *Pratik Naik*
+
+*   Automatically parse posted JSON content for Mime::JSON requests.  *Rick Olson*
+
+    POST /posts
+    {"post": {"title": "Breaking News"}}
+
+    def create
+        @post = Post.create params[:post]
+        # ...
+    end
+
+*   add json_escape ERB util to escape html entities in json strings that are output in HTML pages. *Rick Olson*
+
+*   Provide a helper proxy to access helper methods from outside views. Closes #10839 *Josh Peek*
+    e.g. ApplicationController.helpers.simple_format(text)
+
+*   Improve documentation. *Xavier Noria, leethal, jerome*
+
+*   Ensure RJS redirect_to doesn't html-escapes string argument. Closes #8546 *Josh Peek, eventualbuddha, Pratik Naik*
+
+*   Support render :partial => collection of heterogeneous elements.  #11491 *Zach Dennis*
+
+*   Avoid remote_ip spoofing.  *Brian Candler*
+
+*   Added support for regexp flags like ignoring case in the :requirements part of routes declarations #11421 *NeilW*
+
+*   Fixed that ActionController::Base#read_multipart would fail if boundary was exactly 10240 bytes #10886 *ariejan*
+
+*   Fixed HTML::Tokenizer (used in sanitize helper) didn't handle unclosed CDATA tags #10071 *esad, packagethief*
+
+*   Improve documentation. *Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert*
+
+*   Fixed that FormHelper#radio_button would produce invalid ids #11298 *harlancrystal*
+
+*   Added :confirm option to submit_tag #11415 *Emilio Tagua*
+
+*   Fixed NumberHelper#number_with_precision to properly round in a way that works equally on Mac, Windows, Linux (closes #11409, #8275, #10090, #8027) *zhangyuanyi*
+
+*   Allow the #simple_format text_helper to take an html_options hash for each paragraph.  #2448 *François Beausoleil, Chris O'Sullivan*
+
+*   Fix regression from filter refactoring where re-adding a skipped filter resulted in it being called twice.  *Rick Olson*
+
+*   Refactor filters to use Active Support callbacks.  #11235 *Josh Peek*
+
+*   Fixed that polymorphic routes would modify the input array #11363 *thomas.lee*
+
+*   Added :format option to NumberHelper#number_to_currency to enable better localization support #11149 *lylo*
+
+*   Fixed that TextHelper#excerpt would include one character too many #11268 *Irfy*
+
+*   Fix more obscure nested parameter hash parsing bug.  #10797 *thomas.lee*
+
+*   Added ActionView::Helpers::register_javascript/stylesheet_expansion to make it easier for plugin developers to inject multiple assets.  #10350 *lotswholetime*
+
+*   Fix nested parameter hash parsing bug.  #10797 *thomas.lee*
+
+*   Allow using named routes in ActionController::TestCase before any request has been made. Closes #11273 *Eloy Duran*
+
+*   Fixed that sweepers defined by cache_sweeper will be added regardless of the perform_caching setting. Instead, control whether the sweeper should be run with the perform_caching setting. This makes testing easier when you want to turn perform_caching on/off *David Heinemeier Hansson*
+
+*   Make MimeResponds::Responder#any work without explicit types. Closes #11140 *jaw6*
+
+*   Better error message for type conflicts when parsing params.  Closes #7962 *spicycode, matt*
+
+*   Remove unused ActionController::Base.template_class. Closes #10787 *Pratik Naik*
+
+*   Moved template handlers related code from ActionView::Base to ActionView::Template. *Pratik Naik*
+
+*   Tests for div_for and content_tag_for helpers. Closes #11223 *Chris O'Sullivan*
+
+*   Allow file uploads in Integration Tests.  Closes #11091 *RubyRedRick*
+
+*   Refactor partial rendering into a PartialTemplate class. *Pratik Naik*
+
+*   Added that requests with JavaScript as the priority mime type in the accept header and no format extension in the parameters will be treated as though their format was :js when it comes to determining which template to render. This makes it possible for JS requests to automatically render action.js.rjs files without an explicit respond_to block  *David Heinemeier Hansson*
+
+*   Tests for distance_of_time_in_words with TimeWithZone instances. Closes #10914 *Ernesto Jimenez*
+
+*   Remove support for multivalued (e.g., '&'-delimited) cookies. *Jamis Buck*
+
+*   Fix problem with render :partial collections, records, and locals. #11057 *lotswholetime*
+
+*   Added support for naming concrete classes in sweeper declarations *David Heinemeier Hansson*
+
+*   Remove ERB trim variables from trace template in case ActionView::Base.erb_trim_mode is changed in the application.  #10098 *Tim Pope, Chris Kampmeier*
+
+*   Fix typo in form_helper documentation.  #10650 *Xavier Shay, Chris Kampmeier*
+
+*   Fix bug with setting Request#format= after the getter has cached the value.  #10889 *cch1*
+
+*   Correct inconsistencies in RequestForgeryProtection docs.  #11032 *Mislav Marohnić*
+
+*   Introduce a Template class to ActionView.  #11024 *Pratik Naik*
+
+*   Introduce the :index option for form_for and fields_for to simplify multi-model forms (see http://railscasts.com/episodes/75).  #9883 *rmm5t*
+
+*   Introduce map.resources :cards, :as => 'tarjetas' to use a custom resource name in the URL: cards_path == '/tarjetas'.  #10578 *blj*
+
+*   TestSession supports indifferent access.  #7372 *tamc, Arsen7, mhackett, julik, jean.helou*
+
+*   Make assert_routing aware of the HTTP method used.  #8039 *mpalmer*
+    e.g. assert_routing({ :method => 'put', :path => '/product/321' }, { :controller => "product", :action => "update", :id => "321" })
+
+*   Make map.root accept a single symbol as an argument to declare an alias.  #10818 *bscofield*
+
+    e.g.  map.dashboard '/dashboard', :controller=>'dashboard'
+            map.root      :dashboard
+
+*   Handle corner case with image_tag when passed 'messed up' image names. #9018 *Duncan Beevers, mpalmer*
+
+*   Add label_tag helper for generating elements. #10802 *DefV*
+
+*   Introduce TemplateFinder to handle view paths and lookups.  #10800 *Pratik Naik*
+
+*   Performance: optimize route recognition. Large speedup for apps with many resource routes.  #10835 *oleganza*
+
+*   Make render :partial recognise form builders and use the _form partial.  #10814 *Damian Janowski*
+
+*   Allow users to declare other namespaces when using the atom feed helpers. #10304 *david.calavera*
+
+*   Introduce send_file :x_sendfile => true to send an X-Sendfile response header.  *Jeremy Kemper*
+
+*   Fixed ActionView::Helpers::ActiveRecordHelper::form for when protect_from_forgery is used #10739 *Jeremy Evans*
+
+*   Provide nicer access to HTTP Headers.  Instead of request.env["HTTP_REFERRER"] you can now use request.headers["Referrer"]. *Michael Koziarski*
+
+*   UrlWriter respects relative_url_root.  #10748 *Cheah Chu Yeow*
+
+*   The asset_host block takes the controller request as an optional second argument. Example: use a single asset host for SSL requests.  #10549 *Cheah Chu Yeow, Peter B, Tom Taylor*
+
+*   Support render :text => nil.  #6684 *tjennings, PotatoSalad, Cheah Chu Yeow*
+
+*   assert_response failures include the exception message.  #10688 *Seth Rasmussen*
+
+*   All fragment cache keys are now by default prefixed with the "views/" namespace *David Heinemeier Hansson*
+
+*   Moved the caching stores from ActionController::Caching::Fragments::* to ActiveSupport::Cache::*. If you're explicitly referring to a store, like ActionController::Caching::Fragments::MemoryStore, you need to update that reference with ActiveSupport::Cache::MemoryStore *David Heinemeier Hansson*
+
+*   Deprecated ActionController::Base.fragment_cache_store for ActionController::Base.cache_store *David Heinemeier Hansson*
+
+*   Made fragment caching in views work for rjs and builder as well #6642 *Dee Zsombor*
+
+*   Fixed rendering of partials with layout when done from site layout #9209 *antramm*
+
+*   Fix atom_feed_helper to comply with the atom spec.  Closes #10672 *Xavier Shay*
+
+    * The tags created do not contain a date (http://feedvalidator.org/docs/error/InvalidTAG.html)
+    * IDs are not guaranteed unique
+    * A default self link was not provided, contrary to the documentation
+    * NOTE:  This changes tags for existing atom entries, but at least they validate now.
+
+*   Correct indentation in tests.  Closes #10671 *Luca Guidi*
+
+*   Fix that auto_link looks for ='s in url paths (Amazon urls have them).  Closes #10640 *Brad Greenlee*
+
+*   Ensure that test case setup is run even if overridden.  #10382 *Josh Peek*
+
+*   Fix HTML Sanitizer to allow trailing spaces in CSS style attributes.  Closes #10566 *wesley.moxam*
+
+*   Add :default option to time_zone_select.  #10590 *Matt Aimonetti*
+
+
+## 2.0.2 (December 16th, 2007) ##
+
+*   Added delete_via_redirect and put_via_redirect to integration testing #10497 *philodespotos*
+
+*   Allow headers['Accept'] to be set by hand when calling xml_http_request #10461 *BMorearty*
+
+*   Added OPTIONS to list of default accepted HTTP methods #10449 *holoway*
+
+*   Added option to pass proc to ActionController::Base.asset_host for maximum configurability #10521 [Cheah Chu Yeow]. Example:
+
+        ActionController::Base.asset_host = Proc.new { |source|
+          if source.starts_with?('/images')
+            "http://images.example.com"
+          else
+            "http://assets.example.com"
+          end
+        }
+
+*   Fixed that ActionView#file_exists? would be incorrect if @first_render is set #10569 *dbussink*
+
+*   Added that Array#to_param calls to_param on all it's elements #10473 *brandon*
+
+*   Ensure asset cache directories are automatically created.  #10337 *Josh Peek, Cheah Chu Yeow*
+
+*   render :xml and :json preserve custom content types.  #10388 *jmettraux, Cheah Chu Yeow*
+
+*   Refactor Action View template handlers.  #10437, #10455 *Josh Peek*
+
+*   Fix DoubleRenderError message and leave out mention of returning false from filters.  Closes #10380 *Frederick Cheung*
+
+*   Clean up some cruft around ActionController::Base#head.  Closes #10417 *ssoroka*
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+*   Fixed send_file/binary_content for testing #8044 *tolsen*
+
+*   When a NonInferrableControllerError is raised, make the proposed fix clearer in the error message. Closes #10199 *Jack Danger Canty*
+
+*   Update Prototype to 1.6.0.1.  *sam*
+
+*   Update script.aculo.us to 1.8.0.1.  *madrobby*
+
+*   Add 'disabled' attribute to <OPTION> separators used in time zone and country selects.  Closes #10354 *Josh Susser*
+
+*   Added the same record identification guessing rules to fields_for as form_for has *David Heinemeier Hansson*
+
+*   Fixed that verification violations with no specified action didn't halt the chain (now they do with a 400 Bad Request) *David Heinemeier Hansson*
+
+*   Raise UnknownHttpMethod exception for unknown HTTP methods. Closes #10303 *Tarmo Tänav*
+
+*   Update to Prototype -r8232.  *sam*
+
+*   Make sure the optimisation code for routes doesn't get used if :host, :anchor or :port are provided in the hash arguments. [pager, Michael Koziarski] #10292
+
+*   Added protection from trailing slashes on page caching #10229 *devrieda*
+
+*   Asset timestamps are appended, not prepended. Closes #10276 *Mike Naberezny*
+
+*   Minor inconsistency in description of render example. Closes #10029 *ScottSchram*
+
+*   Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods.  *Rick Olson*
+
+*   Refactor sanitizer helpers into HTML classes and make it easy to swap them out with custom implementations.  Closes #10129.  *Rick Olson*
+
+*   Add deprecation for old subtemplate syntax for ActionMailer templates, use render :partial *Rick Olson*
+
+*   Fix TemplateError so it doesn't bomb on exceptions while running tests *Rick Olson*
+
+*   Fixed that named routes living under resources shouldn't have double slashes #10198 *Isaac Feliu*
+
+*   Make sure that cookie sessions use a secret that is at least 30 chars in length. *Michael Koziarski*
+
+*   Fixed that partial rendering should look at the type of the first render to determine its own type if no other clues are available (like when using text.plain.erb as the extension in AM) #10130 *java*
+
+*   Fixed that has_many :through associations should render as collections too #9051 *mathie/Jack Danger Canty*
+
+*   Added :mouseover short-cut to AssetTagHelper#image_tag for doing easy image swaps #6893 *joost*
+
+*   Fixed handling of non-domain hosts #9479 *purp*
+
+*   Fix syntax error in documentation example for cycle method. Closes #8735 *foca*
+
+*   Document :with option for link_to_remote. Closes #8765 *Ryan Bates*
+
+*   Document :minute_step option for time_select. Closes #8814 *brupm*
+
+*   Explain how to use the :href option for link_to_remote to degrade gracefully in the absence of JavaScript. Closes #8911 *vlad*
+
+*   Disambiguate :size option for text area tag. Closes #8955 *redbeard*
+
+*   Fix broken tag in assert_tag documentation. Closes #9037 *mfazekas*
+
+*   Add documentation for route conditions. Closes #9041 *innu, Manfred Stienstra*
+
+*   Fix typo left over from previous typo fix in url helper. Closes #9414 *Henrik N*
+
+*   Fixed that ActionController::CgiRequest#host_with_port() should handle standard port #10082 *moro*
+
+*   Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.  *sam, madrobby*
+
+*   Expose the cookie jar as a helper method (before the view would just get the raw cookie hash) *David Heinemeier Hansson*
+
+*   Integration tests: get_ and post_via_redirect take a headers hash.  #9130 *simonjefford*
+
+*   Simplfy #view_paths implementation.  ActionView templates get the exact object, not a dup.  *Rick Olson*
+
+*   Update tests for ActiveSupport's JSON escaping change.  *Rick Olson*
+
+*   FormHelper's auto_index should use #to_param instead of #id_before_type_cast.  Closes #9994 *mattly*
+
+*   Doc typo fixes for ActiveRecordHelper. Closes #9973 *mikong*
+
+*   Make example parameters in restful routing docs idiomatic. Closes #9993 *Jack Danger Canty*
+
+*   Make documentation comment for mime responders match documentation example.  Closes #9357 *yon*
+
+*   Introduce a new test case class for functional tests.  ActionController::TestCase. *Michael Koziarski*
+
+*   Fix incorrect path in helper rdoc. Closes #9926 *viktor tron*
+
+*   Partials also set 'object' to the default partial variable.  #8823 *Nick Retallack, Jeremy Kemper*
+
+*   Request profiler.  *Jeremy Kemper*
+        $ cat login_session.rb
+        get_with_redirect '/'
+        say "GET / => #{path}"
+        post_with_redirect '/sessions', :username => 'john', :password => 'doe'
+        say "POST /sessions => #{path}"
+        $ ./script/performance/request -n 10 login_session.rb
+
+*   Disabled checkboxes don't submit a form value.  #9301 *vladr, robinjfisher*
+
+*   Added tests for options to ActiveRecordHelper#form. Closes #7213 *richcollins, mikong, Mislav Marohnić*
+
+*   Changed before_filter halting to happen automatically on render or redirect but no longer on simply returning false *David Heinemeier Hansson*
+
+*   Ensure that cookies handle array values correctly.  Closes #9937 *queso*
+
+*   Make sure resource routes don't clash with internal helpers like javascript_path, image_path etc.  #9928 *Geoff Buesing*
+
+*   caches_page uses a single after_filter instead of one per action.  #9891 *Pratik Naik*
+
+*   Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0.  *sam, madrobby*
+
+*   Dispatcher: fix that to_prepare should only run once in production.  #9889 *Nathaniel Talbott*
+
+*   Memcached sessions: add session data on initialization; don't silently discard exceptions; add unit tests.  #9823 *kamk*
+
+*   error_messages_for also takes :message and :header_message options which defaults to the old "There were problems with the following fields:" and "<count> errors prohibited this <object_name> from being saved".  #8270 *rmm5t, zach-inglis-lt3*
+
+*   Make sure that custom inflections are picked up by map.resources.  #9815 *Mislav Marohnić*
+
+*   Changed SanitizeHelper#sanitize to only allow the custom attributes and tags when specified in the call *David Heinemeier Hansson*
+
+*   Extracted sanitization methods from TextHelper to SanitizeHelper *David Heinemeier Hansson*
+
+*   rescue_from accepts :with => lambda { |exception| ... } or a normal block.  #9827 *Pratik Naik*
+
+*   Add :status to redirect_to allowing users to choose their own response code without manually setting headers. #8297 *Coda Hale, chasgrundy*
+
+*   Add link_to :back which uses your referrer with a fallback to a javascript link. #7366 *eventualbuddha, Tarmo Tänav*
+
+*   error_messages_for and friends also work with local variables.  #9699 *Frederick Cheung*
+
+*   Fix url_for, redirect_to, etc. with :controller => :symbol instead of 'string'.  #8562, #9525 *Justin Lynn, Tarmo Tänav, shoe*
+
+*   Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores.  Closes #8662. *Rick Olson*
+
+*   Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes.  Now you can set it in the config. *Rick Olson*
+
+    config.action_controller.optimise_named_routes = false
+
+*   ActionController::Routing::DynamicSegment#interpolation_chunk should call #to_s on all values before calling URI.escape.  *Rick Olson*
+
+*   Only accept session ids from cookies, prevents session fixation attacks.  *bradediger*
+
+
+## 2.0.0 Preview Release (September 29th, 2007) Includes duplicates of changes from 1.12.2 - 1.13.3 ##
+
+*   Fixed that render template did not honor exempt_from_layout #9698 *pezra*
+
+*   Better error messages if you leave out the :secret option for request forgery protection.  Closes #9670 *Rick Olson*
+
+*   Allow ability to disable request forgery protection, disable it in test mode by default.  Closes #9693 *Pratik Naik*
+
+*   Avoid calling is_missing on LoadErrors. Closes #7460. *ntalbott*
+
+*   Move Railties' Dispatcher to ActionController::Dispatcher, introduce before_ and after_dispatch callbacks, and warm up to non-CGI requests.  *Jeremy Kemper*
+
+*   The tag helper may bypass escaping.  *Jeremy Kemper*
+
+*   Cache asset ids.  *Jeremy Kemper*
+
+*   Optimized named routes respect AbstractRequest.relative_url_root.  #9612 *Daniel Morrison, Jeremy Kemper*
+
+*   Introduce ActionController::Base.rescue_from to declare exception-handling methods. Cleaner style than the case-heavy rescue_action_in_public.  #9449 *Norbert Crombach*
+
+*   Rename some RequestForgeryProtection methods.  The class method is now #protect_from_forgery, and the default parameter is now 'authenticity_token'.  *Rick Olson*
+
+*   Merge csrf_killer plugin into rails.  Adds RequestForgeryProtection model that verifies session-specific _tokens for non-GET requests.  *Rick Olson*
+
+*   Secure #sanitize, #strip_tags, and #strip_links helpers against xss attacks.  Closes #8877. *Rick Olson, Pratik Naik, Jacques Distler*
+
+    This merges and renames the popular white_list helper (along with some css sanitizing from Jacques Distler version of the same plugin).
+    Also applied updated versions of #strip_tags and #strip_links from #8877.
+
+*   Remove use of & logic operator. Closes #8114. *watson*
+
+*   Fixed JavaScriptHelper#escape_javascript to also escape closing tags #8023 *Ruy Asan*
+
+*   Fixed TextHelper#word_wrap for multiline strings with extra carrier returns #8663 *seth*
+
+*   Fixed that setting the :host option in url_for would automatically turn off :only_path (since :host would otherwise not be shown) #9586 *Bounga*
+
+*   Added FormHelper#label.  #8641, #9850 *jcoglan, Jarkko Laine*
+
+*   Added AtomFeedHelper (slightly improved from the atom_feed_helper plugin) *David Heinemeier Hansson*
+
+*   Prevent errors when generating routes for uncountable resources, (i.e. sheep where plural == singluar).   map.resources :sheep now creates sheep_index_url for the collection and sheep_url for the specific item.  *Michael Koziarski*
+
+*   Added support for HTTP Only cookies (works in IE6+ and FF 2.0.5+) as an improvement for XSS attacks #8895 *Pratik Naik, Mark Somerville*
+
+*   Don't warn when a path segment precedes a required segment. Closes #9615. *Nicholas Seckar*
+
+*   Fixed CaptureHelper#content_for to work with the optional content parameter instead of just the block #9434 [sandofsky/wildchild].
+
+*   Added Mime::Type.register_alias for dealing with different formats using the same mime type [David Heinemeier Hansson]. Example:
+
+        class PostsController < ApplicationController
+          before_filter :adjust_format_for_iphone
+
+          def index
+            @posts = Post.find(:all)
+
+            respond_to do |format|
+              format.html   # => renders index.html.erb and uses "text/html" as the content type
+              format.iphone # => renders index.iphone.erb and uses "text/html" as the content type
+            end
+          end
+
+
+          private
+            def adjust_format_for_iphone
+              if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/iPhone/]
+                request.format = :iphone
+              end
+            end
+        end
+
+*   Added that render :json will automatically call .to_json unless it's being passed a string [David Heinemeier Hansson].
+
+*   Autolink behaves well with emails embedded in URLs.  #7313 *Jeremy McAnally, Tarmo Tänav*
+
+*   Fixed that default layouts did not take the format into account #9564 *Pratik Naik*
+
+*   Fixed optimized route segment escaping.  #9562 *wildchild, Jeremy Kemper*
+
+*   Added block acceptance to JavaScriptHelper#javascript_tag.  #7527 *Bob Silva, Tarmo Tänav, rmm5t*
+
+*   root_path returns '/' not ''.  #9563 *Pratik Naik*
+
+*   Fixed that setting request.format should also affect respond_to blocks *David Heinemeier Hansson*
+
+*   Add option to force binary mode on tempfile used for fixture_file_upload.  #6380 *Jonathan Viney*
+
+*   Fixed that resource namespaces wouldn't stick to all nested resources #9399 *pixeltrix*
+
+*   Moved ActionController::Macros::AutoComplete into the auto_complete plugin on the official Rails svn.  #9512 *Pratik Naik*
+
+*   Moved ActionController::Macros::InPlaceEditing into the in_place_editor plugin on the official Rails svn.  #9513 *Pratik Naik*
+
+*   Removed deprecated form of calling xml_http_request/xhr without the first argument being the http verb *David Heinemeier Hansson*
+
+*   Removed deprecated methods [David Heinemeier Hansson]:
+
+    - ActionController::Base#keep_flash (use flash.keep instead)
+    - ActionController::Base#expire_matched_fragments (just call expire_fragment with a regular expression)
+    - ActionController::Base.template_root/= methods (use ActionController#Base.view_paths/= instead)
+    - ActionController::Base.cookie (use ActionController#Base.cookies[]= instead)
+
+*   Removed the deprecated behavior of appending ".png" to image_tag/image_path calls without an existing extension *David Heinemeier Hansson*
+
+*   Removed ActionController::Base.scaffold -- it went through the whole idea of scaffolding (card board walls you remove and tweak one by one). Use the scaffold generator instead (it does resources too now!) *David Heinemeier Hansson*
+
+*   Optimise named route generation when using positional arguments.  *Michael Koziarski*
+
+    This change delivers significant performance benefits for the most
+    common usage scenarios for modern rails applications by avoiding the
+    costly trip through url_for.  Initial benchmarks indicate this is
+    between 6 and 20 times as fast.
+
+*   Explicitly require active_record/query_cache before using it.  *Jeremy Kemper*
+
+*   Fix layout overriding response status.  #9476 *lotswholetime*
+
+*   Add field_set_tag for generating field_sets, closes #9477. *Damian Janowski*
+
+*   Allow additional parameters to be passed to named route helpers when using positional arguments.  Closes #8930 *Ian White*
+
+*   Make render :partial work with a :collection of Hashes, previously this wasn't possible due to backwards compatibility restrictions.  *Pratik Naik*
+
+*   request.host works with IPv6 addresses.  #9458 *yuya*
+
+*   Fix bug where action caching sets the content type to the ActionCachePath object.  Closes #9282 *mindforge*
+
+*   Find layouts even if they're not in the first view_paths directory.  Closes #9258 *caio*
+
+*   Major improvement to the documentation for the options / select form helpers. Closes #9038 *Chris Kampmeier, jardeon, wesg*
+
+*   Fix number_to_human_size when using different precisions. Closes #7536. *RichardStrand, mpalmer*
+
+*   Added partial layouts (see example in action_view/lib/partials.rb) *David Heinemeier Hansson*
+
+*   Allow you to set custom :conditions on resource routes.  *Rick Olson*
+
+*   Fixed that file.content_type for uploaded files would include a trailing \r #9053 *Brad Greenlee*
+
+*   url_for now accepts a series of symbols representing the namespace of the record *Josh Knowles*
+
+*   Make :trailing_slash work with query parameters for url_for. Closes #4004 *nov*
+
+*   Make sure missing template exceptions actually say which template they were looking for.  Closes #8683 *dasil003*
+
+*   Fix errors with around_filters which do not yield, restore 1.1 behaviour with after filters. Closes #8891 *Stefan Kaes*
+
+    After filters will *no longer* be run if an around_filter fails to yield, users relying on
+    this behaviour are advised to put the code in question after a yield statement in an around filter.
+
+
+*   Allow you to delete cookies with options. Closes #3685 *Josh Peek, Chris Wanstrath*
+
+*   Allow you to render views with periods in the name.  Closes #8076 *Norbert Crombach*
+
+    render :partial => 'show.html.erb'
+
+*   Improve capture helper documentation.  #8796 *Chris Kampmeier*
+
+*   Prefix nested resource named routes with their action name, e.g. new_group_user_path(@group) instead of group_new_user_path(@group). The old nested action named route is deprecated in Rails 1.2.4.  #8558 *David Chelimsky*
+
+*   Allow sweepers to be created solely for expiring after controller actions, not model changes *David Heinemeier Hansson*
+
+*   Added assigns method to ActionController::Caching::Sweeper to easily access instance variables on the controller *David Heinemeier Hansson*
+
+*   Give the legacy X-POST_DATA_FORMAT header greater precedence during params parsing for backward compatibility.  *Jeremy Kemper*
+
+*   Fixed that link_to with an href of # when using :method will not allow for click-through without JavaScript #7037 *Steven Bristol, Josh Peek*
+
+*   Fixed that radio_button_tag should generate unique ids #3353 *Bob Silva, Rebecca, Josh Peek*
+
+*   Fixed that HTTP authentication should work if the header is called REDIRECT_X_HTTP_AUTHORIZATION as well #6754 *Mislav Marohnić*
+
+*   Don't mistakenly interpret the request uri as the query string.  #8731 *Pratik Naik, Jeremy Kemper*
+
+*   Make ActionView#view_paths an attr_accessor for real this time.  Also, don't perform an unnecessary #compact on the @view_paths array in #initialize.  Closes #8582 *dasil003, julik, Rick Olson*
+
+*   Tolerate missing content type on multipart file uploads. Fix for Safari 3.  *Jeremy Kemper*
+
+*   Deprecation: remove pagination. Install the classic_pagination plugin for forward compatibility, or move to the superior will_paginate plugin.  #8157 *Josh Peek*
+
+*   Action caching is limited to GET requests returning 200 OK status.  #3335 *tom@craz8.com, halfbyte, Dan Kubb, Josh Peek*
+
+*   Improve Text Helper test coverage.  #7274 *Rob Sanheim, Josh Peek*
+
+*   Improve helper test coverage.  #7208, #7212, #7215, #7233, #7234, #7235, #7236, #7237, #7238, #7241, #7243, #7244 *Rich Collins, Josh Peek*
+
+*   Improve UrlRewriter tests.  #7207 *Rich Collins*
+
+*   Resources: url_for([parent, child]) generates /parents/1/children/2 for the nested resource. Likewise with the other simply helpful methods like form_for and link_to.  #6432 *mhw, Jonathan Vaught, lotswholetime*
+
+*   Assume html format when rendering partials in RJS. #8076 *Rick Olson*
+
+*   Don't double-escape url_for in views.  #8144 *Rich Collins, Josh Peek*
+
+*   Allow JSON-style values for the :with option of observe_field.  Closes #8557 *kommen*
+
+*   Remove RAILS_ROOT from backtrace paths.  #8540 *Tim Pope*
+
+*   Routing: map.resource :logo routes to LogosController so the controller may be reused for multiple nestings or namespaces.  *Jeremy Kemper*
+
+*   render :partial recognizes Active Record associations as Arrays.  #8538 *Kamal Fariz Mahyuddin*
+
+*   Routing: drop semicolon and comma as route separators.  *Jeremy Kemper*
+
+*   request.remote_ip understands X-Forwarded-For addresses with nonstandard whitespace.  #7386 *moses*
+
+*   Don't prepare response when rendering a component.  #8493 *jsierles*
+
+*   Reduce file stat calls when checking for template changes.  #7736 *alex*
+
+*   Added custom path cache_page/expire_page parameters in addition to the options hashes [David Heinemeier Hansson]. Example:
+
+        def index
+          caches_page(response.body, "/index.html")
+        end
+
+*   Action Caching speedup.  #8231 *Stefan Kaes*
+
+*   Wordsmith resources documentation.  #8484 *marclove*
+
+*   Fix syntax error in code example for routing documentation. #8377. *Norbert Crombach*
+
+*   Routing: respond with 405 Method Not Allowed status when the route path matches but the HTTP method does not.  #6953 *Josh Peek, defeated, Dan Kubb, Coda Hale*
+
+*   Add support for assert_select_rjs with :show and :hide. #7780 *dchelimsky*
+
+*   Make assert_select's failure messages clearer about what failed. #7779 *dchelimsky*
+
+*   Introduce a default respond_to block for custom types.  #8174 *Josh Peek*
+
+*   auto_complete_field takes a :method option so you can GET or POST.  #8120 *zapnap*
+
+*   Added option to suppress :size when using :maxlength for FormTagHelper#text_field #3112 *Tim Pope*
+
+*   catch possible WSOD when trying to render a missing partial. Closes #8454 *Jonathan del Strother*
+
+*   Rewind request body after reading it, if possible.  #8438 *s450r1*
+
+*   Resource namespaces are inherited by their has_many subresources.  #8280 *marclove, Geoff Garside*
+
+*   Fix filtered parameter logging with nil parameter values.  #8422 *choonkeat*
+
+*   Integration tests: alias xhr to xml_http_request and add a request_method argument instead of always using POST.  #7124 *Nik Wakelin, François Beausoleil, Wizard*
+
+*   Document caches_action.  #5419 *Jarkko Laine*
+
+*   Update to Prototype 1.5.1.  *Sam Stephenson*
+
+*   Allow routes to be decalred under namespaces [Tobias Lütke]:
+
+    map.namespace :admin do |admin|
+        admin.root :controller => "products"
+        admin.feed 'feed.xml', :controller => 'products', :action => 'feed', :format => 'xml'
+    end
+
+*   Update to script.aculo.us 1.7.1_beta3.  *Thomas Fuchs*
+
+*   observe_form always sends the serialized form.  #5271 *Manfred Stienstra, normelton@gmail.com*
+
+*   Parse url-encoded and multipart requests ourselves instead of delegating to CGI.  *Jeremy Kemper*
+
+*   select :include_blank option can be set to a string instead of true, which just uses an empty string.  #7664 *Wizard*
+
+*   Added url_for usage on render :location, which allows for record identification [David Heinemeier Hansson]. Example:
+
+        render :xml => person, :status => :created, :location => person
+
+    ...expands the location to person_url(person).
+
+*   Introduce the request.body stream. Lazy-read to parse parameters rather than always setting RAW_POST_DATA. Reduces the memory footprint of large binary PUT requests.  *Jeremy Kemper*
+
+*   Add some performance enhancements to ActionView.
+
+    * Cache base_paths in @@cached_base_paths
+    * Cache template extensions in @@cached_template_extension
+    * Remove unnecessary rescues
+
+*   Assume that rendered partials go by the HTML format by default
+
+    def my_partial
+        render :update do |page|
+          # in this order
+          # _foo.html.erb
+          # _foo.erb
+          # _foo.rhtml
+          page.replace :foo, :partial => 'foo'
+        end
+    end
+
+*   Added record identifications to FormHelper#form_for and PrototypeHelper#remote_form_for [David Heinemeier Hansson]. Examples:
+
+        <% form_for(@post) do |f| %>
+          ...
+        <% end %>
+
+    This will expand to be the same as:
+
+        <% form_for :post, @post, :url => post_path(@post), :html => { :method => :put, :class => "edit_post", :id => "edit_post_45" } do |f| %>
+          ...
+        <% end %>
+
+    And for new records:
+
+        <% form_for(Post.new) do |f| %>
+          ...
+        <% end %>
+
+    This will expand to be the same as:
+
+        <% form_for :post, @post, :url => posts_path, :html => { :class => "new_post", :id => "new_post" } do |f| %>
+          ...
+        <% end %>
+
+*   Rationalize route path escaping according to RFC 2396 section 3.3.  #7544, #8307. *Jeremy Kemper, Chris Roos, begemot, jugend*
+
+*   Added record identification with polymorphic routes for ActionController::Base#url_for and ActionView::Base#url_for [David Heinemeier Hansson]. Examples:
+
+        redirect_to(post)         # => redirect_to(posts_url(post))         => Location: http://example.com/posts/1
+        link_to(post.title, post) # => link_to(post.title, posts_url(post)) => <a href="/posts/1">Hello world</a>
+
+    Any method that calls url_for on its parameters will automatically benefit from this.
+
+*   Removed deprecated parameters_for_method_reference concept (legacy from before named routes) *David Heinemeier Hansson*
+
+*   Add ActionController::Routing::Helpers, a module to contain common URL helpers such as polymorphic_url. *Nicholas Seckar*
+
+*   Included the HttpAuthentication plugin as part of core (ActionController::HttpAuthentication::Basic) *David Heinemeier Hansson*
+
+*   Modernize documentation for form helpers. *Jeremy McAnally*
+
+*   Add brief introduction to REST to the resources documentation. *fearoffish*
+
+*   Fix various documentation typos throughout ActionPack. *Henrik N*
+
+*   Enhance documentation and add examples for url_for. *Jeremy McAnally*
+
+*   Fix documentation typo in routes. *Norbert Crombach, pam*
+
+*   Sweep flash when filter chain is halted. *Caio Chassot <lists@v2studio.com>*
+
+*   Fixed that content_tag with a block will just return the result instead of concate it if not used in a ERb view #7857, #7432 *michael.niessner*
+
+*   Replace the current block/continuation filter chain handling by an implementation based on a simple loop.  #8226 *Stefan Kaes*
+
+*   Update UrlWriter to accept :anchor parameter. Closes #6771. *Chris McGrath*
+
+*   Added RecordTagHelper for using RecordIdentifier conventions on divs and other container elements [David Heinemeier Hansson]. Example:
+
+        <% div_for(post) do %>     <div id="post_45" class="post">
+          <%= post.body %>           What a wonderful world!
+        <% end %>                  </div>
+
+*   Added page[record] accessor to JavaScriptGenerator that relies on RecordIdentifier to find the right dom id [David Heinemeier Hansson]. Example:
+
+        format.js do
+          # Calls: new Effect.fade('post_45');
+          render(:update) { |page| page[post].visual_effect(:fade) }
+        end
+
+*   Added RecordIdentifier to enforce view conventions on records for dom ids, classes, and partial paths *David Heinemeier Hansson*
+
+*   Added map.namespace to deal with the common situation of admin sections and the like *David Heinemeier Hansson*
+
+        Before:
+
+          map.resources :products, :path_prefix => "admin", :controller => "admin/products", :collection => { :inventory => :get }, :member => { :duplicate => :post }
+          map.resources :tags, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_tags"
+          map.resources :images, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_images"
+          map.resources :variants, :name_prefix => 'admin_product_', :path_prefix => "admin/products/:product_id", :controller => "admin/product_variants"
+
+        After:
+
+          map.namespace(:admin) do |admin|
+            admin.resources :products,
+              :collection => { :inventory => :get },
+              :member     => { :duplicate => :post },
+              :has_many   => [ :tags, :images, :variants ]
+          end
+
+*   Added :name_prefix as standard for nested resources [David Heinemeier Hansson]. WARNING: May be backwards incompatible with your app
+
+        Before:
+
+          map.resources :emails do |emails|
+            emails.resources :comments,    :name_prefix => "email_"
+            emails.resources :attachments, :name_prefix => "email_"
+          end
+
+        After:
+
+          map.resources :emails do |emails|
+            emails.resources :comments
+            emails.resources :attachments
+          end
+
+        This does mean that if you intended to have comments_url go to /emails/5/comments, then you'll have to set :name_prefix to nil explicitly.
+
+*   Added :has_many and :has_one for declaring plural and singular resources beneath the current *David Heinemeier Hansson*
+
+        Before:
+
+          map.resources :notes do |notes|
+            notes.resources :comments
+            notes.resources :attachments
+            notes.resource :author
+          end
+
+        After:
+
+          map.resources :notes, :has_many => [ :comments, :attachments ], :has_one => :author
+
+*   Added that render :xml will try to call to_xml if it can [David Heinemeier Hansson]. Makes these work:
+
+        render :xml => post
+        render :xml => comments
+
+*   Added :location option to render so that the common pattern of rendering a response after creating a new resource is now a 1-liner *David Heinemeier Hansson*
+
+        render :xml => post.to_xml, :status => :created, :location => post_url(post)
+
+*   Ensure that render_text only adds string content to the body of the response *David Heinemeier Hansson*
+
+*   Return the string representation from an Xml Builder when rendering a partial. Closes #5044 *Tim Pope*
+
+*   Fixed that parameters from XML should also be presented in a hash with indifferent access *David Heinemeier Hansson*
+
+*   Tweak template format rules so that the ACCEPT header is only used if it's text/javascript.  This is so ajax actions without a :format param get recognized as Mime::JS. *Rick Olson*
+
+*   The default respond_to blocks don't set a specific extension anymore, so that both 'show.rjs' and 'show.js.rjs' will work. *Rick Olson*
+
+*   Allow layouts with extension of .html.erb.  Closes #8032 *Josh Knowles*
+
+*   Change default respond_to templates for xml and rjs formats. *Rick Olson*
+
+    * Default xml template goes from #{action_name}.rxml => #{action_name}.xml.builder.
+    * Default rjs template goes from #{action_name}.rjs => #{action_name}.js.rjs.
+
+    You can still specify your old templates:
+
+        respond_to do |format|
+          format.xml do
+            render :action => "#{action_name}.rxml"
+          end
+        end
+
+*   Fix WSOD due to modification of a formatted template extension so that requests to templates like 'foo.html.erb' fail on the second hit.  *Rick Olson*
+
+*   Fix WSOD when template compilation fails *Rick Olson*
+
+*   Change ActionView template defaults.  Look for templates using the request format first, such as "show.html.erb" or "show.xml.builder", before looking for the old defaults like "show.erb" or "show.builder" *Rick Olson*
+
+*   Highlight helper highlights one or many terms in a single pass.  *Jeremy Kemper*
+
+*   Dropped the use of ; as a separator of non-crud actions on resources and went back to the vanilla slash. It was a neat idea, but lots of the non-crud actions turned out not to be RPC (as the ; was primarily intended to discourage), but legitimate sub-resources, like /parties/recent, which didn't deserve the uglification of /parties;recent. Further more, the semicolon caused issues with caching and HTTP authentication in Safari. Just Not Worth It *David Heinemeier Hansson*
+
+*   Added that FormTagHelper#submit_tag will return to its original state if the submit fails and you're using :disable_with *David Heinemeier Hansson*
+
+*   Cleaned up, corrected, and mildly expanded ActionPack documentation.  Closes #7190 *Jeremy McAnally*
+
+*   Small collection of ActionController documentation cleanups.  Closes #7319 *Jeremy McAnally*
+
+*   Make sure the route expiry hash is constructed by comparing the to_param-ized values of each hash. *Jamis Buck*
+
+*   Allow configuration of the default action cache path for #caches_action calls.  *Rick Olson*
+
+    class ListsController < ApplicationController
+        caches_action :index, :cache_path => Proc.new { |controller|
+          controller.params[:user_id] ?
+            controller.send(:user_lists_url, c.params[:user_id]) :
+            controller.send(:lists_url) }
+    end
+
+*   Performance: patch cgi/session/pstore to require digest/md5 once rather than per #initialize.  #7583 *Stefan Kaes*
+
+*   Cookie session store: ensure that new sessions doesn't reuse data from a deleted session in the same request.  *Jeremy Kemper*
+
+*   Deprecation: verification with :redirect_to => :named_route shouldn't be deprecated.  #7525 *Justin French*
+
+*   Cookie session store: raise ArgumentError when :session_key is blank.  *Jeremy Kemper*
+
+*   Deprecation: remove deprecated request, redirect, and dependency methods. Remove deprecated instance variables. Remove deprecated url_for(:symbol, *args) and redirect_to(:symbol, *args) in favor of named routes. Remove uses_component_template_root for toplevel components directory. Privatize deprecated render_partial and render_partial_collection view methods. Remove deprecated link_to_image, link_image_to, update_element_function, start_form_tag, and end_form_tag helper methods. Remove deprecated human_size helper alias.  *Jeremy Kemper*
+
+*   Consistent public/protected/private visibility for chained methods.  #7813 *Dan Manges*
+
+*   Prefer MIME constants to strings.  #7707 *Dan Kubb*
+
+*   Allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 *bgipsy, Jeremy McAnally, Dan Kubb, brendan*
+
+    \# Add a #dbman attr_reader for CGI::Session and make CGI::Session::CookieStore#generate_digest public so it's easy to generate digests    using the cookie store's secret. [Rick Olson]
+*   Added Request#url that returns the complete URL used for the request *David Heinemeier Hansson*
+
+*   Extract dynamic scaffolding into a plugin.  #7700 *Josh Peek*
+
+*   Added user/password options for url_for to add http authentication in a URL *David Heinemeier Hansson*
+
+*   Fixed that FormTagHelper#text_area_tag should disregard :size option if it's not a string *Brendon Davidson*
+
+*   Set the original button value in an attribute of the button when using the :disable_with key with submit_tag, so that the original can be restored later. *Jamis Buck*
+
+*   session_enabled? works with session :off.  #6680 *Jonathan del Strother*
+
+*   Added :port and :host handling to UrlRewriter (which unified url_for usage, regardless of whether it's called in view or controller) #7616 *alancfrancis*
+
+*   Allow send_file/send_data to use a registered mime type as the :type parameter #7620 *jonathan*
+
+*   Allow routing requirements on map.resource(s) #7633 [quixoten]. Example:
+
+    map.resources :network_interfaces, :requirements => { :id => /^\d+\.\d+\.\d+\.\d+$/ }
+
+*   Cookie session store: empty and unchanged sessions don't write a cookie.  *Jeremy Kemper*
+
+*   Added helper(:all) as a way to include all helpers from app/helpers/**/*.rb in ApplicationController *David Heinemeier Hansson*
+
+*   Integration tests: introduce methods for other HTTP methods.  #6353 *caboose*
+
+*   Routing: better support for escaped values in route segments.  #7544 [Chris
+    Roos]
+*   Introduce a cookie-based session store as the Rails default. Sessions typically contain at most a user_id and flash message; both fit within the 4K cookie size limit. A secure message digest is included with the cookie to ensure data integrity (a user cannot alter his user_id without knowing the secret key included in the digest). If you have more than 4K of session data or don't want your data to be visible to the user, pick another session store.  Cookie-based sessions are dramatically faster than the alternatives.   *Jeremy Kemper*
+
+    Example config/environment.rb:
+        # Use an application-wide secret key and the default SHA1 message digest.
+        config.action_controller.session = { :secret => "can't touch this" }
+
+        # Store a secret key per user and employ a stronger message digest.
+        config.action_controller.session = {
+          :digest => 'SHA512',
+          :secret => Proc.new { User.current.secret_key }
+        }
+
+*   Added .erb and .builder as preferred aliases to the now deprecated .rhtml and .rxml extensions [Chad Fowler]. This is done to separate the renderer from the mime type. .erb templates are often used to render emails, atom, csv, whatever. So labeling them .rhtml doesn't make too much sense. The same goes for .rxml, which can be used to build everything from HTML to Atom to whatever. .rhtml and .rxml will continue to work until Rails 3.0, though. So this is a slow phasing out. All generators and examples will start using the new aliases, though.
+
+*   Added caching option to AssetTagHelper#stylesheet_link_tag and AssetTagHelper#javascript_include_tag [David Heinemeier Hansson]. Examples:
+
+        stylesheet_link_tag :all, :cache => true # when ActionController::Base.perform_caching is false =>
+          <link href="/stylesheets/style1.css"  media="screen" rel="Stylesheet" type="text/css" />
+          <link href="/stylesheets/styleB.css"  media="screen" rel="Stylesheet" type="text/css" />
+          <link href="/stylesheets/styleX2.css" media="screen" rel="Stylesheet" type="text/css" />
+
+        stylesheet_link_tag :all, :cache => true # when ActionController::Base.perform_caching is true =>
+          <link href="/stylesheets/all.css"  media="screen" rel="Stylesheet" type="text/css" />
+
+    ...when caching is on, all.css is the concatenation of style1.css, styleB.css, and styleX2.css.
+    Same deal for JavaScripts.
+
+*   Work around the two connection per host browser limit: use asset%d.myapp.com to distribute asset requests among asset[0123].myapp.com. Use a DNS wildcard or CNAMEs to map these hosts to your asset server. See http://www.die.net/musings/page_load_time/ for background.  *Jeremy Kemper*
+
+*   Added default mime type for CSS (Mime::CSS) *David Heinemeier Hansson*
+
+*   Added that rendering will automatically insert the etag header on 200 OK responses. The etag is calculated using MD5 of the response body. If a request comes in that has a matching etag, the response will be changed to a 304 Not Modified and the response body will be set to an empty string. *David Heinemeier Hansson*
+
+*   Added X-Runtime to all responses with the request run time *David Heinemeier Hansson*
+
+*   Add Mime::Type convenience methods to check the current mime type. *Rick Olson*
+
+    request.format.html? # => true if Mime::HTML
+    request.format.jpg?  # => true if Mime::JPG
+
+    \# ActionController sample usage:
+    \# the session will be disabled for non html/ajax requests
+    session :off, :if => Proc.new { |req| !(req.format.html? || req.format.js?) }
+
+*   Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  *Stefan Kaes*
+
+*   Add a :url_based_filename => true option to ActionController::Streaming::send_file, which allows URL-based filenames.  *Thomas Fuchs*
+
+*   Fix that FormTagHelper#submit_tag using :disable_with should trigger the onsubmit handler of its form if available *David Heinemeier Hansson*
+
+*   Fix #render_file so that TemplateError is called with the correct params and you don't get the WSOD.  *Rick Olson*
+
+*   Fix issue with deprecation messing up #template_root= usage.  Add #prepend_view_path and #append_view_path to allow modification of a copy of the
+    superclass' view_paths.  [Rick Olson]
+*   Allow Controllers to have multiple view_paths instead of a single template_root.  Closes #2754 *John Long*
+
+*   Add much-needed html-scanner tests.  Fixed CDATA parsing bug. *Rick Olson*
+
+*   improve error message for Routing for named routes.  Closes #7346 *Rob Sanheim*
+
+*   Added enhanced docs to routing assertions.  Closes #7359 *Rob Sanheim*
+
+*   fix form_for example in ActionController::Resources documentation.  Closes #7362 *gnarg*
+
+*   Make sure that the string returned by TextHelper#truncate is actually a string, not a char proxy -- that should only be used internally while working on a multibyte-safe way of truncating *David Heinemeier Hansson*
+
+*   Added FormBuilder#submit as a delegate for FormTagHelper#submit_tag *David Heinemeier Hansson*
+
+*   Allow Routes to generate all urls for a set of options by specifying :generate_all => true. Allows caching to properly set or expire all paths for a resource. References #1739. *Nicholas Seckar*
+
+*   Change the query parser to map empty GET params to "" rather than nil. Closes #5694. *Nicholas Seckar*
+
+*   date_select and datetime_select take a :default option.  #7052 *Nik Wakelin*
+        date_select "post", "written_on", :default => 3.days.from_now
+        date_select "credit_card", "bill_due", :default => { :day => 20 }
+
+*   select :multiple => true suffixes the attribute name with [] unless already suffixed.  #6977 *nik.kakelin, ben, julik*
+
+*   Improve routes documentation.  #7095 *zackchandler*
+
+*   mail_to :encode => 'hex' also encodes the mailto: part of the href attribute as well as the linked email when no name is given.  #2061 *Jarkko Laine, pfc.pille@gmx.net*
+
+*   Resource member routes require :id, eliminating the ambiguous overlap with collection routes.  #7229 *dkubb*
+
+*   Remove deprecated assertions.  *Jeremy Kemper*
+
+*   Change session restoration to allow namespaced models to be autoloaded. Closes #6348. *Nicholas Seckar*
+
+*   Fix doubly appearing parameters due to string and symbol mixups. Closes #2551. *Anthony Eden*
+
+*   Fix overly greedy rescues when loading helpers. Fixes #6268. *Nicholas Seckar*
+
+*   Fixed NumberHelper#number_with_delimiter to use "." always for splitting the original number, not the delimiter parameter #7389 *ceefour*
+
+*   Autolinking recognizes trailing and embedded . , : ;  #7354 *Jarkko Laine*
+
+*   Make TextHelper::auto_link recognize URLs with colons in path correctly, fixes #7268.  *imajes*
+
+*   Update to script.aculo.us 1.7.0.  *Thomas Fuchs*
+
+*   Modernize cookie testing code, and increase coverage (Heckle++) #7101 *Kevin Clark*
+
+*   Improve Test Coverage for ActionController::Routing::Route#matches_controller_and_action? (Heckle++) #7115 *Kevin Clark*
+
+*   Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 *Kevin Clark*
+
+*   Fix #distance_of_time_in_words to report accurately against the Duration class.  #7114 *eventualbuddha*
+
+*   Refactor #form_tag to allow easy extending.  *Rick Olson*
+
+*   Update to Prototype 1.5.0. *Sam Stephenson*
+
+*   RecordInvalid, RecordNotSaved => 422 Unprocessable Entity, StaleObjectError => 409 Conflict.  #7097 *dkubb*
+
+*   Allow fields_for to be nested inside form_for, so that the name and id get properly constructed *Jamis Buck*
+
+*   Allow inGroupsOf and eachSlice to be called through rjs. #7046 *Cody Fauser*
+
+*   Allow exempt_from_layout :rhtml.  #6742, #7026 *Dan Manges, Squeegy*
+
+*   Recognize the .txt extension as Mime::TEXT *Rick Olson*
+
+*   Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 *Nicholas Seckar, aiwilliams, brentrowland*
+
+*   link_to_unless_current works with full URLs as well as paths.  #6891 *Jarkko Laine, Manfred Stienstra, idrifter*
+
+*   Lookup the mime type for #auto_discovery_link_tag in the Mime::Type class.  Closes #6941 *Josh Peek*
+
+*   Fix bug where nested resources ignore a parent singleton parent's path prefix.  Closes #6940 *Dan Kubb*
+
+*   Fix no method error with error_messages_on.  Closes #6935 *nik.wakelin Koz*
+
+*   Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs.  Closes #6922 *Steven Bristol*
+
+*   Slight doc tweak to #prepend_filter.  Closes #6493 *Jeremy Voorhis*
+
+*   Add more extensive documentation to the AssetTagHelper.  Closes #6452 *Bob Silva*
+
+*   Clean up multiple calls to #stringify_keys in TagHelper, add better documentation and testing for TagHelper.  Closes #6394 *Bob Silva*
+
+*   [DOCS] fix reference to ActionController::Macros::AutoComplete for #text_field_with_auto_complete. Closes #2578 *Jan Prill*
+
+*   Make sure html_document is reset between integration test requests. *ctm*
+
+*   Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.  *Josh Susser*
+
+*   Routing uses URI escaping for path components and CGI escaping for query parameters.  *darix, Jeremy Kemper*
+
+*   Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting.  Closes #6128.  *Rick Olson*
+
+*   Singleton resources: POST /singleton => create, GET /singleton/new => new.  *Jeremy Kemper*
+
+*   Use 400 Bad Request status for unrescued ActiveRecord::RecordInvalid exceptions.  *Jeremy Kemper*
+
+*   Silence log_error deprecation warnings from inspecting deprecated instance variables.  *Nate Wiger*
+
+*   Only cache GET requests with a 200 OK response.  #6514, #6743 *RSL, anamba*
+
+*   Add a 'referer' attribute to TestRequest. *Jamis Buck*
+
+*   Ensure render :json => ... skips the layout.  Closes #6808 *Josh Peek*
+
+*   Fix HTML::Node to output double quotes instead of single quotes.  Closes #6845 *mitreandy*
+
+*   Correctly report which filter halted the chain.  #6699 *Martin Emde*
+
+*   Fix a bug in Routing where a parameter taken from the path of the current request could not be used as a query parameter for the next. Closes #6752. *Nicholas Seckar*
+
+*   Unrescued ActiveRecord::RecordNotFound responds with 404 instead of 500.  *Jeremy Kemper*
+
+*   Improved auto_link to match more valid urls correctly *Tobias Lütke*
+
+*   Add singleton resources. *Rick Olson*
+
+    map.resource :account
+
+    GET /account
+    GET /account;edit
+    UPDATE /account
+    DELETE /account
+
+*   respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument.  #4185 *Scott Raymond, eventualbuddha*
+        # application/json response with body 'Element.show({:name: "David"})'
+        respond_to do |format|
+          format.json { render :json => { :name => "David" }.to_json, :callback => 'Element.show' }
+        end
+
+*   Makes :discard_year work without breaking multi-attribute parsing in AR.  #1260, #3800 *sean@ardismg.com, jmartin@desertflood.com, stephen@touset.org, Bob Silva*
+
+*   Adds html id attribute to date helper elements.  #1050, #1382 *mortonda@dgrmm.net, David North, Bob Silva*
+
+*   Add :index and @auto_index capability to model driven date/time selects.  #847, #2655 *moriq, Doug Fales, Bob Silva*
+
+*   Add :order to datetime_select, select_datetime, and select_date.  #1427 *Timothee Peignier, Patrick Lenz, Bob Silva*
+
+*   Added time_select to work with time values in models. Update scaffolding.  #2489, #2833 *Justin Palmer, Andre Caum, Bob Silva*
+
+*   Added :include_seconds to select_datetime, datetime_select and time_select.  #2998 *csn, Bob Silva*
+
+*   All date/datetime selects can now accept an array of month names with :use_month_names. Allows for localization.  #363 *tomasj, Bob Silva*
+
+*   Adds :time_separator to select_time and :date_separator to select_datetime. Preserves BC.  #3811 *Bob Silva*
+
+*   Added map.root as an alias for map.connect '' *David Heinemeier Hansson*
+
+*   Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [David Heinemeier Hansson]. Examples:
+
+        GET /posts/5.xml   | request.format => Mime::XML
+        GET /posts/5.xhtml | request.format => Mime::HTML
+        GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
+
+*   Added the option for extension aliases to mime type registration [David Heinemeier Hansson]. Example (already in the default routes):
+
+        Mime::Type.register "text/html", :html, %w( application/xhtml+xml ), %w( xhtml )
+
+    ...will respond on both .html and .xhtml.
+
+*   @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status.  *Jeremy Kemper*
+
+*   Added CSV to Mime::SET so that respond_to csv will work *Cody Fauser*
+
+*   Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) *David Heinemeier Hansson*
+
+*   Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 *David Heinemeier Hansson*
+
+*   Update Routing to complain when :controller is not specified by a route. Closes #6669. *Nicholas Seckar*
+
+*   Ensure render_to_string cleans up after itself when an exception is raised.  #6658 *Rob Sanheim*
+
+*   Extract template_changed_since? from compile_template? so plugins may override its behavior for non-file-based templates.  #6651 *Jeff Barczewski*
+
+*   Update to Prototype and script.aculo.us [5579]. *Thomas Fuchs*
+
+*   simple_format helper doesn't choke on nil.  #6644 *jerry426*
+
+*   Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again *Thomas Fuchs*
+
+*   Reuse named route helper module between Routing reloads. Use remove_method to delete named route methods after each load. Since the module is never collected, this fixes a significant memory leak. *Nicholas Seckar*
+
+*   ActionView::Base.erb_variable accessor names the buffer variable used to render templates. Defaults to _erbout; use _buf for erubis.  *Rick Olson*
+
+*   assert_select_rjs :remove.  *Dylan Egan*
+
+*   Always clear model associations from session.  #4795 *sd@notso.net, andylien@gmail.com*
+
+*   Update to Prototype 1.5.0_rc2. *Sam Stephenson*
+
+*   Remove JavaScriptLiteral in favor of ActiveSupport::JSON::Variable. *Sam Stephenson*
+
+*   Sync ActionController::StatusCodes::STATUS_CODES with http://www.iana.org/assignments/http-status-codes.  #6586 *dkubb*
+
+*   Multipart form values may have a content type without being treated as uploaded files if they do not provide a filename.  #6401 *Andreas Schwarz, Jeremy Kemper*
+
+*   assert_response supports symbolic status codes.  #6569 *Kevin Clark*
+        assert_response :ok
+        assert_response :not_found
+        assert_response :forbidden
+
+*   Cache parsed query parameters.  #6559 *Stefan Kaes*
+
+*   Deprecate JavaScriptHelper#update_element_function, which is superseeded by RJS *Thomas Fuchs*
+
+*   pluralize helper interprets nil as zero.  #6474 *Tim Pope*
+
+*   Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing.  #6524 *Bob Silva*
+
+*   Set ActionView::Base.default_form_builder once rather than passing the :builder option to every form or overriding the form helper methods.  *Jeremy Kemper*
+
+*   Deprecate expire_matched_fragments. Use expire_fragment instead.  #6535 *Bob Silva*
+
+*   Update to latest Prototype, which doesn't serialize disabled form elements, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions *Thomas Fuchs*
+
+*   Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  *Rick Olson*
+
+*   Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag *Rick Olson*
+
+*   Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  *Rick Olson*
+
+*   Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
+
+     <% content_tag :div, :class => "strong" %>
+         Hello world!
+     <% end %>
+
+    Will output:
+        <div class="strong">Hello world!</div>
+
+*   Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 *Bob Silva*
+
+*   Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 *Bob Silva*
+
+*   Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 *Bob Silva/chrismear*
+
+*   Force *_url named routes to show the host in ActionView *Rick Olson*
+
+    <%= url_for ... %> # no host
+    <%= foo_path %>    # no host
+    <%= foo_url %>     # host!
+
+*   Add support for converting blocks into function arguments to JavaScriptGenerator#call and JavaScriptProxy#call. *Sam Stephenson*
+
+*   Add JavaScriptGenerator#literal for wrapping a string in an object whose #to_json is the string itself. *Sam Stephenson*
+
+*   Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. *Rick Olson*
+
+*   Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. *Rick Olson*
+
+*   Fix deprecation warnings when rendering the template error template. *Nicholas Seckar*
+
+*   Fix routing to correctly determine when generation fails. Closes #6300. [psross].
+
+*   Fix broken assert_generates when extra keys are being checked. *Jamis Buck*
+
+*   Replace KCODE checks with String#chars for truncate.  Closes #6385 *Manfred Stienstra*
+
+*   Make page caching respect the format of the resource that is being requested even if the current route is the default route so that, e.g. posts.rss is not transformed by url_for to '/' and subsequently cached as '/index.html' when it should be cached as '/posts.rss'.  *Marcel Molina Jr.*
+
+*   Use String#chars in TextHelper::excerpt. Closes #6386 *Manfred Stienstra*
+
+*   Install named routes into ActionView::Base instead of proxying them to the view via helper_method. Closes #5932. *Nicholas Seckar*
+
+*   Update to latest Prototype and script.aculo.us trunk versions *Thomas Fuchs*
+
+*   Fix relative URL root matching problems. *Mark Imbriaco*
+
+*   Fix filter skipping in controller subclasses.  #5949, #6297, #6299 *Martin Emde*
+
+*   render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API).  *Jeremy Kemper*
+
+*   Rename test assertion to prevent shadowing. Closes #6306. *psross*
+
+*   Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 *Philip Hallstrom*
+
+*   Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 *evansj*
+
+*   Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]. Example:
+
+        update_page_tag :defer => 'true' { |page| ... }
+
+    Gives:
+
+        <script defer="true" type="text/javascript">...</script>
+
+    Which is needed for dealing with the IE6 DOM when it's not yet fully loaded.
+
+*   Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 *Mike Naberezny*
+
+*   Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 *sven@c3d2.de*
+
+*   Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 *cmselmer*
+
+*   respond_to :html doesn't assume .rhtml.  #6281 *Hampton Catlin*
+
+*   Fixed some deprecation warnings in ActionPack *Rick Olson*
+
+*   assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them.  #6240 *japgolly*
+
+*   Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead.  *Jeremy Kemper*
+
+*   Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples:
+
+        head :status => 404        # expands to "404 Not Found"
+        head :status => :not_found # expands to "404 Not Found"
+        head :status => :created   # expands to "201 Created"
+
+*   Add head(options = {}) for responses that have no body. [Jamis Buck]. Examples:
+
+        head :status => 404 # return an empty response with a 404 status
+        head :location => person_path(@person), :status => 201
+
+*   Fix bug that kept any before_filter except the first one from being able to halt the before_filter chain.  *Rick Olson*
+
+*   strip_links is case-insensitive.  #6285 *tagoh, Bob Silva*
+
+*   Clear the cache of possible controllers whenever Routes are reloaded. *Nicholas Seckar*
+
+*   Filters overhaul including meantime filter support using around filters + blocks.  #5949 *Martin Emde, Roman Le Negrate, Stefan Kaes, Jeremy Kemper*
+
+*   Update RJS render tests. *sam*
+
+*   Update CGI process to allow sessions to contain namespaced models. Closes #4638. *dfelstead@site5.com*
+
+*   Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. *Nicholas Seckar*
+
+*   Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 *sdsykes, fhanshaw@vesaria.com*
+
+*   Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
+
+        respond_to do |format|
+          format.html { render :text => "I'm being sent as text/html" }
+          format.rss  { render :text => "I'm being sent as application/rss+xml" }
+          format.atom { render :text => "I'm being sent as application/xml", :content_type => Mime::XML }
+        end
+
+*   Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) *David Heinemeier Hansson*
+
+*   Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
+
+        response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
+
+    ...now:
+
+        response.content_type = Mime::ATOM
+        response.charset      = "utf-8"
+
+*   Updated prototype.js to 1.5.0_rc1 with latest fixes. *Rick Olson*
+
+    - XPATH support
+    - Make Form.getElements() return elements in the correct order
+    - fix broken Form.serialize return
+
+*   Declare file extensions exempt from layouts.  #6219 *brandon*
+        Example: ActionController::Base.exempt_from_layout 'rpdf'
+
+*   Add chained replace/update support for assert_select_rjs *Rick Olson*
+
+        Given RJS like...
+
+          page['test1'].replace "<div id=\"1\">foo</div>"
+          page['test2'].replace_html "<div id=\"2\">foo</div>"
+
+        Test it with...
+
+          assert_select_rjs :chained_replace
+          assert_select_rjs :chained_replace, "test1"
+
+          assert_select_rjs :chained_replace_html
+          assert_select_rjs :chained_replace_html, "test2"
+
+*   Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 *choonkeat@gmail.com*
+
+*   Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 *Manfred Stienstra, raphinou@yahoo.com*
+
+*   Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 *Eric Hodel*
+
+*   Add descriptive messages to the exceptions thrown by cgi_methods. #6091, #6103 *Nicholas Seckar, Bob Silva*
+
+*   Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids,  #6068 *petermichaux@gmail.com*
+
+*   Update UrlWriter to support :only_path. *Nicholas Seckar, Dave Thomas*
+
+*   Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
+
+        link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
+
+    ...can be written like this:
+
+        link_to("Hider", :class => "hider_link") { |p| p[:something].hide }
+
+*   Update to script.aculo.us 1.6.3 *Thomas Fuchs*
+
+*   Update to Prototype 1.5.0_rc1 *sam*
+
+*   Added access to nested attributes in RJS #4548 [richcollins@gmail.com]. Examples:
+
+        page['foo']['style']                  # => $('foo').style;
+        page['foo']['style']['color']         # => $('blank_slate').style.color;
+        page['foo']['style']['color'] = 'red' # => $('blank_slate').style.color = 'red';
+        page['foo']['style'].color = 'red'    # => $('blank_slate').style.color = 'red';
+
+*   Fixed that AssetTagHelper#image_tag and others using compute_public_path should not modify the incoming source argument (closes #5102) *eule@space.ch*
+
+*   Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension *David Heinemeier Hansson*
+
+*   Fixed FormOptionsHelper#select to respect :selected value #5813
+
+*   Fixed TextHelper#simple_format to deal with multiple single returns within a single paragraph #5835 *moriq@moriq.com*
+
+*   Fixed TextHelper#pluralize to handle 1 as a string #5909 *rails@bencurtis.com*
+
+*   Improved resolution of DateHelper#distance_of_time_in_words for better precision #5994 *Bob Silva*
+
+*   Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" *David Heinemeier Hansson*
+
+*   Integration tests: thoroughly test ActionController::Integration::Session.  #6022 *Kevin Clark*
+        (tests skipped unless you `gem install mocha`)
+
+*   Added deprecation language for pagination which will become a plugin by Rails 2.0 *David Heinemeier Hansson*
+
+*   Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 *David Heinemeier Hansson*
+
+*   Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support *David Heinemeier Hansson*
+
+*   Added assert_select* for CSS selector-based testing (deprecates assert_tag) #5936 *assaf.arkin@gmail.com*
+
+*   radio_button_tag generates unique id attributes.  #3353 *Bob Silva, somekool@gmail.com*
+
+*   strip_tags passes through blank args such as nil or "".  #2229, #6702 *duncan@whomwah.com, dharana*
+
+*   Cleanup assert_tag :children counting.  #2181 *jamie@bravenet.com*
+
+*   button_to accepts :method so you can PUT and DELETE with it.  #6005 *Dan Webb*
+
+*   Update sanitize text helper to strip plaintext tags, and <img src="javascript:bang">.  *Rick Olson*
+
+*   Update routing documentation.  Closes #6017 *Nathan Witmer*
+
+*   Add routing tests to assert that RoutingError is raised when conditions aren't met.  Closes #6016 *Nathan Witmer*
+
+*   Deprecation: update docs. #5998 *Jakob Skjerning, Kevin Clark*
+
+*   Make auto_link parse a greater subset of valid url formats. *Jamis Buck*
+
+*   Integration tests: headers beginning with X aren't excluded from the HTTP_ prefix, so X-Requested-With becomes HTTP_X_REQUESTED_WITH as expected. *Mike Clark*
+
+*   Tighten rescue clauses.  #5985 *james@grayproductions.net*
+
+*   Fix send_data documentation typo.  #5982 *brad@madriska.com*
+
+*   Switch to using FormEncodedPairParser for parsing request parameters. *Nicholas Seckar, David Heinemeier Hansson*
+
+*   respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. *Tobias Lütke*
+
+*   Deprecation: test deprecated instance vars in partials. *Jeremy Kemper*
+
+*   Add UrlWriter to allow writing urls from Mailers and scripts. *Nicholas Seckar*
+
+*   Clean up and run the Active Record integration tests by default.  #5854 *Kevin Clark, Jeremy Kemper*
+
+*   Correct example in cookies docs.  #5832 *jessemerriman@warpmail.net*
+
+*   Updated to script.aculo.us 1.6.2 *Thomas Fuchs*
+
+*   Relax Routing's anchor pattern warning; it was preventing use of [^/] inside restrictions. *Nicholas Seckar*
+
+*   Add controller_paths variable to Routing. *Nicholas Seckar*
+
+*   Fix assert_redirected_to issue with named routes for module controllers.  *Rick Olson*
+
+*   Tweak RoutingError message to show option diffs, not just missing named route significant keys. *Rick Olson*
+
+*   Invoke method_missing directly on hidden actions. Closes #3030. *Nicholas Seckar*
+
+*   Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading.  *Rick Olson*
+
+*   Add RoutingError exception when RouteSet fails to generate a path from a Named Route. *Rick Olson*
+
+*   Replace Reloadable with Reloadable::Deprecated. *Nicholas Seckar*
+
+*   Deprecation: check whether instance variables have been monkeyed with before assigning them to deprecation proxies. Raises a RuntimeError if so. *Jeremy Kemper*
+
+*   Add support for the param_name parameter to the auto_complete_field helper. #5026 *david.a.williams@gmail.com*
+
+*   Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. *Jeremy Kemper*
+
+*   Make Routing noisy when an anchor regexp is assigned to a segment. #5674 *François Beausoleil*
+
+*   Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 *pjhyett@gmail.com*
+
+*   Short documentation to mention use of Mime::Type.register. #5710 *choonkeat@gmail.com*
+
+*   Make controller_path available as an instance method.  #5724 *jmckible@gmail.com*
+
+*   Update query parser to support adjacent hashes. *Nicholas Seckar*
+
+*   Make action caching aware of different formats for the same action so that, e.g.  foo.xml is cached separately from foo.html. Implicitly set content type when reading in cached content with mime revealing extensions so the entire onous isn't on the webserver. *Marcel Molina Jr.*
+
+*   Restrict Request Method hacking with ?_method to POST requests.  *Rick Olson*
+
+*   Fix bug when passing multiple options to SimplyRestful, like :new => { :preview => :get, :draft => :get }.  *Rick Olson, Josh Susser, Lars Pind*
+
+*   Dup the options passed to map.resources so that multiple resources get the same options.  *Rick Olson*
+
+*   Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  *Rick Olson*
+
+*   Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
+
+        map.resources :messages
+        map.resources :messages, :comments
+        map.resources :messages, :new => { :preview => :post }
+
+*   Fixed that integration simulation of XHRs should set Accept header as well *Edward Frederick*
+
+*   TestRequest#reset_session should restore a TestSession, not a hash *Michael Koziarski*
+
+*   Don't search a load-path of '.' for controller files *Jamis Buck*
+
+*   Update integration.rb to require test_process explicitly instead of via Dependencies. *Nicholas Seckar*
+
+*   Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 *lmarlow*
+
+*   Allow form_for and fields_for to work with indexed form inputs.  *Jeremy Kemper, Matt Lyon*
+
+    <% form_for 'post[]', @post do |f| -%>
+    <% end -%>
+
+*   Remove leak in development mode by replacing define_method with module_eval. *Nicholas Seckar*
+
+*   Provide support for decimal columns to form helpers. Closes #5672. *Dave Thomas*
+
+*   Update documentation for erb trim syntax. #5651 *matt@mattmargolis.net*
+
+*   Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 *olivier_ansaldi@yahoo.com*
+
+*   Reset @html_document between requests so assert_tag works. #4810 *Jarkko Laine, easleydp@gmail.com*
+
+*   Update render :partial documentation. #5646 *matt@mattmargolis.net*
+
+*   Integration tests behave well with render_component. #4632 *edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com*
+
+*   Added exception handling of missing layouts #5373 *chris@ozmm.org*
+
+*   Fixed that real files and symlinks should be treated the same when compiling templates #5438 *zachary@panandscan.com*
+
+*   Fixed that the flash should be reset when reset_session is called #5584 *Shugo Maeda*
+
+*   Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 *murpyh@rubychan.de*
+
+*   Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) *David Heinemeier Hansson*
+
+*   Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. *Nicholas Seckar*
+
+*   Avoid naming collision among compiled view methods. *Jeremy Kemper*
+
+*   Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 *Mislav Marohnić*
+
+*   Determine the correct template_root for deeply nested components.  #2841 *s.brink@web.de*
+
+*   Fix that routes with *path segments in the recall can generate URLs. *Rick Olson*
+
+*   Fix strip_links so that it doesn't hang on multiline <acronym> tags *Jamis Buck*
+
+*   Remove problematic control chars in rescue template. #5316 *Stefan Kaes*
+
+*   Make sure passed routing options are not mutated by routing code. #5314 *Blair Zajac*
+
+*   Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. *Jamis Buck*
+
+*   Escape the path before routing recognition. #3671
+
+*   Make sure :id and friends are unescaped properly. #5275 *me@julik.nl*
+
+*   Fix documentation for with_routing to reflect new reality. #5281 *rramdas@gmail.com*
+
+*   Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 *mklame@atxeu.com, matthew@walker.wattle.id.au*
+
+*   Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types *David Heinemeier Hansson*
+
+*   Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
+
+*   Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
+
+*   Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 *Manfred Stienstra <m.stienstra@fngtps.com>*
+
+*   Routing rewrite. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes. *Nicholas Seckar, Jamis Buck*
+
+    map.connect '/foo/:id', :controller => '...', :action => '...'
+    map.connect '/foo/:id.:format', :controller => '...', :action => '...'
+    map.connect '/foo/:id', ..., :conditions => { :method => :get }
+
+*   Cope with missing content type and length headers. Parse parameters from multipart and urlencoded request bodies only. *Jeremy Kemper*
+
+*   Accept multipart PUT parameters. #5235 *guy.naor@famundo.com*
+
+*   Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
+
+    class WeblogController < ActionController::Base
+        def index
+          @posts = Post.find :all
+
+          respond_to do |format|
+            format.html
+            format.xml { render :xml => @posts.to_xml }
+            format.rss { render :action => "feed.rxml" }
+          end
+        end
+    end
+
+    \# returns HTML when requested by a browser, since the browser
+    \# has the HTML mimetype at the top of its priority list
+    Accept: text/html
+    GET /weblog
+
+    \# returns the XML
+    Accept: application/xml
+    GET /weblog
+
+    \# returns the HTML
+    Accept: application/xml
+    GET /weblog.html
+
+    \# returns the XML
+    Accept: text/html
+    GET /weblog.xml
+
+    All this relies on the fact that you have a route that includes .:format.
+
+*   Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post *David Heinemeier Hansson*
+
+*   Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete *David Heinemeier Hansson*
+
+*   follow_redirect doesn't complain about being redirected to the same controller. #5153 *dymo@mk.ukrtelecom.ua*
+
+*   Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. *Kevin Clark*
+
+*   Fix NoMethodError when parsing params like &&. *Adam Greenfield*
+
+*   Fix flip flopped logic in docs for url_for's :only_path option. Closes #4998. *esad@esse.at*
+
+*   form.text_area handles the :size option just like the original text_area (:size => '60x10' becomes cols="60" rows="10").  *Jeremy Kemper*
+
+*   Excise ingrown code from FormOptionsHelper#options_for_select. #5008 *anonymous*
+
+*   Small fix in routing to allow dynamic routes (broken after [4242]) *Rick Olson*
+
+        map.connect '*path', :controller => 'files', :action => 'show'
+
+*   Replace alias method chaining with Module#alias_method_chain. *Marcel Molina Jr.*
+
+*   Replace Ruby's deprecated append_features in favor of included. *Marcel Molina Jr.*
+
+*   Use #flush between switching from #write to #syswrite. Closes #4907. *Blair Zajac <blair@orcaware.com>*
+
+*   Documentation fix: integration test scripts don't require integration_test. Closes #4914. *Frederick Ros <sl33p3r@free.fr>*
+
+*   ActionController::Base Summary documentation rewrite. Closes #4900. *Kevin Clark*
+
+*   Fix text_helper.rb documentation rendering. Closes #4725. *Frederick Ros*
+
+*   Fixes bad rendering of JavaScriptMacrosHelper rdoc (closes #4910) *Frederick Ros*
+
+*   Allow error_messages_for to report errors for multiple objects, as well as support for customizing the name of the object in the error summary header. Closes #4186. *andrew@redlinesoftware.com, Marcel Molina Jr.*
+
+    error_messages_for :account, :user, :subscription, :object_name => :account
+
+*   Enhance documentation for setting headers in integration tests. Skip auto HTTP prepending when its already there. Closes #4079. *Rick Olson*
+
+*   Documentation for AbstractRequest. Closes #4895. *Kevin Clark*
+
+*   Refactor various InstanceTag instance method to class methods. Closes #4800. *Stefan Kaes*
+
+*   Remove all remaining references to @params in the documentation. *Marcel Molina Jr.*
+
+*   Add documentation for redirect_to :back's RedirectBackError exception.  *Marcel Molina Jr.*
+
+*   Update layout and content_for documentation to use yield rather than magic @content_for instance variables. *Marcel Molina Jr.*
+
+*   Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: *Rick Olson*
+
+        redirect_to :action => 'new'
+        assert_redirected_to :controller => 'monkeys', :action => 'new'
+
+*   Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. *Rick Olson*
+
+*   Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method *Rick Olson*
+
+        assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
+        assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
+
+*   Diff compared options with #assert_redirected_to *Rick Olson*
+
+*   Add support in routes for semicolon delimited "subpaths", like /books/:id;:action *Jamis Buck*
+
+*   Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. *zraii@comcast.net, Sam Stephenson*
+
+*   Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for *David Heinemeier Hansson*
+
+*   Modify routing so that you can say :require => { :method => :post } for a route, and the route will never be selected unless the request method is POST. Only works for route recognition, not for route generation. *Jamis Buck*
+
+*   Added :add_headers option to verify which merges a hash of name/value pairs into the response's headers hash if the prerequisites cannot be satisfied. *Sam Stephenson*
+    ex. verify :only => :speak, :method => :post,
+                 :render => { :status => 405, :text => "Must be post" },
+                 :add_headers => { "Allow" => "POST" }
+
+*   Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled #1897 *jeremye@bsa.ca.gov*
+
+
+## 1.13.3 (March 12th, 2007) ##
+
+*   Apply [5709] to stable.
+
+*   session_enabled? works with session :off.  #6680 *Jonathan del Strother*
+
+*   Performance: patch cgi/session to require digest/md5 once rather than per #create_new_id.  *Stefan Kaes*
+
+
+## 1.13.2 (February 5th, 2007) ##
+
+*   Add much-needed html-scanner tests.  Fixed CDATA parsing bug. *Rick Olson*
+
+*   improve error message for Routing for named routes. *Rob Sanheim*
+
+*   Added enhanced docs to routing assertions. *Rob Sanheim*
+
+*   fix form_for example in ActionController::Resources documentation. *gnarg*
+
+*   Add singleton resources from trunk *Rick Olson*
+
+*   select :multiple => true suffixes the attribute name with [] unless already suffixed.  #6977 *nik.kakelin, ben, julik*
+
+*   Improve routes documentation.  #7095 *zackchandler*
+
+*   Resource member routes require :id, eliminating the ambiguous overlap with collection routes.  #7229 *dkubb*
+
+*   Fixed NumberHelper#number_with_delimiter to use "." always for splitting the original number, not the delimiter parameter #7389 *ceefour*
+
+*   Autolinking recognizes trailing and embedded . , : ;  #7354 *Jarkko Laine*
+
+*   Make TextHelper::auto_link recognize URLs with colons in path correctly, fixes #7268.  *imajes*
+
+*   Improved auto_link to match more valid urls correctly *Tobias Lütke*
+
+
+## 1.13.1 (January 18th, 2007) ##
+
+*   Fixed content-type bug in Prototype *sam*
+
+
+## 1.13.0 (January 16th, 2007) ##
+
+*   Modernize cookie testing code, and increase coverage (Heckle++) #7101 *Kevin Clark*
+
+*   Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 *Kevin Clark*
+
+*   Update to Prototype 1.5.0. *Sam Stephenson*
+
+*   Allow exempt_from_layout :rhtml.  #6742, #7026 *Dan Manges, Squeegy*
+
+*   Fix parsing of array[] CGI parameters so extra empty values aren't included.  #6252 *Nicholas Seckar, aiwilliams, brentrowland*
+
+*   link_to_unless_current works with full URLs as well as paths.  #6891 *Jarkko Laine, Manfred Stienstra, idrifter*
+
+*   Fix HTML::Node to output double quotes instead of single quotes.  Closes #6845 *mitreandy*
+
+*   Fix no method error with error_messages_on.  Closes #6935 *nik.wakelin Koz*
+
+*   Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace docs.  Closes #6922 *Steven Bristol*
+
+*   Slight doc tweak to #prepend_filter.  Closes #6493 *Jeremy Voorhis*
+
+*   Add more extensive documentation to the AssetTagHelper.  Closes #6452 *Bob Silva*
+
+*   Clean up multiple calls to #stringify_keys in TagHelper, add better documentation and testing for TagHelper.  Closes #6394 *Bob Silva*
+
+*   [DOCS] fix reference to ActionController::Macros::AutoComplete for #text_field_with_auto_complete. Closes #2578 *Jan Prill*
+
+*   Make sure html_document is reset between integration test requests. *ctm*
+
+*   Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.  *Josh Susser*
+
+*   Fix assert_redirected_to bug where redirecting from a nested to to a top-level controller incorrectly added the current controller's nesting.  Closes #6128.  *Rick Olson*
+
+*   Ensure render :json => ... skips the layout.  #6808 *Josh Peek*
+
+*   Silence log_error deprecation warnings from inspecting deprecated instance variables.  *Nate Wiger*
+
+*   Only cache GET requests with a 200 OK response.  #6514, #6743 *RSL, anamba*
+
+*   Correctly report which filter halted the chain.  #6699 *Martin Emde*
+
+*   respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument.  #4185 *Scott Raymond, eventualbuddha*
+        # application/json response with body 'Element.show({:name: "David"})'
+        respond_to do |format|
+          format.json { render :json => { :name => "David" }.to_json, :callback => 'Element.show' }
+        end
+
+*   Makes :discard_year work without breaking multi-attribute parsing in AR.  #1260, #3800 *sean@ardismg.com, jmartin@desertflood.com, stephen@touset.org, Bob Silva*
+
+*   Adds html id attribute to date helper elements.  #1050, #1382 *mortonda@dgrmm.net, David North, Bob Silva*
+
+*   Add :index and @auto_index capability to model driven date/time selects.  #847, #2655 *moriq, Doug Fales, Bob Silva*
+
+*   Add :order to datetime_select, select_datetime, and select_date.  #1427 *Timothee Peignier, Patrick Lenz, Bob Silva*
+
+*   Added time_select to work with time values in models. Update scaffolding.  #2489, #2833 *Justin Palmer, Andre Caum, Bob Silva*
+
+*   Added :include_seconds to select_datetime, datetime_select and time_select.  #2998 *csn, Bob Silva*
+
+*   All date/datetime selects can now accept an array of month names with :use_month_names. Allows for localization.  #363 *tomasj, Bob Silva*
+
+*   Adds :time_separator to select_time and :date_separator to select_datetime. Preserves BC.  #3811 *Bob Silva*
+
+*   @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status.  *Jeremy Kemper*
+
+*   Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) *David Heinemeier Hansson*
+
+*   Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you don't even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 *David Heinemeier Hansson*
+
+
+## 1.13.0 RC1 (r5619, November 22nd, 2006) ##
+
+*   Update Routing to complain when :controller is not specified by a route. Closes #6669. *Nicholas Seckar*
+
+*   Ensure render_to_string cleans up after itself when an exception is raised.  #6658 *rsanheim*
+
+*   Update to Prototype and script.aculo.us [5579]. *Sam Stephenson, Thomas Fuchs*
+
+*   simple_format helper doesn't choke on nil.  #6644 *jerry426*
+
+*   Reuse named route helper module between Routing reloads. Use remove_method to delete named route methods after each load. Since the module is never collected, this fixes a significant memory leak. *Nicholas Seckar*
+
+*   Deprecate standalone components.  *Jeremy Kemper*
+
+*   Always clear model associations from session.  #4795 *sd@notso.net, andylien@gmail.com*
+
+*   Remove JavaScriptLiteral in favor of ActiveSupport::JSON::Variable. *Sam Stephenson*
+
+*   Sync ActionController::StatusCodes::STATUS_CODES with http://www.iana.org/assignments/http-status-codes.  #6586 *dkubb*
+
+*   Multipart form values may have a content type without being treated as uploaded files if they do not provide a filename.  #6401 *Andreas Schwarz, Jeremy Kemper*
+
+*   assert_response supports symbolic status codes.  #6569 *Kevin Clark*
+        assert_response :ok
+        assert_response :not_found
+        assert_response :forbidden
+
+*   Cache parsed query parameters.  #6559 *Stefan Kaes*
+
+*   Deprecate JavaScriptHelper#update_element_function, which is superseeded by RJS *Thomas Fuchs*
+
+*   Fix invalid test fixture exposed by stricter Ruby 1.8.5 multipart parsing.  #6524 *Bob Silva*
+
+*   Set ActionView::Base.default_form_builder once rather than passing the :builder option to every form or overriding the form helper methods.  *Jeremy Kemper*
+
+*   Deprecate expire_matched_fragments. Use expire_fragment instead.  #6535 *Bob Silva*
+
+*   Deprecate start_form_tag and end_form_tag.  Use form_tag / '</form>' from now on.  *Rick Olson*
+
+*   Added block-usage to PrototypeHelper#form_remote_tag, document block-usage of FormTagHelper#form_tag *Rick Olson*
+
+*   Add a 0 margin/padding div around the hidden _method input tag that form_tag outputs.  *Rick Olson*
+
+*   Added block-usage to TagHelper#content_tag [David Heinemeier Hansson]. Example:
+
+     <% content_tag :div, :class => "strong" %>
+         Hello world!
+     <% end %>
+
+    Will output:
+        <div class="strong">Hello world!</div>
+
+*   Deprecated UrlHelper#link_to_image and UrlHelper#link_to :post => true #6409 *Bob Silva*
+
+*   Upgraded NumberHelper with number_to_phone support international formats to comply with ITU E.123 by supporting area codes with less than 3 digits, added precision argument to number_to_human_size (defaults to 1) #6421 *Bob Silva*
+
+*   Fixed that setting RAILS_ASSET_ID to "" should not add a trailing slash after assets #6454 *Bob Silva/chrismear*
+
+*   Force *_url named routes to show the host in ActionView *Rick Olson*
+
+    <%= url_for ... %> # no host
+    <%= foo_path %>    # no host
+    <%= foo_url %>     # host!
+
+*   Add support for converting blocks into function arguments to JavaScriptGenerator#call and JavaScriptProxy#call. *Sam Stephenson*
+
+*   Add JavaScriptGenerator#literal for wrapping a string in an object whose #to_json is the string itself. *Sam Stephenson*
+
+*   Add <%= escape_once html %> to escape html while leaving any currently escaped entities alone.  Fix button_to double-escaping issue. *Rick Olson*
+
+*   Fix double-escaped entities, such as &amp;amp;, &amp;#123;, etc. *Rick Olson*
+
+*   Fix routing to correctly determine when generation fails. Closes #6300. [psross].
+
+*   Fix broken assert_generates when extra keys are being checked. *Jamis Buck*
+
+*   Replace KCODE checks with String#chars for truncate.  Closes #6385 *Manfred Stienstra*
+
+*   Make page caching respect the format of the resource that is being requested even if the current route is the default route so that, e.g. posts.rss is not transformed by url_for to '/' and subsequently cached as '/index.html' when it should be cached as '/posts.rss'.  *Marcel Molina Jr.*
+
+*   Use String#chars in TextHelper::excerpt. Closes #6386 *Manfred Stienstra*
+
+*   Fix relative URL root matching problems. *Mark Imbriaco*
+
+*   Fix filter skipping in controller subclasses.  #5949, #6297, #6299 *Martin Emde*
+
+*   render_text may optionally append to the response body. render_javascript appends by default. This allows you to chain multiple render :update calls by setting @performed_render = false between them (awaiting a better public API).  *Jeremy Kemper*
+
+*   Rename test assertion to prevent shadowing. Closes #6306. *psross*
+
+*   Fixed that NumberHelper#number_to_delimiter should respect precision of higher than two digits #6231 *Philip Hallstrom*
+
+*   Fixed that FormHelper#radio_button didn't respect an :id being passed in #6266 *evansj*
+
+*   Added an html_options hash parameter to javascript_tag() and update_page_tag() helpers #6311 [tzaharia]. Example:
+
+        update_page_tag :defer => 'true' { |page| ... }
+
+    Gives:
+
+        <script defer="true" type="text/javascript">...</script>
+
+    Which is needed for dealing with the IE6 DOM when it's not yet fully loaded.
+
+*   Fixed that rescue template path shouldn't be hardcoded, then it's easier to hook in your own #6295 *Mike Naberezny*
+
+*   Fixed escaping of backslashes in JavaScriptHelper#escape_javascript #6302 *sven@c3d2.de*
+
+*   Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 *cmselmer*
+
+*   respond_to :html doesn't assume .rhtml.  #6281 *Hampton Catlin*
+
+*   Fixed some deprecation warnings in ActionPack *Rick Olson*
+
+*   assert_select_rjs decodes escaped unicode chars since the Javascript generators encode them.  #6240 *japgolly*
+
+*   Deprecation: @cookies, @headers, @request, @response will be removed after 1.2. Use the corresponding method instead.  *Jeremy Kemper*
+
+*   Make the :status parameter expand to the default message for that status code if it is an integer. Also support symbol statuses. [Jamis Buck]. Examples:
+
+        head :status => 404        # expands to "404 Not Found"
+        head :status => :not_found # expands to "404 Not Found"
+        head :status => :created   # expands to "201 Created"
+
+*   Add head(options = {}) for responses that have no body. [Jamis Buck]. Examples:
+
+        head :status => 404 # return an empty response with a 404 status
+        head :location => person_path(@person), :status => 201
+
+*   Fix bug that kept any before_filter except the first one from being able to halt the before_filter chain.  *Rick Olson*
+
+*   strip_links is case-insensitive.  #6285 *tagoh, Bob Silva*
+
+*   Clear the cache of possible controllers whenever Routes are reloaded. *Nicholas Seckar*
+
+*   Filters overhaul including meantime filter support using around filters + blocks.  #5949 *Martin Emde, Roman Le Negrate, Stefan Kaes, Jeremy Kemper*
+
+*   Update CGI process to allow sessions to contain namespaced models. Closes #4638. *dfelstead@site5.com*
+
+*   Fix routing to respect user provided requirements and defaults when assigning default routing options (such as :action => 'index'). Closes #5950. *Nicholas Seckar*
+
+*   Rescue Errno::ECONNRESET to handle an unexpectedly closed socket connection. Improves SCGI reliability.  #3368, #6226 *sdsykes, fhanshaw@vesaria.com*
+
+*   Added that respond_to blocks will automatically set the content type to be the same as is requested [David Heinemeier Hansson]. Examples:
+
+        respond_to do |format|
+          format.html { render :text => "I'm being sent as text/html" }
+          format.rss  { render :text => "I'm being sent as application/rss+xml" }
+          format.atom { render :text => "I'm being sent as application/xml", :content_type => Mime::XML }
+        end
+
+*   Added utf-8 as the default charset for all renders. You can change this default using ActionController::Base.default_charset=(encoding) *David Heinemeier Hansson*
+
+*   Added proper getters and setters for content type and charset [David Heinemeier Hansson]. Example of what we used to do:
+
+        response.headers["Content-Type"] = "application/atom+xml; charset=utf-8"
+
+    ...now:
+
+        response.content_type = Mime::ATOM
+        response.charset      = "utf-8"
+
+*   Declare file extensions exempt from layouts.  #6219 *brandon*
+        Example: ActionController::Base.exempt_from_layout 'rpdf'
+
+*   Add chained replace/update support for assert_select_rjs *Rick Olson*
+
+        Given RJS like...
+
+          page['test1'].replace "<div id=\"1\">foo</div>"
+          page['test2'].replace_html "<div id=\"2\">foo</div>"
+
+        Test it with...
+
+          assert_select_rjs :chained_replace
+          assert_select_rjs :chained_replace, "test1"
+
+          assert_select_rjs :chained_replace_html
+          assert_select_rjs :chained_replace_html, "test2"
+
+*   Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 *choonkeat@gmail.com*
+
+*   Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 *Manfred Stienstra, raphinou@yahoo.com*
+
+*   Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 *Eric Hodel*
+
+*   Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids,  #6068 *petermichaux@gmail.com*
+
+*   Update UrlWriter to support :only_path. *Nicholas Seckar, Dave Thomas*
+
+*   Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [David Heinemeier Hansson]. So what used to require a nil, like this:
+
+        link_to("Hider", nil, :class => "hider_link") { |p| p[:something].hide }
+
+    ...can be written like this:
+
+        link_to("Hider", :class => "hider_link") { |p| p[:something].hide }
+
+*   Added access to nested attributes in RJS #4548 [richcollins@gmail.com]. Examples:
+
+        page['foo']['style']                  # => $('foo').style;
+        page['foo']['style']['color']         # => $('blank_slate').style.color;
+        page['foo']['style']['color'] = 'red' # => $('blank_slate').style.color = 'red';
+        page['foo']['style'].color = 'red'    # => $('blank_slate').style.color = 'red';
+
+*   Fixed that AssetTagHelper#image_tag and others using compute_public_path should not modify the incoming source argument (closes #5102) *eule@space.ch*
+
+*   Deprecated the auto-appending of .png to AssetTagHelper#image_tag calls that doesn't have an extension *David Heinemeier Hansson*
+
+*   Fixed FormOptionsHelper#select to respect :selected value #5813
+
+*   Fixed TextHelper#simple_format to deal with multiple single returns within a single paragraph #5835 *moriq@moriq.com*
+
+*   Fixed TextHelper#pluralize to handle 1 as a string #5909 *rails@bencurtis.com*
+
+*   Improved resolution of DateHelper#distance_of_time_in_words for better precision #5994 *Bob Silva*
+
+*   Changed that uncaught exceptions raised any where in the application will cause RAILS_ROOT/public/500.html to be read and shown instead of just the static "Application error (Rails)" *David Heinemeier Hansson*
+
+*   Added deprecation language for pagination which will become a plugin by Rails 2.0 *David Heinemeier Hansson*
+
+*   Added deprecation language for in_place_editor and auto_complete_field that both pieces will become plugins by Rails 2.0 *David Heinemeier Hansson*
+
+*   Deprecated all of ActionController::Dependencies. All dependency loading is now handled from Active Support *David Heinemeier Hansson*
+
+*   Added assert_select* for CSS selector-based testing (deprecates assert_tag) #5936 *assaf.arkin@gmail.com*
+
+*   radio_button_tag generates unique id attributes.  #3353 *Bob Silva, somekool@gmail.com*
+
+*   strip_tags passes through blank args such as nil or "".  #2229, #6702 *duncan@whomwah.com, dharana*
+
+*   Cleanup assert_tag :children counting.  #2181 *jamie@bravenet.com*
+
+*   button_to accepts :method so you can PUT and DELETE with it.  #6005 *Dan Webb*
+
+*   Update sanitize text helper to strip plaintext tags, and <img src="javascript:bang">.  *Rick Olson*
+
+*   Add routing tests to assert that RoutingError is raised when conditions aren't met.  Closes #6016 *Nathan Witmer*
+
+*   Make auto_link parse a greater subset of valid url formats. *Jamis Buck*
+
+*   Integration tests: headers beginning with X aren't excluded from the HTTP_ prefix, so X-Requested-With becomes HTTP_X_REQUESTED_WITH as expected. *Mike Clark*
+
+*   Switch to using FormEncodedPairParser for parsing request parameters. *Nicholas Seckar, David Heinemeier Hansson*
+
+*   respond_to .html now always renders #{action_name}.rhtml so that registered custom template handlers do not override it in priority. Custom mime types require a block and throw proper error now. *Tobias Lütke*
+
+*   Deprecation: test deprecated instance vars in partials. *Jeremy Kemper*
+
+*   Add UrlWriter to allow writing urls from Mailers and scripts. *Nicholas Seckar*
+
+*   Relax Routing's anchor pattern warning; it was preventing use of [^/] inside restrictions. *Nicholas Seckar*
+
+*   Add controller_paths variable to Routing. *Nicholas Seckar*
+
+*   Fix assert_redirected_to issue with named routes for module controllers.  *Rick Olson*
+
+*   Tweak RoutingError message to show option diffs, not just missing named route significant keys. *Rick Olson*
+
+*   Invoke method_missing directly on hidden actions. Closes #3030. *Nicholas Seckar*
+
+*   Add RoutingError exception when RouteSet fails to generate a path from a Named Route. *Rick Olson*
+
+*   Replace Reloadable with Reloadable::Deprecated. *Nicholas Seckar*
+
+*   Deprecation: check whether instance variables have been monkeyed with before assigning them to deprecation proxies. Raises a RuntimeError if so. *Jeremy Kemper*
+
+*   Add support for the param_name parameter to the auto_complete_field helper. #5026 *david.a.williams@gmail.com*
+
+*   Deprecation! @params, @session, @flash will be removed after 1.2. Use the corresponding instance methods instead. You'll get printed warnings during tests and logged warnings in dev mode when you access either instance variable directly. *Jeremy Kemper*
+
+*   Make Routing noisy when an anchor regexp is assigned to a segment. #5674 *François Beausoleil*
+
+*   Added months and years to the resolution of DateHelper#distance_of_time_in_words, such that "60 days ago" becomes "2 months ago" #5611 *pjhyett@gmail.com*
+
+*   Make controller_path available as an instance method.  #5724 *jmckible@gmail.com*
+
+*   Update query parser to support adjacent hashes. *Nicholas Seckar*
+
+*   Make action caching aware of different formats for the same action so that, e.g.  foo.xml is cached separately from foo.html. Implicitly set content type when reading in cached content with mime revealing extensions so the entire onous isn't on the webserver. *Marcel Molina Jr.*
+
+*   Restrict Request Method hacking with ?_method to POST requests.  *Rick Olson*
+
+*   Fixed the new_#{resource}_url route and added named route tests for Simply Restful.  *Rick Olson*
+
+*   Added map.resources from the Simply Restful plugin [David Heinemeier Hansson]. Examples (the API has changed to use plurals!):
+
+        map.resources :messages
+        map.resources :messages, :comments
+        map.resources :messages, :new => { :preview => :post }
+
+*   Fixed that integration simulation of XHRs should set Accept header as well *Edward Frederick*
+
+*   TestRequest#reset_session should restore a TestSession, not a hash *Michael Koziarski*
+
+*   Don't search a load-path of '.' for controller files *Jamis Buck*
+
+*   Update integration.rb to require test_process explicitly instead of via Dependencies. *Nicholas Seckar*
+
+*   Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 *lmarlow*
+
+*   Allow form_for and fields_for to work with indexed form inputs.  *Jeremy Kemper, Matt Lyon*
+
+    <% form_for 'post[]', @post do |f| -%>
+    <% end -%>
+
+*   Remove leak in development mode by replacing define_method with module_eval. *Nicholas Seckar*
+
+*   Provide support for decimal columns to form helpers. Closes #5672. *Dave Thomas*
+
+*   Pass :id => nil or :class => nil to error_messages_for to supress that html attribute. #3586 *olivier_ansaldi@yahoo.com*
+
+*   Reset @html_document between requests so assert_tag works. #4810 *Jarkko Laine, easleydp@gmail.com*
+
+*   Integration tests behave well with render_component. #4632 *edward.frederick@revolution.com, dev.rubyonrails@maxdunn.com*
+
+*   Added exception handling of missing layouts #5373 *chris@ozmm.org*
+
+*   Fixed that real files and symlinks should be treated the same when compiling templates #5438 *zachary@panandscan.com*
+
+*   Fixed that the flash should be reset when reset_session is called #5584 *Shugo Maeda*
+
+*   Added special case for "1 Byte" in NumberHelper#number_to_human_size #5593 *murpyh@rubychan.de*
+
+*   Fixed proper form-encoded parameter parsing for requests with "Content-Type: application/x-www-form-urlencoded; charset=utf-8" (note the presence of a charset directive) *David Heinemeier Hansson*
+
+*   Add route_name_path method to generate only the path for a named routes. For example, map.person will add person_path. *Nicholas Seckar*
+
+*   Avoid naming collision among compiled view methods. *Jeremy Kemper*
+
+*   Fix CGI extensions when they expect string but get nil in Windows. Closes #5276 *Mislav Marohnić*
+
+*   Determine the correct template_root for deeply nested components.  #2841 *s.brink@web.de*
+
+*   Fix that routes with *path segments in the recall can generate URLs. *Rick Olson*
+
+*   Fix strip_links so that it doesn't hang on multiline <acronym> tags *Jamis Buck*
+
+*   Remove problematic control chars in rescue template. #5316 *Stefan Kaes*
+
+*   Make sure passed routing options are not mutated by routing code. #5314 *Blair Zajac*
+
+*   Make sure changing the controller from foo/bar to bing/bang does not change relative to foo. *Jamis Buck*
+
+*   Escape the path before routing recognition. #3671
+
+*   Make sure :id and friends are unescaped properly. #5275 *me@julik.nl*
+
+*   Rewind readable CGI params so others may reread them (such as CGI::Session when passing the session id in a multipart form).  #210 *mklame@atxeu.com, matthew@walker.wattle.id.au*
+
+*   Added Mime::TEXT (text/plain) and Mime::ICS (text/calendar) as new default types *David Heinemeier Hansson*
+
+*   Added Mime::Type.register(string, symbol, synonyms = []) for adding new custom mime types [David Heinemeier Hansson]. Example: Mime::Type.register("image/gif", :gif)
+
+*   Added support for Mime objects in render :content_type option [David Heinemeier Hansson]. Example: render :text => some_atom, :content_type => Mime::ATOM
+
+*   Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 *Manfred Stienstra <m.stienstra@fngtps.com>*
+
+*   Routing rewrite. Simpler, faster, easier to understand. The published API for config/routes.rb is unchanged, but nearly everything else is different, so expect breakage in plugins and libs that try to fiddle with routes. *Nicholas Seckar, Jamis Buck*
+
+    map.connect '/foo/:id', :controller => '...', :action => '...'
+    map.connect '/foo/:id.:format', :controller => '...', :action => '...'
+    map.connect '/foo/:id', ..., :conditions => { :method => :get }
+
+*   Cope with missing content type and length headers. Parse parameters from multipart and urlencoded request bodies only. *Jeremy Kemper*
+
+*   Accept multipart PUT parameters. #5235 *guy.naor@famundo.com*
+
+*   Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [David Heinemeier Hansson]. Example:
+
+    class WeblogController < ActionController::Base
+        def index
+          @posts = Post.find :all
+
+          respond_to do |format|
+            format.html
+            format.xml { render :xml => @posts.to_xml }
+            format.rss { render :action => "feed.rxml" }
+          end
+        end
+    end
+
+    \# returns HTML when requested by a browser, since the browser
+    \# has the HTML mimetype at the top of its priority list
+    Accept: text/html
+    GET /weblog
+
+    \# returns the XML
+    Accept: application/xml
+    GET /weblog
+
+    \# returns the HTML
+    Accept: application/xml
+    GET /weblog.html
+
+    \# returns the XML
+    Accept: text/html
+    GET /weblog.xml
+
+    All this relies on the fact that you have a route that includes .:format.
+
+*   Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post *David Heinemeier Hansson*
+
+*   Added :method option to UrlHelper#link_to, which allows for using other verbs than GET for the link. This replaces the :post option, which is now deprecated. Example: link_to "Destroy", person_url(:id => person), :method => :delete *David Heinemeier Hansson*
+
+*   follow_redirect doesn't complain about being redirected to the same controller. #5153 *dymo@mk.ukrtelecom.ua*
+
+*   Add layout attribute to response object with the name of the layout that was rendered, or nil if none rendered. *Kevin Clark*
+
+*   Fix NoMethodError when parsing params like &&. *Adam Greenfield*
+
+*   form.text_area handles the :size option just like the original text_area (:size => '60x10' becomes cols="60" rows="10").  *Jeremy Kemper*
+
+*   Excise ingrown code from FormOptionsHelper#options_for_select. #5008 *anonymous*
+
+*   Small fix in routing to allow dynamic routes (broken after [4242]) *Rick Olson*
+
+        map.connect '*path', :controller => 'files', :action => 'show'
+
+*   Use #flush between switching from #write to #syswrite. Closes #4907. *Blair Zajac <blair@orcaware.com>*
+
+*   Allow error_messages_for to report errors for multiple objects, as well as support for customizing the name of the object in the error summary header. Closes #4186. *andrew@redlinesoftware.com, Marcel Molina Jr.*
+
+    error_messages_for :account, :user, :subscription, :object_name => :account
+
+*   Fix assert_redirected_to tests according to real-world usage.  Also, don't fail if you add an extra :controller option: *Rick Olson*
+
+        redirect_to :action => 'new'
+        assert_redirected_to :controller => 'monkeys', :action => 'new'
+
+*   Diff compared routing options.  Allow #assert_recognizes to take a second arg as a hash to specify optional request method *Rick Olson*
+
+        assert_recognizes({:controller => 'users', :action => 'index'}, 'users')
+        assert_recognizes({:controller => 'users', :action => 'create'}, {:path => 'users', :method => :post})
+
+*   Diff compared options with #assert_redirected_to *Rick Olson*
+
+*   Add support in routes for semicolon delimited "subpaths", like /books/:id;:action *Jamis Buck*
+
+*   Change link_to_function and button_to_function to (optionally) take an update_page block instead of a JavaScript string. Closes #4804. *zraii@comcast.net, Sam Stephenson*
+
+*   Modify routing so that you can say :require => { :method => :post } for a route, and the route will never be selected unless the request method is POST. Only works for route recognition, not for route generation. *Jamis Buck*
+
+*   Added :add_headers option to verify which merges a hash of name/value pairs into the response's headers hash if the prerequisites cannot be satisfied. *Sam Stephenson*
+    ex. verify :only => :speak, :method => :post,
+                 :render => { :status => 405, :text => "Must be post" },
+                 :add_headers => { "Allow" => "POST" }
+
+
+## 1.12.5 (August 10th, 2006) ##
+
+*   Updated security fix
+
+
+## 1.12.4 (August 8th, 2006) ##
+
+*   Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. *Rick Olson*
+
+*   Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for *David Heinemeier Hansson*
+
+*   Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled.  #1897 *jeremye@bsa.ca.gov*
+
+*   Fixed that real files and symlinks should be treated the same when compiling templates.  #5438 *zachary@panandscan.com*
+
+*   Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 *Manfred Stienstra <m.stienstra@fngtps.com>*
+
+*   Update documentation for erb trim syntax. #5651 *matt@mattmargolis.net*
+
+*   Short documentation to mention use of Mime::Type.register. #5710 *choonkeat@gmail.com*
+
+
+## 1.12.3 (June 28th, 2006) ##
+
+*   Fix broken traverse_to_controller. We now:
+    Look for a _controller.rb file under RAILS_ROOT to load.
+    If we find it, we require_dependency it and return the controller it defined. (If none was defined we stop looking.)
+    If we don't find it, we look for a .rb file under RAILS_ROOT to load. If we find it, and it loads a constant we keep looking.
+    Otherwise we check to see if a directory of the same name exists, and if it does we create a module for it.
+
+
+## 1.12.2 (June 27th, 2006) ##
+
+*   Refinement to avoid exceptions in traverse_to_controller.
+
+*   (Hackish) Fix loading of arbitrary files in Ruby's load path by traverse_to_controller. *Nicholas Seckar*
+
+
+## 1.12.1 (April 6th, 2006) ##
+
+*   Fixed that template extensions would be cached development mode #4624 *Stefan Kaes*
+
+*   Update to Prototype 1.5.0_rc0 *Sam Stephenson*
+
+*   Honor skipping filters conditionally for only certain actions even when the parent class sets that filter to conditionally be executed only for the same actions. #4522 *Marcel Molina Jr.*
+
+*   Delegate xml_http_request in integration tests to the session instance. *Jamis Buck*
+
+*   Update the diagnostics template skip the useless '<controller not set>' text. *Nicholas Seckar*
+
+*   CHANGED DEFAULT: Don't parse YAML input by default, but keep it available as an easy option *David Heinemeier Hansson*
+
+*   Add additional autocompleter options *aballai, Thomas Fuchs*
+
+*   Fixed fragment caching of binary data on Windows #4493 *bellis@deepthought.org*
+
+*   Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us *Sam Stephenson, Thomas Fuchs*
+
+*   Added automated timestamping to AssetTagHelper methods for stylesheets, javascripts, and images when Action Controller is run under Rails [David Heinemeier Hansson]. Example:
+
+        image_tag("rails.png") # => '<img alt="Rails" src="/images/rails.png?1143664135" />'
+
+    ...to avoid frequent stats (not a problem for most people), you can set RAILS_ASSET_ID in the ENV to avoid stats:
+
+        ENV["RAILS_ASSET_ID"] = "2345"
+        image_tag("rails.png") # => '<img alt="Rails" src="/images/rails.png?2345" />'
+
+    This can be used by deployment managers to set the asset id by application revision
+
+
+## 1.12.0 (March 27th, 2006) ##
+
+*   Add documentation for respond_to. *Jamis Buck*
+
+*   Fixed require of bluecloth and redcloth when gems haven't been loaded #4446 *murphy@cYcnus.de*
+
+*   Update to Prototype 1.5.0_pre1 *Sam Stephenson*
+
+*   Change #form_for and #fields_for so that the second argument is not required *Dave Thomas*
+
+        <% form_for :post, @post, :url => { :action => 'create' } do |f| -%>
+
+    becomes...
+
+        <% form_for :post, :url => { :action => 'create' } do |f| -%>
+
+*   Update to script.aculo.us 1.6 *Thomas Fuchs*
+
+*   Enable application/x-yaml processing by default *Jamis Buck*
+
+*   Fix double url escaping of remote_function. Add :escape => false option to ActionView's url_for. *Nicholas Seckar*
+
+*   Add :script option to in_place_editor to support evalScripts (closes #4194) *Cody Fauser*
+
+*   Fix mixed case enumerable methods in the JavaScript Collection Proxy (closes #4314) *Cody Fauser*
+
+*   Undo accidental escaping for mail_to; add regression test. *Nicholas Seckar*
+
+*   Added nicer message for assert_redirected_to (closes #4294) *court3nay*
+
+        assert_redirected_to :action => 'other_host', :only_path => false
+
+    when it was expecting...
+
+        redirected_to :action => 'other_host', :only_path => true, :host => 'other.test.host'
+
+    gives the error message...
+
+        response is not a redirection to all of the options supplied (redirection is <{:only_path=>false, :host=>"other.test.host", :action=>"other_host"}>), difference: <{:only_path=>"true", :host=>"other.test.host"}>
+
+*   Change url_for to escape the resulting URLs when called from a view. *Nicholas Seckar, coffee2code*
+
+*   Added easy support for testing file uploads with fixture_file_upload #4105 [turnip@turnipspatch.com]. Example:
+
+        # Looks in Test::Unit::TestCase.fixture_path + '/files/spongebob.png'
+        post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png')
+
+*   Fixed UrlHelper#current_page? to behave even when url-escaped entities are present #3929 *jeremy@planetargon.com*
+
+*   Add ability for relative_url_root to be specified via an environment variable RAILS_RELATIVE_URL_ROOT. *isaac@reuben.com, Nicholas Seckar*
+
+*   Fixed link_to "somewhere", :post => true to produce valid XHTML by using the parentnode instead of document.body for the instant form #3007 *Bob Silva*
+
+*   Added :function option to PrototypeHelper#observe_field/observe_form that allows you to call a function instead of submitting an ajax call as the trigger #4268 *jonathan@daikini.com*
+
+*   Make Mime::Type.parse consider q values (if any) *Jamis Buck*
+
+*   XML-formatted requests are typecast according to "type" attributes for :xml_simple *Jamis Buck*
+
+*   Added protection against proxy setups treating requests as local even when they're not #3898 *Steve Purcell*
+
+*   Added TestRequest#raw_post that simulate raw_post from CgiRequest #3042 *François Beausoleil*
+
+*   Underscore dasherized keys in formatted requests *Jamis Buck*
+
+*   Add MimeResponds::Responder#any for managing multiple types with identical responses *Jamis Buck*
+
+*   Make the xml_http_request testing method set the HTTP_ACCEPT header *Jamis Buck*
+
+*   Add Verification to scaffolds.   Prevent destructive actions using GET *Michael Koziarski*
+
+*   Avoid hitting the filesystem when using layouts by using a File.directory? cache. *Stefan Kaes, Nicholas Seckar*
+
+*   Simplify ActionController::Base#controller_path *Nicholas Seckar*
+
+*   Added simple alert() notifications for RJS exceptions when config.action_view.debug_rjs = true. *Sam Stephenson*
+
+*   Added :content_type option to render, so you can change the content type on the fly [David Heinemeier Hansson]. Example: render :action => "atom.rxml", :content_type => "application/atom+xml"
+
+*   CHANGED DEFAULT: The default content type for .rxml is now application/xml instead of type/xml, see http://www.xml.com/pub/a/2004/07/21/dive.html for reason *David Heinemeier Hansson*
+
+*   Added option to render action/template/file of a specific extension (and here by template type). This means you can have multiple templates with the same name but a different extension [David Heinemeier Hansson]. Example:
+
+        class WeblogController < ActionController::Base
+          def index
+            @posts = Post.find :all
+
+            respond_to do |type|
+              type.html # using defaults, which will render weblog/index.rhtml
+              type.xml  { render :action => "index.rxml" }
+              type.js   { render :action => "index.rjs" }
+            end
+          end
+        end
+
+*   Added better support for using the same actions to output for different sources depending on the Accept header [David Heinemeier Hansson]. Example:
+
+        class WeblogController < ActionController::Base
+          def create
+            @post = Post.create(params[:post])
+
+            respond_to do |type|
+              type.js   { render }  # renders create.rjs
+              type.html { redirect_to :action => "index" }
+              type.xml  do
+                headers["Location"] = url_for(:action => "show", :id => @post)
+                render(:nothing, :status => "201 Created")
+              end
+            end
+          end
+        end
+
+*   Added Base#render(:xml => xml) that works just like Base#render(:text => text), but sets the content-type to text/xml and the charset to UTF-8 *David Heinemeier Hansson*
+
+*   Integration test's url_for now runs in the context of the last request (if any) so after post /products/show/1 url_for :action => 'new' will yield /product/new  *Tobias Lütke*
+
+*   Re-added mixed-in helper methods for the JavascriptGenerator.  Moved JavascriptGenerators methods to a module that is mixed in after the helpers are added.  Also fixed that variables set in the enumeration methods like #collect are set correctly.  Documentation added for the enumeration methods [Rick Olson].  Examples:
+
+        page.select('#items li').collect('items') do |element|
+          element.hide
+        end
+        # => var items = $$('#items li').collect(function(value, index) { return value.hide(); });
+
+*   Added plugin support for parameter parsers, which allows for better support for REST web services. By default, posts submitted with the application/xml content type is handled by creating a XmlSimple hash with the same name as the root element of the submitted xml. More handlers can easily be registered like this:
+
+        # Assign a new param parser to a new content type
+        ActionController::Base.param_parsers['application/atom+xml'] = Proc.new do |data|
+          node = REXML::Document.new(post)
+         { node.root.name => node.root }
+        end
+
+        # Assign the default XmlSimple to a new content type
+        ActionController::Base.param_parsers['application/backpack+xml'] = :xml_simple
+
+    Default YAML web services were retired, ActionController::Base.param_parsers carries an example which shows how to get this functionality back. As part of this new plugin support, request.[formatted_post?, xml_post?, yaml_post? and post_format] were all deprecated in favor of request.content_type [Tobias Lütke]
+*   Fixed Effect.Appear in effects.js to work with floats in Safari #3524, #3813, #3044 *Thomas Fuchs*
+
+*   Fixed that default image extension was not appended when using a full URL with AssetTagHelper#image_tag #4032, #3728 *rubyonrails@beautifulpixel.com*
+
+*   Added that page caching will only happen if the response code is less than 400 #4033 *g.bucher@teti.ch*
+
+*   Add ActionController::IntegrationTest to allow high-level testing of the way the controllers and routes all work together *Jamis Buck*
+
+*   Added support to AssetTagHelper#javascript_include_tag for having :defaults appear anywhere in the list, so you can now make one call ala javascript_include_tag(:defaults, "my_scripts") or javascript_include_tag("my_scripts", :defaults) depending on how you want the load order #3506 *Bob Silva*
+
+*   Added support for visual effects scoped queues to the visual_effect helper #3530 *Abdur-Rahman Advany*
+
+*   Added .rxml (and any non-rhtml template, really) supportfor CaptureHelper#content_for and CaptureHelper#capture #3287 *Brian Takita*
+
+*   Added script.aculo.us drag and drop helpers to RJS [Thomas Fuchs]. Examples:
+
+        page.draggable 'product-1'
+        page.drop_receiving 'wastebasket', :url => { :action => 'delete' }
+        page.sortable 'todolist', :url => { action => 'change_order' }
+
+*   Fixed that form elements would strip the trailing [] from the first parameter #3545 *ruby@bobsilva.com*
+
+*   During controller resolution, update the NameError suppression to check for the expected constant. *Nicholas Seckar*
+
+*   Update script.aculo.us to V1.5.3 *Thomas Fuchs*
+
+*   Added various InPlaceEditor options, #3746, #3891, #3896, #3906 *Bill Burcham, ruairi, sl33p3r*
+
+*   Added :count option to pagination that'll make it possible for the ActiveRecord::Base.count call to using something else than * for the count. Especially important for count queries using DISTINCT #3839 *Stefan Kaes*
+
+*   Update script.aculo.us to V1.5.2 *Thomas Fuchs*
+
+*   Added element and collection proxies to RJS [David Heinemeier Hansson]. Examples:
+
+        page['blank_slate']                  # => $('blank_slate');
+        page['blank_slate'].show             # => $('blank_slate').show();
+        page['blank_slate'].show('first').up # => $('blank_slate').show('first').up();
+
+        page.select('p')                      # => $$('p');
+        page.select('p.welcome b').first      # => $$('p.welcome b').first();
+        page.select('p.welcome b').first.hide # => $$('p.welcome b').first().hide();
+
+*   Add JavaScriptGenerator#replace for replacing an element's "outer HTML". #3246 *tom@craz8.com, Sam Stephenson*
+
+*   Remove over-engineered form_for code for a leaner implementation. *Nicholas Seckar*
+
+*   Document form_for's :html option. *Nicholas Seckar*
+
+*   Major components cleanup and speedup.  #3527 *Stefan Kaes*
+
+*   Fix problems with pagination and :include.  *Kevin Clark*
+
+*   Add ActiveRecordTestCase for testing AR integration. *Kevin Clark*
+
+*   Add Unit Tests for pagination *Kevin Clark*
+
+*   Add :html option for specifying form tag options in form_for. *Sam Stephenson*
+
+*   Replace dubious controller parent class in filter docs. #3655, #3722  *info@rhalff.com, eigentone@gmail.com*
+
+*   Don't interpret the :value option on text_area as an html attribute. Set the text_area's value. #3752 *gabriel@gironda.org*
+
+*   Fix remote_form_for creates a non-ajax form. *Rick Olson*
+
+*   Don't let arbitrary classes match as controllers -- a potentially dangerous bug. *Nicholas Seckar*
+
+*   Fix Routing tests. Fix routing where failing to match a controller would prevent the rest of routes from being attempted. *Nicholas Seckar*
+
+*   Add :builder => option to form_for and friends. *Nicholas Seckar, Rick Olson*
+
+*   Fix controller resolution to avoid accidentally inheriting a controller from a parent module. *Nicholas Seckar*
+
+*   Set sweeper's @controller to nil after a request so that the controller may be collected between requests. *Nicholas Seckar*
+
+*   Subclasses of ActionController::Caching::Sweeper should be Reloadable. *Rick Olson*
+
+*   Document the :xhr option for verifications. #3666 *leeo*
+
+*   Added :only and :except controls to skip_before/after_filter just like for when you add filters *David Heinemeier Hansson*
+
+*   Ensure that the instance variables are copied to the template when performing render :update. *Nicholas Seckar*
+
+*   Add the ability to call JavaScriptGenerator methods from helpers called in update blocks. [Sam Stephenson]  Example:
+    module ApplicationHelper
+        def update_time
+          page.replace_html 'time', Time.now.to_s(:db)
+          page.visual_effect :highlight, 'time'
+        end
+    end
+
+    class UserController < ApplicationController
+        def poll
+          render :update { |page| page.update_time }
+        end
+    end
+
+*   Add render(:update) to ActionView::Base. *Sam Stephenson*
+
+*   Fix render(:update) to not render layouts. *Sam Stephenson*
+
+*   Fixed that SSL would not correctly be detected when running lighttpd/fcgi behind lighttpd w/mod_proxy #3548 *Steve Purcell*
+
+*   Added the possibility to specify atomatic expiration for the memcachd session container #3571 *Stefan Kaes*
+
+*   Change layout discovery to take into account the change in semantics with File.join and nil arguments. *Marcel Molina Jr.*
+
+*   Raise a RedirectBackError if redirect_to :back is called when there's no HTTP_REFERER defined #3049 *Kevin Clark*
+
+*   Treat timestamps like datetimes for scaffolding purposes #3388 *Maik Schmidt*
+
+*   Fix IE bug with link_to "something", :post => true #3443 *Justin Palmer*
+
+*   Extract Test::Unit::TestCase test process behavior into an ActionController::TestProcess module. *Sam Stephenson*
+
+*   Pass along blocks from render_to_string to render. *Sam Stephenson*
+
+*   Add render :update for inline RJS. [Sam Stephenson]  Example:
+    class UserController < ApplicationController
+        def refresh
+          render :update do |page|
+            page.replace_html  'user_list', :partial => 'user', :collection => @users
+            page.visual_effect :highlight, 'user_list'
+          end
+        end
+    end
+
+*   allow nil objects for error_messages_for *Michael Koziarski*
+
+*   Refactor human_size to exclude decimal place if it is zero. *Marcel Molina Jr.*
+
+*   Update to Prototype 1.5.0_pre0 *Sam Stephenson*
+
+*   Automatically discover layouts when a controller is namespaced. #2199, #3424 *me@jonnii.com rails@jeffcole.net Marcel Molina Jr.*
+
+*   Add support for multiple proxy servers to CgiRequest#host *gaetanot@comcast.net*
+
+*   Documentation typo fix. #2367 *Blair Zajac*
+
+*   Remove Upload Progress. #2871 *Sean Treadway*
+
+*   Fix typo in function name mapping in auto_complete_field. #2929 #3446 *doppler@gmail.com phil.ross@gmail.com*
+
+*   Allow auto-discovery of third party template library layouts. *Marcel Molina Jr.*
+
+*   Have the form builder output radio button, not check box, when calling the radio button helper. #3331 *LouisStAmour@gmail.com*
+
+*   Added assignment of the Autocompleter object created by JavaScriptMacroHelper#auto_complete_field to a local javascript variables *David Heinemeier Hansson*
+
+*   Added :on option for PrototypeHelper#observe_field that allows you to specify a different callback hook to have the observer trigger on *David Heinemeier Hansson*
+
+*   Added JavaScriptHelper#button_to_function that works just like JavaScriptHelper#link_to_function but uses a button instead of a href *David Heinemeier Hansson*
+
+*   Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call *David Heinemeier Hansson*
+
+*   Added :disable_with option to FormTagHelper#submit_tag to allow for easily disabled submit buttons with different text *David Heinemeier Hansson*
+
+*   Make auto_link handle nil by returning quickly if blank? *Scott Barron*
+
+*   Make auto_link match urls with a port number specified. *Marcel Molina Jr.*
+
+*   Added support for toggling visual effects to ScriptaculousHelper::visual_effect, #3323. *Thomas Fuchs*
+
+*   Update to script.aculo.us to 1.5.0 rev. 3343 *Thomas Fuchs*
+
+*   Added :select option for JavaScriptMacroHelper#auto_complete_field that makes it easier to only use part of the auto-complete suggestion as the value for insertion *Thomas Fuchs*
+
+*   Added delayed execution of Javascript from within RJS #3264 [devslashnull@gmail.com]. Example:
+
+        page.delay(20) do
+          page.visual_effect :fade, 'notice'
+        end
+
+*   Add session ID to default logging, but remove the verbose description of every step *David Heinemeier Hansson*
+
+*   Add the following RJS methods: *Sam Stephenson*
+
+        * alert - Displays an alert() dialog
+        * redirect_to - Changes window.location.href to simulate a browser redirect
+        * call - Calls a JavaScript function
+        * assign - Assigns to a JavaScript variable
+        * << - Inserts an arbitrary JavaScript string
+
+*   Fix incorrect documentation for form_for *Nicholas Seckar*
+
+*   Don't include a layout when rendering an rjs template using render's :template option. *Marcel Molina Jr.*
+
+## 1.1.2 (December 13th, 2005) ##
+
+*   Become part of Rails 1.0
+
+*   Update to script.aculo.us 1.5.0 final (equals 1.5.0_rc6) *Thomas Fuchs*
+
+*   Update to Prototype 1.4.0 final *Sam Stephenson*
+
+*   Added form_remote_for (form_for meets form_remote_tag) *David Heinemeier Hansson*
+
+*   Update to script.aculo.us 1.5.0_rc6
+
+*   More robust relative url root discovery for SCGI compatibility.  This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint.  #3070 *Dave Ringoen*
+
+*   Fix docs for text_area_tag. #3083. *Christopher Cotton*
+
+*   Change form_for and fields_for method signatures to take object name and object as separate arguments rather than as a Hash. *David Heinemeier Hansson*
+
+*   Introduce :selected option to the select helper.  Allows you to specify a selection other than the current value of object.method.  Specify :selected => nil to leave all options unselected.  #2991 *Jonathan Viney <jonathan@bluewire.net.nz>*
+
+*   Initialize @optional in routing code to avoid warnings about uninitialized access to an instance variable. *Nicholas Seckar*
+
+*   Make ActionController's render honor the :locals option when rendering a :file. #1665. *Emanuel Borsboom, Marcel Molina Jr.*
+
+*   Allow assert_tag(:conditions) to match the empty string when a tag has no children. Closes #2959. *Jamis Buck*
+
+*   Update html-scanner to handle CDATA sections better. Closes #2970. *Jamis Buck*
+
+*   Don't put flash in session if sessions are disabled.  *Jeremy Kemper*
+
+*   Strip out trailing &_= for raw post bodies. Closes #2868. *Sam Stephenson*
+
+*   Pass multiple arguments to Element.show and Element.hide in JavaScriptGenerator instead of using iterators. *Sam Stephenson*
+
+*   Improve expire_fragment documentation.  #2966 *court3nay*
+
+*   Correct docs for automatic layout assignment. #2610. *Charles M. Gerungan*
+
+*   Always create new AR sessions rather than trying too hard to avoid database traffic.  #2731 *Jeremy Kemper*
+
+*   Update to Prototype 1.4.0_rc4. Closes #2943 (old Array.prototype.reverse behavior can be obtained by passing false as an argument). *Sam Stephenson*
+
+*   Use Element.update('id', 'html') instead of $('id').innerHTML = 'html' in JavaScriptGenerator#replace_html so that script tags are evaluated. *Sam Stephenson*
+
+*   Make rjs templates always implicitly skip out on layouts. *Marcel Molina Jr.*
+
+*   Correct length for the truncate text helper.  #2913 *Stefan Kaes*
+
+*   Update to Prototype 1.4.0_rc3. Closes #1893, #2505, #2550, #2748, #2783. *Sam Stephenson*
+
+*   Add support for new rjs templates which wrap an update_page block. *Marcel Molina Jr.*
+
+*   Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+*   Correct time_zone_options_for_select docs.  #2892 *pudeyo@rpi.com*
+
+*   Remove the unused, slow response_dump and session_dump variables from error pages.  #1222 *lmarlow*
+
+*   Performance tweaks: use Set instead of Array to speed up prototype helper include? calls.  Avoid logging code if logger is nil.  Inline commonly-called template presence checks.  #2880, #2881, #2882, #2883 *Stefan Kaes*
+
+*   MemCache store may be given multiple addresses.  #2869 *Ryan Carver <ryan@fivesevensix.com>*
+
+*   Handle cookie parsing irregularity for certain Nokia phones.  #2530 *zaitzow@gmail.com*
+
+*   Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response. [Sam Stephenson]  Example:
+
+        update_page do |page|
+          page.insert_html :bottom, 'list', '<li>Last item</li>'
+          page.visual_effect :highlight, 'list'
+          page.hide 'status-indicator', 'cancel-link'
+        end
+
+    generates the following JavaScript:
+
+        new Insertion.Bottom("list", "<li>Last item</li>");
+        new Effect.Highlight("list");
+        ["status-indicator", "cancel-link"].each(Element.hide);
+
+*   Refactored JavaScriptHelper into PrototypeHelper and ScriptaculousHelper *Sam Stephenson*
+
+*   Update to latest script.aculo.us version (as of [3031])
+
+*   Updated docs for in_place_editor, fixes a couple bugs and offers extended support for external controls *Justin Palmer*
+
+*   Update documentation for render :file.  #2858 *Tom Werner*
+
+*   Only include builtin filters whose filenames match /^[a-z][a-z_]*_helper.rb$/ to avoid including operating system metadata such as ._foo_helper.rb.  #2855 *court3nay*
+
+*   Added FormHelper#form_for and FormHelper#fields_for that makes it easier to work with forms for single objects also if they don't reside in instance variables [David Heinemeier Hansson]. Examples:
+
+    <% form_for :person, @person, :url => { :action => "update" } do |f| %>
+        First name: <%= f.text_field :first_name %>
+        Last name : <%= f.text_field :last_name %>
+        Biography : <%= f.text_area :biography %>
+        Admin?    : <%= f.check_box :admin %>
+    <% end %>
+
+    <% form_for :person, person, :url => { :action => "update" } do |person_form| %>
+        First name: <%= person_form.text_field :first_name %>
+        Last name : <%= person_form.text_field :last_name %>
+
+        <% fields_for :permission => person.permission do |permission_fields| %>
+          Admin?  : <%= permission_fields.check_box :admin %>
+        <% end %>
+    <% end %>
+
+*   options_for_select allows any objects which respond_to? :first and :last rather than restricting to Array and Range.  #2824 *Jacob Robbins <jrobbins@cmj.com>, Jeremy Kemper*
+
+*   The auto_link text helper accepts an optional block to format the link text for each url and email address.  Example: auto_link(post.body) { |text| truncate(text, 10) }  *Jeremy Kemper*
+
+*   assert_tag uses exact matches for string conditions, instead of partial matches. Use regex to do partial matches. #2799 *Jamis Buck*
+
+*   CGI::Session::ActiveRecordStore.data_column_name = 'foobar' to use a different session data column than the 'data' default.  *nbpwie102@sneakemail.com*
+
+*   Do not raise an exception when default helper is missing; log a debug message instead.  It's nice to delete empty helpers.  *Jeremy Kemper*
+
+*   Controllers with acronyms in their names (e.g. PDFController) require the correct default helper (PDFHelper in file pdf_helper.rb).  #2262 *jeff@opendbms.com*
+
+
+## 1.11.0 (November 7th, 2005) ##
+
+*   Added request as instance method to views, so you can do <%= request.env["HTTP_REFERER"] %>, just like you can already access response, session, and the likes *David Heinemeier Hansson*
+
+*   Fix conflict with assert_tag and Glue gem #2255 *david.felstead@gmail.com*
+
+*   Add documentation to assert_tag indicating that it only works with well-formed XHTML #1937, #2570 *Jamis Buck*
+
+*   Added action_pack.rb stub so that ActionPack::Version loads properly *Sam Stephenson*
+
+*   Added short-hand to assert_tag so assert_tag :tag => "span" can be written as assert_tag "span" *David Heinemeier Hansson*
+
+*   Added skip_before_filter/skip_after_filter for easier control of the filter chain in inheritance hierachies [David Heinemeier Hansson]. Example:
+
+        class ApplicationController < ActionController::Base
+          before_filter :authenticate
+        end
+
+        class WeblogController < ApplicationController
+          # will run the :authenticate filter
+        end
+
+        class SignupController < ActionController::Base
+          # will not run the :authenticate filter
+          skip_before_filter :authenticate
+        end
+
+*   Added redirect_to :back as a short-hand for redirect_to(request.env["HTTP_REFERER"]) *David Heinemeier Hansson*
+
+*   Change javascript_include_tag :defaults to not use script.aculo.us loader, which facilitates the use of plugins for future script.aculo.us and third party javascript extensions, and provide register_javascript_include_default for plugins to specify additional JavaScript files to load. Removed slider.js and builder.js from actionpack. *Thomas Fuchs*
+
+*   Fix problem where redirecting components can cause an infinite loop *Rick Olson*
+
+*   Added support for the queue option on visual_effect *Thomas Fuchs*
+
+*   Update script.aculo.us to V1.5_rc4 *Thomas Fuchs*
+
+*   Fix that render :text didn't interpolate instance variables #2629, #2626 *Stefan Kaes*
+
+*   Fix line number detection and escape RAILS_ROOT in backtrace Regexp *Nicholas Seckar*
+
+*   Fixed document.getElementsByClassName from Prototype to be speedy again *Sam Stephenson*
+
+*   Recognize ./#{RAILS_ROOT} as RAILS_ROOT in error traces *Nicholas Seckar*
+
+*   Remove ARStore session fingerprinting *Nicholas Seckar*
+
+*   Fix obscure bug in ARStore *Nicholas Seckar*
+
+*   Added TextHelper#strip_tags for removing HTML tags from a string (using HTMLTokenizer) #2229 *marcin@junkheap.net*
+
+*   Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' #2422 *Caio Chassot*
+
+
+## 1.10.2 (October 26th, 2005) ##
+
+*   Reset template variables after using render_to_string *Stefan Kaes*
+
+*   Expose the session model backing CGI::Session
+
+*   Abbreviate RAILS_ROOT in traces
+
+
+## 1.10.1 (October 19th, 2005) ##
+
+*   Update error trace templates *Nicholas Seckar*
+
+*   Stop showing generated routing code in application traces *Nicholas Seckar*
+
+
+## 1.10.0 (October 16th, 2005) ##
+
+*   Make string-keys locals assigns optional. Add documentation describing depreciated state *Stefan Kaes*
+
+*   Improve line number detection for template errors *Nicholas Seckar*
+
+*   Update/clean up documentation (rdoc)
+
+*   Upgrade to Prototype 1.4.0_rc0 *Sam Stephenson*
+
+*   Added assert_vaild. Reports the proper AR error messages as fail message when the passed record is invalid *Tobias Lütke*
+
+*   Add temporary support for passing locals to render using string keys *Nicholas Seckar*
+
+*   Clean up error pages by providing better backtraces *Nicholas Seckar*
+
+*   Raise an exception if an attempt is made to insert more session data into the ActiveRecordStore data column than the column can hold. #2234.  *justin@textdrive.com*
+
+*   Removed references to assertions.rb from actionpack assert's backtraces. Makes error reports in functional unit tests much less noisy. *Tobias Lütke*
+
+*   Updated and clarified documentation for JavaScriptHelper to be more concise about the various options for including the JavaScript libs. *Thomas Fuchs*
+
+*   Hide "Retry with Breakpoint" button on error pages until feature is functional. *David Heinemeier Hansson*
+
+*   Fix Request#host_with_port to use the standard port when Rails is behind a proxy. *Nicholas Seckar*
+
+*   Escape query strings in the href attribute of URLs created by url_helper.  #2333 *Michael Schuerig <michael@schuerig.de>*
+
+*   Improved line number reporting for template errors *Nicholas Seckar*
+
+*   Added :locals support for render :inline #2463 *mdabney@cavoksolutions.com*
+
+*   Unset the X-Requested-With header when using the xhr wrapper in functional tests so that future requests aren't accidentally xhr'ed #2352 *me@julik.nl, Sam Stephenson*
+
+*   Unescape paths before writing cache to file system. #1877. *Damien Pollet*
+
+*   Wrap javascript_tag contents in a CDATA section and add a cdata_section method to TagHelper #1691 *Michael Schuerig, Sam Stephenson*
+
+*   Misc doc fixes (typos/grammar/etc). #2445. *coffee2code*
+
+*   Speed improvement for session_options. #2287. *Stefan Kaes*
+
+*   Make cacheing binary files friendly with Windows. #1975. *Rich Olson*
+
+*   Convert boolean form options form the tag_helper. #809. *Michael Schuerig <michael@schuerig.de>*
+
+*   Fixed that an instance variable with the same name as a partial should be implicitly passed as the partial :object #2269 *court3nay*
+
+*   Update Prototype to V1.4.0_pre11, script.aculo.us to [2502] *Thomas Fuchs*
+
+*   Make assert_tag :children count appropriately. Closes #2181. *jamie@bravenet.com*
+
+*   Forced newer versions of RedCloth to use hard breaks *David Heinemeier Hansson*
+
+*   Added new scriptaculous options for auto_complete_field #2343 *Manfred Stienstra*
+
+*   Don't prepend the asset host if the string is already a fully-qualified URL
+
+*   Updated to script.aculo.us V1.5.0_rc2 and Prototype to V1.4.0_pre7 *Thomas Fuchs*
+
+*   Undo condition change made in [2345] to prevent normal parameters arriving as StringIO.
+
+*   Tolerate consecutive delimiters in query parameters.  #2295 *darashi@gmail.com*
+
+*   Streamline render process, code cleaning. Closes #2294. *skae*
+
+*   Keep flash after components are rendered. #2291 *Rick Olson, Scott*
+
+*   Shorten IE file upload path to filename only to match other browsers.  #1507 *court3nay*
+
+*   Fix open/save dialog in IE not opening files send with send_file/send_data, #2279 *Thomas Fuchs*
+
+*   Fixed that auto_discovery_link_tag couldn't take a string as the URL *David Heinemeier Hansson*
+
+*   Fixed problem with send_file and WEBrick using stdout #1812 *David Heinemeier Hansson*
+
+*   Optimized tag_options to not sort keys, which is no longer necessary when assert_dom_equal and friend is available #1995 *skae*
+
+*   Added assert_dom_equal and assert_dom_not_equal to compare tags generated by the helpers in an order-indifferent manner #1995 *skae*
+
+*   Fixed that Request#domain caused an exception if the domain header wasn't set in the original http request #1795 *Michael Koziarski*
+
+*   Make the truncate() helper multi-byte safe (assuming $KCODE has been set to something other than "NONE") #2103
+
+*   Add routing tests from #1945 *ben@groovie.org*
+
+*   Add a routing test case covering #2101 *Nicholas Seckar*
+
+*   Cache relative_url_root for all webservers, not just Apache #2193 *skae*
+
+*   Speed up cookie use by decreasing string copying #2194 *skae*
+
+*   Fixed access to "Host" header with requests made by crappy old HTTP/1.0 clients #2124 *Marcel Molina Jr.*
+
+*   Added easy assignment of fragment cache store through use of symbols for included stores (old way still works too)
+
+    Before:
+        ActionController::Base.fragment_cache_store =
+          ActionController::Base::Caching::Fragments::FileStore.new("/path/to/cache/directory")
+
+    After:
+        ActionController::Base.fragment_cache_store = :file_store, "/path/to/cache/directory"
+
+*   Added ActionController::Base.session_store=, session_store, and session_options to make it easier to tweak the session options (instead of going straight to ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
+
+*   Added TextHelper#cycle to cycle over an array of values on each hit (useful for alternating row colors etc) #2154 *dave-ml@dribin.org*
+
+*   Ensure that request.path never returns nil. Closes #1675 *Nicholas Seckar*
+
+*   Add ability to specify Route Regexps for controllers. Closes #1917. *Sebastian Kanthak*
+
+*   Provide Named Route's hash methods as helper methods. Closes #1744. *Nicholas Seckar, Steve Purcell*
+
+*   Added :multipart option to ActiveRecordHelper#form to make it possible to add file input fields #2034 *jstirk@oobleyboo.com*
+
+*   Moved auto-completion and in-place editing into the Macros module and their helper counterparts into JavaScriptMacrosHelper
+
+*   Added in-place editing support in the spirit of auto complete with ActionController::Base.in_place_edit_for, JavascriptHelper#in_place_editor_field, and Javascript support from script.aculo.us #2038 *Jon Tirsen*
+
+*   Added :disabled option to all data selects that'll make the elements inaccessible for change #2167, #253 *eigentone*
+
+*   Fixed that TextHelper#auto_link_urls would include punctuation in the links #2166, #1671 *eigentone*
+
+*   Fixed that number_to_currency(1000, {:precision => 0})) should return "$1,000", instead of "$1,000." #2122 *sd@notso.net*
+
+*   Allow link_to_remote to use any DOM-element as the parent of the form elements to be submitted #2137 [erik@ruby-lang.nl]. Example:
+
+        <tr id="row023">
+          <td><input name="foo"/></td>
+          <td><input name="bar"/></td>
+          <td><%= link_to_remote 'Save', :update => "row023",
+                :submit => "row023", :url => {:action => 'save_row'} %></td>
+        </tr>
+
+*   Fixed that render :partial would fail when :object was a Hash (due to backwards compatibility issues) #2148 *Sam Stephenson*
+
+*   Fixed JavascriptHelper#auto_complete_for to only include unique items #2153 *Thomas Fuchs*
+
+*   Fixed all AssetHelper methods to work with relative paths, such that javascript_include_tag('stdlib/standard') will look in /javascripts/stdlib/standard instead of '/stdlib/standard/' #1963
+
+*   Avoid extending view instance with helper modules each request. Closes #1979
+
+*   Performance improvements to CGI methods. Closes #1980 *Stefan Kaes*
+
+*   Added :post option to UrlHelper#link_to that makes it possible to do POST requests through normal ahref links using Javascript
+
+*   Fixed overwrite_params
+
+*   Added ActionController::Base.benchmark and ActionController::Base.silence to allow for easy benchmarking and turning off the log
+
+*   Updated vendor copy of html-scanner to support better xml parsing
+
+*   Added :popup option to UrlHelper#link_to #1996 [gabriel.gironda@gmail.com]. Examples:
+
+        link_to "Help", { :action => "help" }, :popup => true
+        link_to "Busy loop", { :action => "busy" }, :popup => ['new_window', 'height=300,width=600']
+
+*   Drop trailing \000 if present on RAW_POST_DATA (works around bug in Safari Ajax implementation) #918
+
+*   Fix observe_field to fall back to event-based observation if frequency <= 0 #1916 *Michael Schubert*
+
+*   Allow use of the :with option for submit_to_remote #1936 *jon@instance-design.co.uk*
+
+*   AbstractRequest#domain returns nil when host is an ip address #2012 *Kevin Clark*
+
+*   ActionController documentation update #2051 *François Beausoleil*
+
+*   Yield @content_for_ variables to templates #2058 *Sam Stephenson*
+
+*   Make rendering an empty partial collection behave like :nothing => true #2080 *Sam Stephenson*
+
+*   Add option to specify the singular name used by pagination.
+
+*   Use string key to obtain action value. Allows indifferent hashes to be disabled.
+
+*   Added ActionView::Base.cache_template_loading back.
+
+*   Rewrote compiled templates to decrease code complexity. Removed template load caching in favour of compiled caching. Fixed template error messages. *Nicholas Seckar*
+
+*   Fix Routing to handle :some_param => nil better. *Nicholas Seckar, Luminas*
+
+*   Add support for :include with pagination (subject to existing constraints for :include with :limit and :offset) #1478 *Michael Schubert*
+
+*   Prevent the benchmark module from blowing up if a non-HTTP/1.1 request is processed
+
+*   Added :use_short_month option to select_month helper to show month names as abbreviations
+
+*   Make link_to escape the javascript in the confirm option #1964 *nicolas.pouillard@gmail.com*
+
+*   Make assert_redirected_to properly check URL's passed as strings #1910 *Scott Barron*
+
+*   Make sure :layout => false is always used when rendering inside a layout
+
+*   Use raise instead of assert_not_nil in Test::Unit::TestCase#process to ensure that the test variables (controller, request, response) have been set
+
+*   Make sure assigns are built for every request when testing #1866
+
+*   Allow remote_addr to be queried on TestRequest #1668
+
+*   Fixed bug when a partial render was passing a local with the same name as the partial
+
+*   Improved performance of test app req/sec with ~10% refactoring the render method #1823 *Stefan Kaes*
+
+*   Improved performance of test app req/sec with 5-30% through a series of Action Pack optimizations #1811 *Stefan Kaes*
+
+*   Changed caching/expiration/hit to report using the DEBUG log level and errors to use the ERROR log level instead of both using INFO
+
+*   Added support for per-action session management #1763
+
+*   Improved rendering speed on complicated templates by up to 100% (the more complex the templates, the higher the speedup) #1234 [Stefan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
+
+*   Added options hash as third argument to FormHelper#input, so you can do input('person', 'zip', :size=>10) #1719 *jeremye@bsa.ca.gov*
+
+*   Added Base#expires_in(seconds)/Base#expires_now to control HTTP content cache headers #1755 *Thomas Fuchs*
+
+*   Fixed line number reporting for Builder template errors #1753 *piotr*
+
+*   Fixed assert_routing so that testing controllers in modules works as expected *Nicholas Seckar, Rick Olson*
+
+*   Fixed bug with :success/:failure callbacks for the JavaScriptHelper methods #1730 *court3nay/Thomas Fuchs*
+
+*   Added named_route method to RouteSet instances so that RouteSet instance methods do not prevent certain names from being used. *Nicholas Seckar*
+
+*   Fixed routes so that routes which do not specify :action in the path or in the requirements have a default of :action => 'index', In addition, fixed url generation so that :action => 'index' does not need to be provided for such urls. *Nicholas Seckar, Markjuh*
+
+*   Worked around a Safari bug where it wouldn't pass headers through if the response was zero length by having render :nothing return ' ' instead of ''
+
+*   Fixed Request#subdomains to handle "foo.foo.com" correctly
+
+
+## 1.9.1 (11 July, 2005) ##
+
+*   Fixed that auto_complete_for didn't force the input string to lower case even as the db comparison was
+
+*   Fixed that Action View should always use the included Builder, never attempt to require the gem, to ensure compatibility
+
+*   Added that nil options are not included in tags, so tag("p", :ignore => nil) now returns <p /> not <p ignore="" />  but that tag("p", :ignore => "") still includes it #1465 *Michael Schuerig*
+
+*   Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 *joergd@pobox.com*
+
+*   Improved error message for DoubleRenderError
+
+*   Fixed routing to allow for testing of *path components #1650 *Nicholas Seckar*
+
+*   Added :handle as an option to sortable_element to restrict the drag handle to a given class #1642 *thejohnny*
+
+*   Added a bunch of script.aculo.us features #1644, #1677, #1695 *Thomas Fuchs*
+    * Effect.ScrollTo, to smoothly scroll the page to an element
+    * Better Firefox flickering handling on SlideUp/SlideDown
+    * Removed a possible memory leak in IE with draggables
+    * Added support for cancelling dragging my hitting ESC
+    * Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt)
+    * Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances)
+    * Removed circular references from element to prevent memory leaks (still not completely gone in IE)
+    * Changes to class extension in effects.js
+    * Make Effect.Highlight restore any previously set background color when finishing (makes effect work with CSS classes that set a background color)
+    * Fixed myriads of memory leaks in IE and Gecko-based browsers *David Zülke*
+    * Added incremental and local autocompleting and loads of documentation to controls.js *Ivan Krstic*
+    * Extended the auto_complete_field helper to accept tokens option
+    * Changed object extension mechanism to favor Object.extend to make script.aculo.us easily adaptable to support 3rd party libs like IE7.js *David Zülke*
+
+*   Fixed that named routes didn't use the default values for action and possible other parameters #1534 *Nicholas Seckar*
+
+*   Fixed JavascriptHelper#visual_effect to use camelize such that :blind_up will work #1639 *pelletierm@eastmedia.net*
+
+*   Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers. This means that it's no longer necessary to use the 'model :post' work-around in ApplicationController to have a Post model in your session.
+
+
+## 1.9.0 (6 July, 2005) ##
+
+*   Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions)
+
+*   Added javascript_include_tag :defaults shortcut that'll include all the default javascripts included with Action Pack (prototype, effects, controls, dragdrop)
+
+*   Cache several controller variables that are expensive to calculate #1229 *Stefan Kaes*
+
+*   The session class backing CGI::Session::ActiveRecordStore may be replaced with any class that duck-types with a subset of Active Record.  See docs for details #1238 *Stefan Kaes*
+
+*   Fixed that hashes was not working properly when passed by GET to lighttpd #849 *Nicholas Seckar*
+
+*   Fixed assert_template nil will be true when no template was rendered #1565 *maceywj@telus.net*
+
+*   Added :prompt option to FormOptions#select (and the users of it, like FormOptions#select_country etc) to create "Please select" style descriptors #1181 *Michael Schuerig*
+
+*   Added JavascriptHelper#update_element_function, which returns a Javascript function (or expression) that'll update a DOM element according to the options passed #933 [mortonda@dgrmm.net]. Examples:
+
+        <%= update_element_function("products", :action => :insert, :position => :bottom, :content => "<p>New product!</p>") %>
+
+        <% update_element_function("products", :action => :replace, :binding => binding) do %>
+          <p>Product 1</p>
+          <p>Product 2</p>
+        <% end %>
+
+*   Added :field_name option to DateHelper#select_(year|month|day) to deviate from the year/month/day defaults #1266 *Marcel Molina Jr.*
+
+*   Added JavascriptHelper#draggable_element and JavascriptHelper#drop_receiving_element to facilitate easy dragging and dropping through the script.aculo.us libraries #1578 *Thomas Fuchs*
+
+*   Added that UrlHelper#mail_to will now also encode the default link title #749 *f.svehla@gmail.com*
+
+*   Removed the default option of wrap=virtual on FormHelper#text_area to ensure XHTML compatibility #1300 *thomas@columbus.rr.com*
+
+*   Adds the ability to include XML CDATA tags using Builder #1563 [Josh Knowles]. Example:
+
+        xml.cdata! "some text" # => <![CDATA[some text]]>
+
+*   Added evaluation of SCRIPT blocks in content returned to Ajax calls #1577 *Thomas Fuchs/court3nay/Sean Treadway*
+
+*   Directly generate paths with a leading slash instead of tacking it on later.  #1543 *Nicholas Seckar*
+
+*   Fixed errant parameter modification in functional tests.  #1542 *Nicholas Seckar*
+
+*   Routes fail with leading slash #1540 *Nicholas Seckar*
+
+*   Added support for graceful error handling of Ajax calls #1217 [Jamis Buck/Thomas Fuchs]. Example:
+
+        link_to_remote(
+          "test",
+          :url => { :action => "faulty" },
+          :update => { :success => "good", :failure => "bad" },
+          403 => "alert('Forbidden- got ya!')",
+          404 => "alert('Nothing there...?')",
+          :failure => "alert('Unkown error ' + request.status)")
+
+*   Attempt to explicitly flush the output at the end of CgiProcess#out
+
+*   Fixed assert_redirected_to to handle absolute controller paths properly #1472 *Rick Olson/Nicholas Seckar*
+
+*   Added event-based observations when frequency is not set on observe_field/form #1474 *flash@vanklinkenbergsoftware.nl*
+
+*   Added script.aculo.us Javascripts (controls.js, dragdrop.js, effects.js) (NEEDS MORE DESCRIPTION) #1509 *Thomas Fuchs*
+
+*   Fixed prototype to consider all fields it doesn't know as text (such as Safari's search) just like the browser in its serialization #1497 *Sean Treadway*
+
+*   Improved performance of Routes generation by a factor of 5 #1434 *Nicholas Seckar*
+
+*   Added named routes (NEEDS BETTER DESCRIPTION) #1434 *Nicholas Seckar*
+
+*   Improved AbstractRequest documentation #1483 *court3nay*
+
+*   Added ActionController::Base.allow_concurrency to control whether the application is thread-safe, so multi-threaded servers like WEBrick knows whether to apply a mutex around the performance of each action. Turned off by default. EXPERIMENTAL FEATURE.
+
+*   Added TextHelper#word_wrap(text, line_length = 80) #1449 *tuxie@dekadance.se*
+
+*   Added a fall-through action for form_remote_tag that'll be used in case Javascript is unavailable #1459 [Scott Barron]. Example:
+
+        form_remote_tag :html => { :action => url_for(:controller => "some", :action => "place") }
+
+*   Added :xhr => true/false option to verify so you can ensure that a request is coming from an Ajax call or not #1464 *Thomas Fuchs*
+
+*   Added tag_options as a third parameter to AssetHelper#auto_discovery_link_tag to control options like the title of the link #1430 *Kevin Clark*
+
+*   Added option to pass in parameters to CaptureHelper#capture, so you can create more advanced view helper methods #1466 [duane.johnson@gmail.com]. Example:
+
+        <% show_calendar(:year => 2005, :month => 6) do |day, options| %>
+          <% options[:bgcolor] = '#dfd' if 10..15.include? day %>
+          [<%= day %>]
+        <% end %>
+
+*   Changed the default name of the input tag generated by FormTagHelper#submit_tag from "submit" to "commit" so it doesn't clash with form.submit() calls in Javascript #1271
+
+*   Fixed relative urls support for lighttpd #1048 *Nicholas Seckar/maznawak@nerim.net*
+
+*   Correct distance_of_time_in_words for integer arguments and make the second arg optional, treating the first arg as a duration in seconds.  #1458 *madrobby <thomas@fesch.at>*
+
+*   Fixed query parser to deal gracefully with equal signs inside keys and values #1345 [gorou].
+    Example: /?sig=abcdef=:foobar=&x=y will pass now.
+
+*   Added Cuba to country list #1351 *todd*
+
+*   Fixed radio_button to work with numeric values #1352 *demetrius*
+
+*   Added :extension option to NumberHelper#number_to_phone #1361 *delynnb*
+
+*   Added button_to as a form-based solution to deal with harmful actions that should be hidden behind POSTs. This makes it just as easy as link_to to create a safe trigger for actions like destroy, although it's limited by being a block element, the fixed look, and a no-no inside other forms. #1371 *tom@moertel.com*
+
+*   Fixed image_tag so an exception is not thrown just because the image is missing and alt value can't be generated #1395 *Marcel Molina Jr.*
+
+*   Added a third parameter to TextHelper#auto_link called href_options for specifying additional tag options on the links generated #1401 [tyler.kovacs@gmail.com]. Example: auto_link(text, :all, { :target => "_blank" }) to have all the generated links open in a new window.
+
+*   Fixed TextHelper#highlight to return the text, not nil, if the phrase is blank #1409 *Patrick Lenz*
+
+*   Fixed TagHelper such that :name and 'name' keys in the options doesn't result in two attributes #1455 *take_tk*
+
+*   Ensure that helpers are only available to the controllers where they are defined and their subclasses.  #1394 *kdole@tamu.edu*
+
+*   render("foo/bar") works with a layout again
+
+*   Fixed double-singularization on scaffolded pagination call (Address would be turned into Addres) #1216, #1404 *nilsga*
+
+*   Removed the require hack used by functional testing to work around an earlier bug in rake.
+
+*   Allow distance_of_time_in_words to work with any value that responds to #to_time (like dates) #969
+
+*   Support :render option for :verify #1440 *Tobias Lütke*
+
+*   Updated vendor copy of html-scanner lib to 0.5.2, for bug fixes and optimizations. The :content option may be used as expected--to find a tag whose textual content is a particular value--in assert_tag, now.
+
+*   Changed test requests to come from 0.0.0.0 instead of 127.0.0.1 such that they don't trigger debugging screens on exceptions, but instead call rescue_action_in_public
+
+*   Modernize scaffolding to match the generator: use the new render method and change style from the warty @params["id"] to the sleek params[:id].  #1367
+
+*   Include :id in the action generated by the form helper method.  Then, for example, the controller can do Model.find(params[:id]) for both edit and update actions.  Updated scaffolding to take advantage.  #1367
+
+*   Add assertions with friendly messages to TestCase#process to ensure that @controller, @request, and @response are set.  #1367
+
+*   Arrays, hashes sent via multipart posts are converted to strings #1032 *dj@omelia.org, me@julik.nl*
+
+*   render(:layout => true) is a synonym for render(:layout => nil)
+
+*   Make sure the benchmarking render method always returns the output of the render.
+
+*   render(:action), render(:template) and render() are the only three calls that default to using a layout. All other render calls assume :layout => false. This also fixes send_file, which was applying a layout if one existed for the current action.
+
+*   verify with :redirect_to won't redirect if a redirect or render has already been performed #1350
+
+*   render(:partial => true) is identical to the behavior of the deprecated render_partial()
+
+*   Fixed render(:partial => "...") to use an empty Hash for the local assigns #1365
+
+*   Fixed Caching::Fragments::FileStore.delete to not raise an exception if the delete fails.
+
+*   Deprecated all render_* methods in favor of consolidating all rendering behavior in Base#render(options). This enables more natural use of combining options, such as layouts. Examples:
+
+        +---------------------------------------------------------------+-------------------------------------------------------+
+        | BEFORE                                                        | AFTER                                                 |
+        +---------------------------------------------------------------+-------------------------------------------------------+
+        | render_with_layout "weblog/show", "200 OK", "layouts/dialog"  | render :action => "show", :layout => "dialog"         |
+        | render_without_layout "weblog/show"                           | render :action => "show", :layout => false            |
+        | render_action "error", "404 Not Found"                        | render :action => "error", :status => "404 Not Found" |
+        | render_template "xml.div('stuff')", "200 OK", :rxml           | render :inline => "xml.div('stuff')", :type => :rxml  |
+        | render_text "hello world!"                                    | render :text => "hello world!"                        |
+        | render_partial_collection "person", @people, nil, :a => 1     | render :partial => "person", :collection => @people,  |
+        |                                                               |        :locals => { :a => 1 }                         |
+        +---------------------------------------------------------------+-------------------------------------------------------+
+
+*   Deprecated redirect_to_path and redirect_to_url in favor of letting redirect_to do the right thing when passed either a path or url.
+
+*   Fixed use of an integer as return code for renders, so render_text "hello world", 404 now works #1327
+
+*   Fixed assert_redirect_to to work with redirect_to_path #869 *Nicholas Seckar*
+
+*   Fixed escaping of :method option in remote_form_tag #1218 *Rick Olson*
+
+*   Added Serbia and Montenegro to the country_select #1239 *todd@robotcoop.com*
+
+*   Fixed Request#remote_ip in testing #1251 *Jeremy Kemper*
+
+*   Fixed that compute_public_path should recognize external URLs, so image_tag("http://www.example.com/images/icon.gif") is not prefixed with the relative url path #1254 *victor-ronr-trac@carotena.net*
+
+*   Added support for descending year values in DateHelper#select_year, like select_year(Date.today, :start_year => 2005, :end_year => 1900), which would count down from 2005 to 1900 instead of the other way #1274 *nwoods@mail.com*
+
+*   Fixed that FormHelper#checkbox should return a checked checkbox if the value is the same as checked_value #1286 *Florian Weber*
+
+*   Fixed Form.disable in Prototype #1317 *Wintermute*
+
+*   Added accessors to logger, params, response, session, flash, and headers from the view, so you can write <% logger.info "stuff" %> instead of <% @logger.info "others" %> -- more consistent with the preferred way of accessing these attributes and collections from the controller
+
+*   Added support for POST data in form of YAML or XML, which is controller through the Content-Type header. Example request:
+
+        Content-Type: application/xml
+        <request><item><content>HelloWorld</content></item></request>
+
+    ...is the same as:
+
+        Content-Type: application/x-yaml
+        ---
+        item:
+          content: HelloWorld
+
+    ...is the same as:
+
+        item[content]=HelloWorld
+
+    Which in the end turns into { "item" => { "content" => "HelloWorld" } }. This makes it a lot easier to publish REST web services on top of your regular actions (as they won't care).
+
+    Example Curl call:
+
+        curl -H 'Content-Type: application/xml' -d '<request><item><content>KillMeMore</content></item></request>' http://www.example.com/service
+
+    You can query to find out whether a given request came through as one of these types with:
+        - request.post_format? (:url_encoded, :xml or :yaml)
+        - request.formatted_post? (for either xml or yaml)
+        - request.xml_post?
+        - request.yaml_post?
+
+*   Added bundling of XmlSimple by Maik Schmidt
+
+*   Fixed that render_partial_collection should always return a string (and not sometimes an array, despite <%= %> not caring)
+
+*   Added TextHelper#sanitize that can will remove any Javascript handlers, blocks, and forms from an input of HTML.  This allows for use of HTML on public sites, but still be free of XSS issues. #1277 *Jamis Buck*
+
+*   Fixed the HTML scanner used by assert_tag where a infinite loop could be caused by a stray less-than sign in the input #1270 *Jamis Buck*
+
+*   Added functionality to assert_tag, so you can now do tests on the siblings of a node, to assert that some element comes before or after the element in question, or just to assert that some element exists as a sibling #1226 *Jamis Buck*
+
+*   Added better error handling for regexp caching expiration
+
+*   Fixed handling of requests coming from unknown HTTP methods not to kill the server
+
+*   Added that both AssetHelper#stylesheet_link_tag and AssetHelper#javascript_include_tag now accept an option hash as the last parameter, so you can do stuff like: stylesheet_link_tag "style", :media => "all"
+
+*   Added FormTagHelper#image_submit_tag for making submit buttons that uses images
+
+*   Added ActionController::Base.asset_host that will then be used by all the asset helpers. This enables you to easily offload static content like javascripts and images to a separate server tuned just for that.
+
+*   Fixed action/fragment caching using the filestore when a directory and a file wanted to use the same name. Now there's a .cache prefix that sidesteps the conflict #1188 *imbcmdth@hotmail.com*
+
+*   Fixed missing id uniqueness in FormTag#radio_button #1207 *Jarkko Laine*
+
+*   Fixed assert_redirected_to to work with :only_path => false #1204 *Alisdair McDiarmid*
+
+*   Fixed render_partial_collection to output an empty string instead of nil when handed an empty array #1202 *Ryan Carver*
+
+*   Improved the speed of regular expression expirations for caching by a factor of 10 #1221 *Jamis Buck*
+
+*   Removed dumping of template assigns on the rescue page as it would very easily include a ton of data making page loads take seconds (and the information was rarely helpful) #1222
+
+*   Added BenchmarkHelper that can measure the execution time of a block in a template and reports the result to the log. Example:
+
+        <% benchmark "Notes section" do %>
+          <%= expensive_notes_operation %>
+        <% end %>
+
+     Will add something like "Notes section (0.345234)" to the log.
+
+*   Added ActionController::Caching::Sweeper as an improved an easier to use sweeper. The new sweepers work on a single-step approach instead of two-steps like the old ones. Before
+
+        def after_save(record)
+          @list = record.is_a?(List) ? record : record.list
+        end
+
+        def filter(controller)
+          controller.expire_page(:controller => "lists", :action => %w( show public feed ), :id => @list.id)
+          controller.expire_action(:controller => "lists", :action => "all")
+          @list.shares.each { |share| controller.expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
+        end
+
+    ..after:
+
+        def after_save(record)
+          list = record.is_a?(List) ? record : record.list
+          expire_page(:controller => "lists", :action => %w( show public feed ), :id => list.id)
+          expire_action(:controller => "lists", :action => "all")
+          list.shares.each { |share| expire_page(:controller => "lists", :action => "show", :id => share.url_key) }
+        end
+
+    The new sweepers can also observe on the actions themselves by implementing methods according to (before|after)_$controller_$action. Example of a callback that'll be called after PagesController#update_title has been performed:
+
+          def after_pages_update_title
+            expire_fragment(%r{pages/#{controller.assigns["page"].id}/.*})
+          end
+
+    Note that missing_method is delegated to the controller instance, which is assigned in a before filter. This means that you can call expire_fragment instead of @controller.expire_fragment.
+
+*   Added that Fragments#expire_fragment now accepts as a regular expression as the name thereby deprecating expire_matched_fragments
+
+*   Fixed that fragments shouldn't use the current host and the path as part of the key like pages does
+
+*   Added conditions to around_filters just like before_filter and after_filter
+
+
+## 1.8.1 (20th April, 2005) ##
+
+*   Added xml_http_request/xhr method for simulating XMLHttpRequest in functional tests #1151 [Sam Stephenson]. Example:
+
+        xhr :post, :index
+
+*   Fixed that Ajax.Base.options.asynchronous wasn't being respected in Ajax.Request (thanks Jon Casey)
+
+*   Fixed that :get, :post, and the others should take a flash array as the third argument just like process #1144 *rails@cogentdude.com*
+
+*   Fixed a problem with Flash.now
+
+*   Fixed stringification on all assigned hashes. The sacrifice is that assigns[:person] won't work in testing. Instead assigns["person"] or assigns(:person) must be used. In other words, the keys of assigns stay strings but we've added a method-based accessor to appease the need for symbols.
+
+*   Fixed that rendering a template would require a connection to the database #1146
+
+
+## 1.8.0 (19th April, 2005) ##
+
+*   Added assert_tag and assert_no_tag as a much improved alternative to the deprecated assert_template_xpath_match #1126 *Jamis Buck*
+
+*   Deprecated the majority of all the testing assertions and replaced them with a much smaller core and access to all the collections the old assertions relied on. That way the regular test/unit assertions can be used against these. Added documentation about how to use it all.
+
+*   Added a wide range of new Javascript effects:
+        * Effect.Puff zooms the element out and makes it smoothly transparent at the same time, giving a "puff" illusion #996 [thomas@fesch.at]
+          After the animation is completed, the display property will be set to none.
+          This effect will work on relative and absolute positioned elements.
+
+        * Effect.Appear as the opposite of Effect.Fade #990 [thomas@fesch.at]
+          You should return elements with style="display:none;" or a like class for this to work best and have no chance of flicker.
+
+        * Effect.Squish for scaling down an element and making it disappear at the end #972 [thomas@fesch.at]
+
+        * Effect.Scale for smoothly scaling images or text up and down #972 [thomas@fesch.at]
+
+        * Effect.Fade which smoothly turns opacity from 100 to 0 and then hides the element #960 [thomas@fesch.at]
+
+*   Added Request#xml_http_request? (and an alias xhr?) to that'll return true when the request came from one of the Javascript helper methods (Ajax). This can be used to give one behavior for modern browsers supporting Ajax, another to old browsers #1127 *Sam Stephenson*
+
+*   Changed render_partial to take local assigns as the second parameter instead of an explicit object and then the assigns. So the API changes from:
+
+        <%= render_partial "account", person, "rules" => regulations.rules %>
+
+    ...to:
+
+        <%= render_partial "account", :account => person, :rules => regulations.rules %>
+
+    The old API will still work, though, and render_partial "account" will still assume :account => @account.
+
+*   Added support for web servers that use PATH_INFO instead of REQUEST_URI like IIS #1014 *BradG/Nicholas Seckar*
+
+*   Added graceful handling of PUT, DELETE, and OPTIONS requests for a complete coverage of REST functionality #1136 *Josh Knowles*
+
+*   Fixed that you can now pass an alternative :href option to link_to_function/remote in order to point to somewhere other than # if the javascript fails or is turned off. You can do the same with form_remote_tag by passing in :action. #1113 *Sam Stephenson*
+
+*   Fixed DateHelper to return values on the option tags such that they'll work properly in IE with form_remote_tag #1024 *Scott Raymond*
+
+*   Fixed FormTagHelper#check_box to respect checked #1049 *DelynnB*
+
+*   Added that render_partial called from a controller will use the action name as default #828 *Dan Peterson*
+
+*   Added Element.toggle, Element.show, and Element.hide to the prototype javascript library. Toggle.display has been deprecated, but will still work #992 *Lucas Carlson*
+
+*   Added that deleting a cookie should not just set it to an empty string but also instantly expire it #1118 *todd@robotcoop.com*
+
+*   Added AssetTagHelper#image_path, AssetTagHelper#javascript_path, and AssetTagHelper#stylesheet_path #1110 *Larry Halff*
+
+*   Fixed url_for(nil) in functional tests #1116 *Alisdair McDiarmid*
+
+*   Fixed error handling of broken layouts #1115 *Michael Schubert*
+
+*   Added submit_to_remote that allows you to trigger an Ajax form submition at the click of the submission button, which allows for multiple targets in a single form through the use of multiple submit buttons #930 *yrashk@gmail.com*
+
+*   Fixed pagination to work with joins #1034 *scott@sigkill.org*
+
+*   Fixed that *rest parameter in map.connect couldn't accept an empty list #1037 *Dee Zsombor*
+
+*   Added :confirm option to link_to_remote just like link_to has #1082 *yrashk@fp.org.ua*
+
+*   Added minute_step as an option to select_minute (and the helpers that use it) to jump in larger increments than just 1 minute. At 15, it would return 0, 15, 30, 45 options #1085 *ordwaye@evergreen.edu*
+
+*   Fixed that an exception would be thrown when an empty form was submitted #1090 *jan@ulbrich-boerwang.de*
+
+*   Moved TextHelper#human_size to NumberHelper#number_to_human_size, but kept an deprecated alias to the old method name
+
+*   Fixed that the content-type for some browsers could include an additional \r which made wonky things happen #1067 *Thomas Fuchs*
+
+*   Fixed that radio buttons shouldn't have a default size attribute #1074 *hendrik@mans.de*
+
+*   Added ActionView::Helpers::InstanceTag::DEFAULT_RADIO_OPTIONS that contains a hash of default options for radio buttons #1074 *hendrik@mans.de*
+
+*   Fixed that in some circumstances controllers outside of modules may have hidden ones inside modules. For example, admin/content might have been hidden by /content. #1075 *Nicholas Seckar*
+
+*   Added JavascriptHelper#periodically_call_remote in order to create areas of a page that update automatically at a set interval #945 *Jon Tirsen*
+
+*   Fixed Cache#expire_matched_fragments that couldn't recognize the difference between string and url_for options #1030 *Stefan Kaes*
+
+*   Added simulation of @request.request_uri in functional tests #1038 *Jamis Buck*
+
+*   Fixed autolinking to work better in more cases #1013 *Jamis Buck*
+
+*   Added the possible of using symbols in form helpers that relate to instance variables like text_field :account, :name in addition to text_field "account", "name"'
+
+*   Fixed javascript_include_tag to output type instead of language and conform to XHTML #1018 *Rick Olson*
+
+*   Added NumberHelper for common string representations like phone number, currency, and percentage #1015 *DeLynn*
+
+*   Added pagination for scaffolding (10 items per page) #964 *mortonda@dgrmm.net*
+
+*   Added assert_no_cookie and fixed assert_cookie_equal to deal with non-existing cookies #979 *Jeremy Kemper*
+
+*   Fixed :overwrite_param so it doesn't delete but reject elements from @request.parameters #982 *raphinou@yahoo.com*
+
+*   Added :method option to verify for ensuring that either GET, POST, etc is allowed #984 *Jamis Buck*
+
+*   Added options to set cc, bcc, subject, and body for UrlHelper#mail_to #966 *DeLynn*
+
+*   Fixed include_blank for select_hour/minute/second #527 *edward@debian.org*
+
+*   Improved the message display on the exception handler pages #963 *Johan Sorensen*
+
+*   Fixed that on very rare occasions, webrick would raise a NoMethodError: private method 'split' called for nil #1001 *Flurin Egger*
+
+*   Fixed problem with page caching #958 *Rick Olson*
+
+
+## 1.7.0 (27th March, 2005) ##
+
+*   Added ActionController::Base.page_cache_extension for setting the page cache file extension (the default is .html) #903 *Andreas*
+
+*   Fixed "bad environment variable value" exception caused by Safari, Apache, and Ajax calls #918
+
+*   Fixed that pagination_helper would ignore :params #947 *Sebastian Kanthak*
+
+*   Added :owerwrite_params back to url_for and friends -- it was AWL since the introduction of Routes #921 *raphinou*
+
+*   Added :position option to link_to_remote/form_remote_tag that can be either :before, :top, :bottom, or :after and specifies where the return from the method should be inserted #952 *Matthew McCray/Sam Stephenson*
+
+*   Added Effect.Highlight to prototype.js to do Yellow Fade Technique (of 37signals' fame) on any container #952 *Sam Stephenson/court3nay*
+
+*   Added include_seconds option as the third parameter to distance_of_time_in_words which will render "less than a minute" in higher resolution ("less than 10 seconds" etc) #944 *thomas@fesch.at*
+
+*   Added fourth option to process in test cases to specify the content of the flash #949 *Jamis Buck*
+
+*   Added Verifications that allows you to specify preconditions to actions in form of statements like <tt>verify :only => :update_post, :params => "admin_privileges", :redirect_to => { :action => "settings" }</tt>, which ensure that the update_post action is only called if admin_privileges is available as a parameter -- otherwise the user is redirected to settings. #897 *Jamis Buck*
+
+*   Fixed Form.Serialize for the JavascriptHelper to also seriliaze password fields #934 *dweitzman@gmail.com*
+
+*   Added JavascriptHelper#escape_javascript as a public method (was private) and made it escape both single and double quotes and new lines #940 *mortonda@dgrmm.net*
+
+*   Added trailing_slash option to url_for, so you can generate urls ending in a slash. Note that is currently not recommended unless you need it for special reasons since it breaks caching #937 *stian@grytoyr.net*
+
+*   Added expire_matched_fragments(regular_expression) to clear out a lot of fragment caches at once #927 *Rick Olson*
+
+*   Fixed the problems with : and ? in file names for fragment caches on Windows #927 *Rick Olson*
+
+*   Added TextHelper#human_size for formatting file sizes, like human_size(1234567) => 1.2 MB #943 *thomas@fesch.at*
+
+*   Fixed link_to :confirm #936 *Nicholas Seckar*
+
+*   Improved error reporting especially around never shallowing exceptions. Debugging helpers should be much easier now #980 *Nicholas Seckar*
+
+*   Fixed Toggle.display in prototype.js #902 *Lucas Carlson*
+
+
+## 1.6.0 (22th March, 2005) ##
+
+*   Added a JavascriptHelper and accompanying prototype.js library that opens the world of Ajax to Action Pack with a large array of options for dynamically interacting with an application without reloading the page #884 *Sam Stephenson/David*
+
+*   Added pagination support through both a controller and helper add-on #817 *Sam Stephenson*
+
+*   Fixed routing and helpers to make Rails work on non-vhost setups #826 *Nicholas Seckar/Tobias Lütke*
+
+*   Added a much improved Flash module that allows for finer-grained control on expiration and allows you to flash the current action #839 [Caio Chassot]. Example of flash.now:
+
+        class SomethingController < ApplicationController
+          def save
+            ...
+            if @something.save
+              # will redirect, use flash
+              flash[:message] = 'Save successful'
+              redirect_to :action => 'list'
+            else
+              # no redirect, message is for current action, use flash.now
+              flash.now[:message] = 'Save failed, review'
+              render_action 'edit'
+            end
+          end
+        end
+
+*   Added to_param call for parameters when composing an url using url_for from something else than strings #812 [Sam Stephenson]. Example:
+
+        class Page
+          def initialize(number)
+            @number = number
+          end
+          # ...
+          def to_param
+            @number.to_s
+          end
+        end
+
+    You can now use instances of Page with url_for:
+
+        class BarController < ApplicationController
+          def baz
+            page = Page.new(4)
+            url = url_for :page => page # => "http://foo/bar/baz?page=4"
+          end
+        end
+
+*   Fixed form helpers to query Model#id_before_type_cast instead of Model#id as a temporary workaround for Ruby 1.8.2 warnings #818 *DeLynn B*
+
+*   Fixed TextHelper#markdown to use blank? instead of empty? so it can deal with nil strings passed #814 *Johan Sörensen*
+
+*   Added TextHelper#simple_format as a non-dependency text presentation helper #814 *Johan Sörensen*
+
+*   Added that the html options disabled, readonly, and multiple can all be treated as booleans. So specifying <tt>disabled => :true</tt> will give <tt>disabled="disabled"</tt>. #809 *mindel*
+
+*   Added path collection syntax for Routes that will gobble up the rest of the url and pass it on to the controller #830 [rayners]. Example:
+
+        map.connect 'categories/*path_info', :controller => 'categories', :action => 'show'
+
+    A request for /categories/top-level-cat, would give @params[:path_info] with "top-level-cat".
+    A request for /categories/top-level-cat/level-1-cat, would give @params[:path_info] with "top-level-cat/level-1-cat" and so forth.
+
+    The @params[:path_info] return is really an array, but where to_s has been overwritten to do join("/").
+
+*   Fixed options_for_select on selected line issue #624 *Florian Weber*
+
+*   Added CaptureHelper with CaptureHelper#capture and CaptureHelper#content_for. See documentation in helper #837 *Tobias Lütke*
+
+*   Fixed :anchor use in url_for #821 *Nicholas Seckar*
+
+*   Removed the reliance on PATH_INFO as it was causing problems for caching and inhibited the new non-vhost support #822 *Nicholas Seckar*
+
+*   Added assigns shortcut for @response.template.assigns to controller test cases [Jeremy Kemper]. Example:
+
+    Before:
+
+        def test_list
+          assert_equal 5, @response.template.assigns['recipes'].size
+          assert_equal 8, @response.template.assigns['categories'].size
+        end
+
+    After:
+
+        def test_list
+          assert_equal 5, assigns(:recipes).size
+          assert_equal 8, assigns(:categories).size
+        end
+
+*   Added TagHelper#image_tag and deprecated UrlHelper#link_image_to (recommended approach is to combine image_tag and link_to instead)
+
+*   Fixed textilize to be resilient to getting nil parsed (by using Object#blank? instead of String#empty?)
+
+*   Fixed that the :multipart option in FormTagHelper#form_tag would be ignored *Yonatan Feldman*
+
+
+## 1.5.1 (7th March, 2005) ##
+
+*   Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 *piotr@t-p-l.com*
+
+*   Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 *Jamis Buck*
+
+*   Added shortcut :id assignment to render_component and friends (before you had to go through :params) #784 *Lucas Carlson*
+
+*   Fixed that map.connect should convert arguments to strings #780 *Nicholas Seckar*
+
+*   Added UrlHelper#link_to_if/link_to_unless to enable other conditions that just link_to_unless_current #757 *mindel*
+
+*   Fixed that single quote was not escaped in a UrlHelper#link_to javascript confirm #549 *Scott Barron*
+
+*   Removed the default border on link_image_to (it broke xhtml strict) -- can be specified with :border => 0 #517 *?/caleb*
+
+*   Fixed that form helpers would treat string and symbol keys differently in html_options (and possibly create duplicate entries) #112 *Jeremy Kemper*
+
+*   Fixed that broken pipe errors (clients disconnecting in mid-request) could bring down a fcgi process
+
+*   Added the original exception message to session recall errors (so you can see which class wasnt required)
+
+*   Fixed that RAILS_ROOT might not be defined when AP was loaded, so do a late initialization of the ROUTE_FILE #761 *Scott Barron*
+
+*   Fix request.path_info and clear up LoadingModule behavior #754 *Nicholas Seckar*
+
+*   Fixed caching to be aware of extensions (so you can cache files like api.wsdl or logo.png) #734 *Nicholas Seckar*
+
+*   Fixed that Routes would raise NameErrors if a controller component contains characters that are not valid constant names #733 *Nicholas Seckar*
+
+*   Added PATH_INFO access from the request that allows urls like the following to be interpreted by rails: http://www.example.com/dispatcher.cgi/controller/action -- that makes it possible to use rails as a CGI under lighttpd and would also allow (for example) Rublog to be ported to rails without breaking existing links to Rublog-powered blogs. #728 *Jamis Buck*
+
+*   Fixed that caching the root would result in .html not index.html #731, #734 *alisdair/Nicholas Seckar*
+
+
+## 1.5.0 (24th February, 2005) ##
+
+*   Added Routing as a replacement for mod_rewrite pretty urls [Nicholas Seckar]. Read more in ActionController::Base.url_for and on http://manuals.rubyonrails.com/read/book/9
+
+*   Added components that allows you to call other actions for their rendered response while execution another action. You can either delegate the entire response rendering or you can mix a partial response in with your other content. Read more on http://manuals.rubyonrails.com/read/book/14
+
+*    Fixed that proxy IPs do not follow all RFC1918 nets #251 *caleb@aei-tech.com*
+
+*   Added Base#render_to_string to parse a template and get the result back as a string #479
+
+*   Fixed that send_file/data can work even if render* has been called before in action processing to render the content of a file to be send for example #601
+
+*   Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Support #688 *Jamis Buck*
+
+*   Added FormHelper#file_field and FormTagHelper#file_field_tag for creating file upload fields
+
+*   Added :order option for date_select that allows control over the order in which the date dropdowns is used and which of them should be used #619 [Tim Bates]. Examples:
+
+        date_select("post", "written_on", :order => [:day, :month, :year])
+        date_select("user", "birthday",   :order => [:month, :day])
+
+*   Added ActionView::Base.register_template_handler for easy integration of an alternative template language to ERb and Builder. See test/controller/custom_handler_test.rb for a usage example #656 *Jamis Buck*
+
+*   Added AssetTagHelper that provides methods for linking a HTML page together with other assets, such as javascripts, stylesheets, and feeds.
+
+*   Added FormTagHelper that provides a number of methods for creating form tags that doesn't rely on conventions with an object assigned to the template like FormHelper does. With the FormTagHelper, you provide the names and values yourself.
+
+*   Added Afghanistan, Iran, and Iraq to the countries list used by FormOptions#country_select and FormOptions#country_options_for_select
+
+*   Renamed link_to_image to link_image_to (since thats what it actually does) -- kept alias for the old method name
+
+*   Fixed textilize for RedCloth3 to keep doing hardbreaks
+
+*   Fixed that assert_template_xpath_matches did not indicate when a path was not found #658 *Eric Hodel*
+
+*   Added TextHelper#auto_link to turn email addresses and urls into ahrefs
+
+*   Fixed that on validation errors, scaffold couldn't find template #654 *mindel*
+
+*   Added Base#hide_action(*names) to hide public methods from a controller that would otherwise have been callable through the URL. For the majority of cases, its preferred just to make the methods you don't want to expose protected or private (so they'll automatically be hidden) -- but if you must have a public method, this is a way to make it uncallable. Base#hidden_actions retrieve the list of all hidden actions for the controller #644 *Nicholas Seckar*
+
+*   Fixed that a bunch of methods from ActionController::Base was accessible as actions (callable through a URL) when they shouldn't have been #644 *Nicholas Seckar*
+
+*   Added UrlHelper#current_page?(options) method to check if the url_for options passed corresponds to the current page
+
+*   Fixed https handling on other ports than 443 *Alan Gano*
+
+*   Added follow_redirect method for functional tests that'll get-request the redirect that was made. Example:
+
+        def test_create_post
+          post :create, "post" => { "title" => "Exciting!" }
+          assert_redirected_to :action => "show"
+
+          follow_redirect
+          assert_rendered_file "post/show"
+        end
+
+    Limitation: Only works for redirects to other actions within the same controller.
+
+*   Fixed double requiring of models with the same name as the controller
+
+*   Fixed that query params could be forced to nil on a POST due to the raw post fix #562 *moriq@moriq.com*
+
+*   Fixed that cookies shouldn't be frozen in TestRequest #571 *Eric Hodel*
+
+
+## 1.4.0 (January 25th, 2005) ##
+
+*   Fixed problems with ActiveRecordStore under the development environment in Rails
+
+*   Fixed the ordering of attributes in the xml-decleration of Builder #540 *woeye*
+
+*   Added @request.raw_post as a convenience access to @request.env['RAW_POST_DATA'] #534 *Tobias Lütke*
+
+*   Added support for automatic id-based indexing for lists of items #532 [dblack]. Example:
+
+        <% @students.each do |@student| %>
+          <%= text_field "student[]", "first_name", :size => "20" %>
+          <%= text_field "student[]", "last_name" %>
+          <%= text_field "student[]", "grade", :size => "5" %>
+        <% end %>
+
+    ...would produce, for say David Black with id 123 and a grace of C+:
+
+        <input id="student_123_first_name" name="student[123][first_name]" size="20"     size="30" type="text" value="David" />
+        <input id="student_123_last_name" name="student[123][last_name]" size="30"  type="text" value="Black" />
+        <input id="student_123_grade" name="student[123][grade]" size="5" type="text"  value="C+" />
+
+*   Added :application_prefix to url_for and friends that makes it easier to setup Rails in non-vhost environments #516 *Jamis Buck*
+
+*   Added :encode option to mail_to that'll allow you to masquarede the email address behind javascript or hex encoding #494 *Lucas Carlson*
+
+*   Fixed that the content-header was being set to application/octet_stream instead of application/octet-stream on send_date/file *Alexey*
+
+*   Removed the need for passing the binding when using CacheHelper#cache
+
+*   Added TestResponse#binary_content that'll return as a string the data sent through send_data/send_file for testing #500 *Alexey*
+
+*   Added @request.env['RAW_POST_DATA'] for people who need access to the data before Ruby's CGI has parsed it #505 *Jeremy Kemper*
+
+*   Fixed that a default fragment store wan't being set to MemoryStore as intended.
+
+*   Fixed that all redirect and render calls now return true, so you can use the pattern of "do and return". Example:
+
+        def show
+          redirect_to(:action => "login") and return unless @person.authenticated?
+          render_text "I won't happen unless the person is authenticated"
+        end
+
+*   Added that renders and redirects called in before_filters will have the same effect as returning false: stopping the chain. Example:
+
+        class WeblogController
+          before_filter { |c| c.send(:redirect_to_url("http://www.farfaraway.com")}) }
+
+          def hello
+            render_text "I will never be called"
+          end
+        end
+
+
+*   Added that only one render or redirect can happen per action. The first call wins and subsequent calls are ignored. Example:
+
+        def do_something
+          redirect_to :action => "elsewhere"
+          render_action "overthere"
+        end
+
+    Only the redirect happens. The rendering call is simply ignored.
+
+
+## 1.3.1 (January 18th, 2005) ##
+
+*   Fixed a bug where cookies wouldn't be set if a symbol was used instead of a string as the key
+
+*   Added assert_cookie_equal to assert the contents of a named cookie
+
+*   Fixed bug in page caching that prevented it from working at all
+
+
+## 1.3.0 (January 17th, 2005) ##
+
+*   Added an extensive caching module that offers three levels of granularity (page, action, fragment) and a variety of stores.
+    Read more in ActionController::Caching.
+
+*   Added the option of passing a block to ActiveRecordHelper#form in order to add more to the auto-generated form #469 *dom@sisna.com*
+
+        form("entry", :action => "sign") do |form|
+          form << content_tag("b", "Department")
+          form << collection_select("department", "id", @departments, "id", "name")
+        end
+
+*   Added arrays as a value option for params in url_for and friends #467 [Eric Anderson]. Example:
+
+        url_for(:controller => 'user', :action => 'delete', :params => { 'username' =>  %( paul john steve ) } )
+        # => /user/delete?username[]=paul&username[]=john&username[]=steve
+
+*   Fixed that controller tests can now assert on the use of cookies #466 *Alexey*
+
+*   Fixed that send_file would "remember" all the files sent by adding to the headers again and again #458 *Jeremy Kemper*
+
+*   Fixed url rewriter confusion when the controller or action name was a substring of the controller_prefix or action_prefix
+
+*   Added conditional layouts like <tt>layout "weblog_standard", :except => :rss</tt> #452 *Marcel Molina Jr.*
+
+*   Fixed that MemCacheStore wasn't included by default and added default MemCache object pointing to localhost #447 *Lucas Carlson*
+
+*   Added fourth argument to render_collection_of_partials that allows you to specify local_assigns -- just like render_partial #432 *Ryan Davis*
+
+*   Fixed that host would choke when cgi.host returned nil #432 *Tobias Lütke*
+
+*   Added that form helpers now take an index option #448 *Tim Bates*
+
+    Example:
+        text_field "person", "name", "index" => 3
+
+    Becomes:
+        <input type="text" name="person[3][name]" id="person_3_name" value="<%= @person.name %>" />
+
+*   Fixed three issues with retrying breakpoints #417 *Florian Gross*
+
+    1. Don't screw up pages that use multiple values for the same parameter (?foo=bar&foo=qux was converted to ?foo=barqux)
+    2. Don't screw up all forms when you click the "Retry with Breakpoint" link multiple times instead of reloading
+         (This caused the parameters to be added multiple times for GET forms leading to trouble.)
+    3. Don't add ?BP-RETRY=1 multiple times
+
+*   Added that all renders and redirects now return false, so they can be used as the last line in before_filters to stop execution.
+
+    Before:
+        def authenticate
+          unless @session[:authenticated]
+            redirect_to :controller => "account", :action => "login"
+            return false
+          end
+        end
+
+    After:
+        def authenticate
+          redirect_to(:controller => "account", :action => "login") unless @session[:authenticated]
+        end
+
+*   Added conditional filters #431 [Marcel Molina Jr.]. Example:
+
+        class JournalController < ActionController::Base
+          # only require authentication if the current action is edit or delete
+          before_filter :authorize, :only_on => [ :edit, :delete ]
+
+          private
+            def authorize
+              # redirect to login unless authenticated
+            end
+        end
+
+*   Added Base#render_nothing as a cleaner way of doing render_text "" when you're not interested in returning anything but an empty response.
+
+*   Added the possibility of passing nil to UrlHelper#link_to to use the link itself as the name
+
+
+## 1.2.0 (January 4th, 2005) ##
+
+*   Added MemCacheStore for storing session data in Danga's MemCache system *Bob Cottrell*
+    Depends on: MemCached server (http://www.danga.com/memcached/), MemCache client (http://raa.ruby-lang.org/project/memcache/)
+
+*   Added thread-safety to the DRbStore #66, #389 *Ben Stiglitz*
+
+*   Added DateHelper#select_time and DateHelper#select_second #373 *Scott Baron*
+
+*   Added :host and :protocol options to url_for and friends to redirect to another host and protocol than the current.
+
+*   Added class declaration for the MissingFile exception #388 *Kent Sibilev*
+
+*   Added "short hypertext note with a hyperlink to the new URI(s)" to redirects to fulfill compliance with RFC 2616 (HTTP/1.1) section 10.3.3 #397 *Tim Bates*
+
+*   Added second boolean parameter to Base.redirect_to_url and Response#redirect to control whether the redirect is permanent or not (301 vs 302) #375 *Hodel*
+
+*   Fixed redirects when the controller and action is named the same. Still haven't fixed same controller, module, and action, though #201 *Josh Peek*
+
+*   Fixed problems with running multiple functional tests in Rails under 1.8.2 by including hack for test/unit weirdness
+
+*   Fixed that @request.remote_ip didn't work in the test environment #369 *Bruno Mattarollo*
+
+
+## 1.1.0 ##
+
+*   Added search through session to clear out association caches at the end of each request. This makes it possible to place Active Record objects
+    in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 *Tobias Lütke*
+
+*   Added more informative exception when using helper :some_helper and the helper requires another file that fails, you'll get an
+    error message tells you what file actually failed to load, rather than falling back on assuming it was the helper file itself #346 *dblack*
+
+*   Added use of *_before_type_cast for all input and text fields. This is helpful for getting "100,000" back on a integer-based
+    validation where the value would normally be "100".
+
+*   Added Request#port_string to get something like ":8080" back on 8080 and "" on 80 (or 443 with https).
+
+*   Added Request#domain (returns string) and Request#subdomains (returns array).
+
+*   Added POST support for the breakpoint retries, so form processing that raises an exception can be retried with the original request *Florian Gross*
+
+*   Fixed regression with Base#reset_session that wouldn't use the DEFAULT_SESSION_OPTIONS *adam@the-kramers.net*
+
+*   Fixed error rendering of rxml documents to not just swallow the exception and return 0 (still not guessing the right line, but hey)
+
+*   Fixed that textilize and markdown would instantiate their engines even on empty strings. This also fixes #333 *Ulysses*
+
+*   Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum *Ryan Davis*
+
+
+## 1.0.1 ##
+
+*   Fixed a bug that would cause an ApplicationController to require itself three times and hence cause filters to be run three times *evl*
+
+
+## 1.0 ##
+
+*   Added that controllers will now attempt to require a model dependency with their name and in a singular attempt for their name.
+    So both PostController and PostsController will automatically have the post.rb model required. If no model is found, no error is raised,
+    as it is then expected that no match is available and the programmer will have included his own models.
+
+*   Fixed DateHelper#date_select so that you can pass include_blank as an option even if you don't use start_year and end_year #59 *what-a-day*
+
+*   Added that controllers will now search for a layout in $template_root/layouts/$controller_name.r(html|xml), so PostsController will look
+    for layouts/posts.rhtml or layouts/posts.rxml and automatically configure this layout if found #307 *Marcel Molina Jr.*
+
+*   Added FormHelper#radio_button to work with radio buttons like its already possible with check boxes *Michael Koziarski*
+
+*   Added TemplateError#backtrace that makes it much easier to debug template errors from unit and functional tests
+
+*   Added display of error messages with scaffolded form pages
+
+*   Added option to ERB templates to swallow newlines by using <% if something -%> instead of just <% if something %>. Example:
+
+        class SomeController < ApplicationController
+        <% if options[:scaffold] %>
+          scaffold :<%= singular_name %>
+        <% end %>
+          helper :post
+
+    ...produces this on post as singular_name:
+
+        class SomeController < ApplicationController
+
+          scaffold :post
+
+          helper :post
+
+    ...where as:
+
+        class SomeController < ApplicationController
+        <% if options[:scaffold] -%>
+          scaffold :<%= singular_name %>
+        <% end -%>
+          helper :post
+
+    ...produces:
+
+        class SomeController < ApplicationController
+          scaffold :post
+          helper :post
+
+    *This undocumented gem for ERb was uncovered by bitsweat*
+
+*   Fixed CgiRequest so that it'll now accept session options with Symbols as keys (as the documentation points out) *Suggested by Andreas*
+
+*   Added that render_partial will always by default include a counter with value 1 unless there is a counter passed in via the
+    local_assigns hash that overrides it. As a result, render_collection_of_partials can still be written in terms of render_partial
+    and partials that make use of a counter can be called without problems from both render_collection_of_partials as well as
+    render_partial #295 *Marcel Molina Jr.*
+
+*   Fixed CgiRequest#out to fall back to #write if $stdout doesn't have #syswrite *Jeremy Kemper*
+
+*   Fixed all helpers so that they use XHTML compliant double quotes for values instead of single quotes *htonl/Jeremy Kemper*
+
+*   Added link_to_image(src, options = {}, html_options = {}). Documentation:
+
+        Creates a link tag to the image residing at the +src+ using an URL created by the set of +options+. See the valid options in
+        link:classes/ActionController/Base.html#M000021. It's also possible to pass a string instead of an options hash to
+        get a link tag that just points without consideration. The <tt>html_options</tt> works jointly for the image and ahref tag by
+        letting the following special values enter the options on the image and the rest goes to the ahref:
+
+        ::alt: If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
+        ::size: Supplied as "XxY", so "30x45" becomes width="30" and height="45"
+        ::align: Sets the alignment, no special features
+
+        The +src+ can be supplied as a...
+        * full path, like "/my_images/image.gif"
+        * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
+        * file name without extension, like "logo", that gets expanded to "/images/logo.png"
+
+*   Fixed to_input_field_tag so it no longer explicitly uses InstanceTag.value if value was specified in the options hash *evl*
+
+*   Added the possibility of having validate be protected for assert_(in)valid_column #263 *Tobias Lütke*
+
+*   Added that ActiveRecordHelper#form now calls url_for on the :action option.
+
+*   Added all the HTTP methods as alternatives to the generic "process" for functional testing #276 [Tobias Lütke]. Examples:
+
+        # Calls Controller#miletone with a GET request
+        process :milestone
+
+        # Calls Controller#miletone with a POST request that has parameters
+        post :milestone, { "name" => "David" }
+
+        # Calls Controller#milestone with a HEAD request that has both parameters and session data
+        head :milestone, { "id" => 1 }, { "user_id" => 23 }
+
+    This is especially useful for testing idiomatic REST web services.
+
+*   Added proper handling of HEAD requests, so that content isn't returned (Request#head? added as well) #277 *Eric Hodel*
+
+*   Added indifference to whether @headers["Content-Type"], @headers["Content-type"], or @headers["content-type"] is used.
+
+*   Added TestSession#session_id that returns an empty string to make it easier to functional test applications that doesn't use
+    cookie-based sessions #275 *jcf*
+
+*   Fixed that cached template loading would still check the file system to see if the file existed #258 *Andreas Schwarz*
+
+*   Added options to tailor header tag, div id, and div class on ActiveRecordHelper#error_messages_for *Josh Peek*
+
+*   Added graceful handling of non-alphanumeric names and misplaced brackets in input parameters *Jeremy Kemper*
+
+*   Added a new container for cookies that makes them more intuative to use. The old methods of cookie and @cookies have been deprecated.
+
+    Examples for writing:
+
+        cookies["user_name"] = "david" # => Will set a simple session cookie
+        cookies["login"] = { "value" => "XJ-122", "expires" => Time.now + 360} # => Will set a cookie that expires in 1 hour
+
+    Examples for reading:
+
+        cookies["user_name"] # => "david"
+        cookies.size         # => 2
+
+    Read more in ActionController::Cookies
+
+    NOTE: If you were using the old accessor (cookies instead of @cookies), this could potentially break your code -- if you expect a full cookie object!
+
+*   Added the opportunity to defined method_missing on a controller which will handle all requests for actions not otherwise defined #223 *timb*
+
+*   Fixed AbstractRequest#remote_ip for users going through proxies - Patch #228 *Eric Hodel*
+
+*   Added Request#ssl? which is shorthand for @request.protocol == "https://"
+
+*   Added the choice to call form_tag with no arguments (resulting in a form posting to current action) *Jeremy Kemper*
+
+*   Upgraded to Builder 1.2.1
+
+*   Added :module as an alias for :controller_prefix to url_for and friends, so you can do redirect_to(:module => "shop", :controller => "purchases")
+    and go to /shop/purchases/
+
+*   Added support for controllers in modules through @params["module"].
+
+*   Added reloading for dependencies under cached environments like FastCGI and mod_ruby. This makes it possible to use those environments for development.
+    This is turned on by default, but can be turned off with ActionController::Base.reload_dependencies = false in production environments.
+
+    NOTE: This will only have an effect if you use the new model, service, and observer class methods to mark dependencies. All libraries loaded through
+    require will be "forever" cached. You can, however, use ActionController::Base.load_or_require("library") to get this behavior outside of the new
+    dependency style.
+
+*   Added that controllers will automatically require their own helper if possible. So instead of doing:
+
+        class MsgController < ApplicationController
+          helper :msg
+        end
+
+    ...you can just do:
+
+        class MsgController < ApplicationController
+        end
+
+*   Added dependencies_on(layer) to query the dependencies of a controller. Examples:
+
+        MsgController.dependencies_on(:model)    # => [ :post, :comment, :attachment ]
+        MsgController.dependencies_on(:service)  # => [ :notification_service ]
+        MsgController.dependencies_on(:observer) # => [ :comment_observer ]
+
+*   Added a new dependency model with the class methods model, service, and observer. Example:
+
+        class MsgController < ApplicationController
+          model    :post, :comment, :attachment
+          service  :notification_service
+          observer :comment_observer
+        end
+
+    These new "keywords" remove the need for explicitly calling 'require' in most cases. The observer method even instantiates the
+    observer as well as requiring it.
+
+*   Fixed that link_to would escape & in the url again after url_for already had done so
+
+
+## 0.9.5 (28) ##
+
+*   Added helper_method to designate that a given private or protected method you should available as a helper in the view. *Jeremy Kemper*
+
+*   Fixed assert_rendered_file so it actually verifies if that was the rendered file *htonl*
+
+*   Added the option for sharing partial spacer templates just like partials themselves *radsaq*
+
+*   Fixed that Russia was named twice in country_select *alexey*
+
+*   Fixed request_origin to use remote_ip instead of remote_addr *Jeremy Kemper*
+
+*   Fixed link_to breakage when nil was passed for html_options *alexey*
+
+*   Fixed redirect_to on a virtual server setup with apache with a port other than the default where it would forget the port number *seanohalpin*
+
+*   Fixed that auto-loading webrick on Windows would cause file uploads to fail *Jeremy Kemper*
+
+*   Fixed issues with sending files on WEBrick by setting the proper binmode *Jeremy Kemper*
+
+*   Added send_data as an alternative to send_file when the stream is not read off the filesystem but from a database or generated live *Jeremy Kemper*
+
+*   Added a new way to include helpers that doesn't require the include hack and can go without the explicit require. *Jeremy Kemper*
+
+    Before:
+
+        module WeblogHelper
+          def self.included(controller) #:nodoc:
+            controller.ancestors.include?(ActionController::Base) ? controller.add_template_helper(self) : super
+          end
+        end
+
+        require 'weblog_helper'
+        class WeblogController < ActionController::Base
+          include WeblogHelper
+        end
+
+    After:
+
+        module WeblogHelper
+        end
+
+        class WeblogController < ActionController::Base
+          helper :weblog
+        end
+
+*   Added a default content-type of "text/xml" to .rxml renders *Ryan Platte*
+
+*   Fixed that when /controller/index was requested by the browser, url_for would generates wrong URLs *Ryan Platte*
+
+*   Fixed a bug that would share cookies between users when using FastCGI and mod_ruby *The Robot Co-op*
+
+*   Added an optional third hash parameter to the process method in functional tests that takes the session data to be used *alexey*
+
+*   Added UrlHelper#mail_to to make it easier to create mailto: style ahrefs
+
+*   Added better error messages for layouts declared with the .rhtml extension (which they shouldn't) *geech*
+
+*   Added another case to DateHelper#distance_in_minutes to return "less than a minute" instead of "0 minutes" and "1 minute" instead of "1 minutes"
+
+*   Added a hidden field to checkboxes generated with FormHelper#check_box that will make sure that the unchecked value (usually 0)
+    is sent even if the checkbox is not checked. This relieves the controller from doing custom checking if the checkbox wasn't
+    checked. BEWARE: This might conflict with your run-on-the-mill work-around code. *Tobias Lütke*
+
+*   Fixed error_message_on to just use the first if more than one error had been added *Marcel Molina Jr.*
+
+*   Fixed that URL rewriting with /controller/ was working but /controller was not and that you couldn't use :id on index *geech*
+
+*   Fixed a bug with link_to where the :confirm option wouldn't be picked up if the link was a straight url instead of an option hash
+
+*   Changed scaffolding of forms to use <label> tags instead of <b> to please W3C *evl*
+
+*   Added DateHelper#distance_of_time_in_words_to_now(from_time) that works like distance_of_time_in_words,
+    but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
+
+*   Added assert_flash_equal(expected, key, message), assert_session_equal(expected, key, message),
+    assert_assigned_equal(expected, key, message) to test the contents of flash, session, and template assigns.
+
+*   Improved the failure report on assert_success when the action triggered a redirection [alexey].
+
+*   Added "markdown" to accompany "textilize" as a TextHelper method for converting text to HTML using the Markdown syntax.
+    BlueCloth must be installed in order for this method to become available.
+
+*   Made sure that an active session exists before we attempt to delete it *Samuel*
+
+*   Changed link_to with Javascript confirmation to use onclick instead of onClick for XHTML validity *Scott Barron*
+
+
+## 0.9.0 (43) ##
+
+*   Added support for Builder-based templates for files with the .rxml extension. These new templates are an alternative to ERb that
+    are especially useful for generating XML content, such as this RSS example from Basecamp:
+
+        xml.rss("version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/") do
+          xml.channel do
+            xml.title(@feed_title)
+            xml.link(@url)
+            xml.description "Basecamp: Recent items"
+            xml.language "en-us"
+            xml.ttl "40"
+
+            for item in @recent_items
+              xml.item do
+                xml.title(item_title(item))
+                xml.description(item_description(item)) if item_description(item)
+                xml.pubDate(item_pubDate(item))
+                xml.guid(@person.firm.account.url + @recent_items.url(item))
+                xml.link(@person.firm.account.url + @recent_items.url(item))
+
+                xml.tag!("dc:creator", item.author_name) if item_has_creator?(item)
+              end
+            end
+          end
+        end
+
+        ...which will generate something like:
+
+        <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+          <channel>
+            <title>Web Site Redesign</title>
+            <link>http://www.basecamphq.com/clients/travelcenter/1/</link>
+            <description>Basecamp: Recent items</description>
+            <language>en-us</language>
+            <ttl>40</ttl>
+            <item>
+              <title>Post: don't you know</title>
+              <description>&amp;lt;p&amp;gt;deeper and down&amp;lt;/p&amp;gt;</description>
+              <pubDate>Fri, 20 Aug 2004 21:13:50 CEST</pubDate>
+              <guid>http://www.basecamphq.com/clients/travelcenter/1/msg/assets/96976/comments</guid>
+              <link>http://www.basecamphq.com/clients/travelcenter/1/msg/assets/96976/comments</link>
+              <dc:creator>David H. Heinemeier</dc:creator>
+            </item>
+            <item>
+              <title>Milestone completed: Design Comp 2</title>
+              <pubDate>Mon,  9 Aug 2004 14:42:06 CEST</pubDate>
+              <guid>http://www.basecamphq.com/clients/travelcenter/1/milestones/#49</guid>
+              <link>http://www.basecamphq.com/clients/travelcenter/1/milestones/#49</link>
+            </item>
+          </channel>
+        </rss>
+
+    The "xml" local variable is automatically available in .rxml templates. You construct the template by calling a method with the name
+    of the tag you want. Options for the tag can be specified as a hash parameter to that method.
+
+    Builder-based templates can be mixed and matched with the regular ERb ones. The only thing that differentiates them is the extension.
+    No new methods have been added to the public interface to handle them.
+
+    Action Pack ships with a version of Builder, but it will use the RubyGems version if you have one installed.
+
+    Read more about Builder on: http://onestepback.org/index.cgi/Tech/Ruby/StayingSimple.rdoc
+
+    *Builder is created by Jim Weirich*
+
+*   Added much improved support for functional testing [what-a-day].
+
+        # Old style
+        def test_failing_authenticate
+          @request.request_uri = "/login/authenticate"
+          @request.action = "authenticate"
+          @request.request_parameters["user_name"] = "nop"
+          @request.request_parameters["password"]  = ""
+
+          response = LoginController.process_test(@request)
+
+          assert_equal "The username and/or password you entered is invalid.", response.session["flash"]["alert"]
+          assert_equal "http://37signals.basecamp.com/login/", response.headers["location"]
+        end
+
+        # New style
+        def test_failing_authenticate
+          process :authenticate, "user_name" => "nop", "password" => ""
+          assert_flash_has 'alert'
+          assert_redirected_to :action => "index"
+        end
+
+    See a full example on http://codepaste.org/view/paste/334
+
+*   Increased performance by up to 100% with a revised cookie class that fixes the performance problems with the
+    default one that ships with 1.8.1 and below. It replaces the inheritance on SimpleDelegator with DelegateClass(Array)
+    following the suggestion from Matz on:
+    http://groups.google.com/groups?th=e3a4e68ba042f842&seekm=c3sioe%241qvm%241%40news.cybercity.dk#link14
+
+*   Added caching for compiled ERb templates. On Basecamp, it gave between 8.5% and 71% increase in performance [Andreas Schwarz].
+
+*   Added implicit counter variable to render_collection_of_partials [Marcel Molina Jr.]. From the docs:
+
+        <%= render_collection_of_partials "ad", @advertisements %>
+
+        This will render "advertiser/_ad.rhtml" and pass the local variable +ad+ to the template for display. An iteration counter
+        will automatically be made available to the template with a name of the form +partial_name_counter+. In the case of the
+        example above, the template would be fed +ad_counter+.
+
+*   Fixed problems with two sessions being maintained on reset_session that would particularly screw up ActiveRecordStore.
+
+*   Fixed reset_session to start an entirely new session instead of merely deleting the old. So you can now safely access @session
+    after calling reset_ression and expect it to work.
+
+*   Added @request.get?, @request.post?, @request.put?, @request.delete? as convenience query methods for @request.method *geech*
+
+*   Added @request.method that'll return a symbol representing the HTTP method, such as :get, :post, :put, :delete *geech*
+
+*   Changed @request.remote_ip and @request.host to work properly even when a proxy is in front of the application *geech*
+
+*   Added JavaScript confirm feature to link_to. Documentation:
+
+        The html_options have a special feature for creating javascript confirm alerts where if you pass
+        :confirm => 'Are you sure?', the link will be guarded with a JS popup asking that question.
+        If the user accepts, the link is processed, otherwise not.
+
+*   Added link_to_unless_current as a UrlHelper method [Sam Stephenson]. Documentation:
+
+        Creates a link tag of the given +name+ using an URL created by the set of +options+, unless the current
+        controller, action, and id are the same as the link's, in which case only the name is returned (or the
+        given block is yielded, if one exists). This is useful for creating link bars where you don't want to link
+        to the page currently being viewed.
+
+*   Fixed that UrlRewriter (the driver for url_for, link_to, etc) would blow up when the anchor was an integer *alexey*
+
+*   Added that layouts defined with no directory defaults to layouts. So layout "weblog/standard" will use
+    weblog/standard (as always), but layout "standard" will use layouts/standard.
+
+*   Fixed that partials (or any template starting with an underscore) was publically viewable *Marten*
+
+*   Added HTML escaping to text_area helper.
+
+*   Added :overwrite_params to url_for and friends to keep the parameters as they were passed to the current action and only overwrite a subset.
+    The regular :params will clear the slate so you need to manually add in existing parameters if you want to reuse them. *raphinou*
+
+*   Fixed scaffolding problem with composite named objects *Moo Jester*
+
+*   Added the possibility for shared partials. Example:
+
+        <%= render_partial "advertisement/ad", ad %>
+
+    This will render the partial "advertisement/_ad.rhtml" regardless of which controller this is being called from.
+
+    *Jacob Fugal*
+
+*   Fixed crash when encountering forms that have empty-named fields *James Prudente*
+
+*   Added check_box form helper method now accepts true/false as well as 1/0 *what-a-day*
+
+*   Fixed the lacking creation of all directories with install.rb *Dave Steinberg*
+
+*   Fixed that date_select returns valid XHTML selected options *Andreas Schwarz*
+
+*   Fixed referencing an action with the same name as a controller in url_for *what-a-day*
+
+*   Fixed the destructive nature of Base#attributes= on the argument *Kevin Watt*
+
+*   Changed ActionControllerError to decent from StandardError instead of Exception. It can now be caught by a generic rescue.
+
+*   Added SessionRestoreError that is raised when a session being restored holds objects where there is no class available.
+
+*   Added block as option for inline filters. So what used to be written as:
+
+        before_filter Proc { |controller| return false if controller.params["stop_action"] }
+
+    ...can now be as:
+
+        before_filter { |controller| return false if controller.params["stop_action"] }
+
+    *Jeremy Kemper*
+
+*   Made the following methods public (was protected): url_for, controller_class_name, controller_name, action_name
+    This makes it easier to write filters without cheating around the encapsulation with send.
+
+*   ActionController::Base#reset_session now sticks even if you access @session afterwards *Kent Sibilev*
+
+*   Improved the exception logging so the log file gets almost as much as in-browser debugging.
+
+*   Changed base class setup from AbstractTemplate/ERbTemplate to ActionView::Base. This change should be harmless unless you were
+    accessing Action View directly in which case you now need to reference the Base class.\
+
+*   Added that render_collection_of_partials returns nil if the collection is empty. This makes showing a “no items” message easier.
+    For example: <%= render_collection_of_partials("message", @messages) || "No messages found." %> *Sam Stephenson*
+
+*   Added :month_before_year as an option to date_select to get the month select before the year. Especially useful for credit card forms.
+
+*   Added :add_month_numbers to select_month to get options like "3 - March".
+
+*   Removed Base.has_active_layout? as it couldn't answer the question without the instance. Use Base#active_layout instead.
+
+*   Removed redundant call to update on ActionController::Base#close_session *Andreas Schwarz*
+
+*   Fixed that DRb Store accidently started its own server (instead of just client) *Andreas*
+
+*   Fixed strip_links so it now works across multiple lines *Chad Fowler*
+
+*   Fixed the TemplateError exception to show the proper trace on to_s (useful for unit test debugging)
+
+*   Implemented class inheritable attributes without eval *Caio Chassot*
+
+*   Made TextHelper#concat accept binding as it would otherwise not work
+
+*   The FormOptionsHelper will now call to_s on the keys and values used to generate options
+
+
+## 0.8.5 ##
+
+*   Introduced passing of locally scoped variables between templates:
+
+        You can pass local variables to sub templates by using a hash of with the variable
+        names as keys and the objects as values:
+
+          <%= render "shared/header", { "headline" => "Welcome", "person" => person } %>
+
+        These can now be accessed in shared/header with:
+
+          Headline: <%= headline %>
+          First name: <%= person.first_name %>
+
+*   Introduced the concept of partials as a certain type of sub templates:
+
+        There's also a convenience method for rendering sub templates within the current
+        controller that depends on a single object (we call this kind of sub templates for
+        partials). It relies on the fact that partials should follow the naming convention
+        of being prefixed with an underscore -- as to separate them from regular templates
+        that could be rendered on their own. In the template for Advertiser#buy, we could have:
+
+          <% for ad in @advertisements %>
+            <%= render_partial "ad", ad %>
+          <% end %>
+
+        This would render "advertiser/_ad.rhtml" and pass the local variable +ad+
+        for the template to display.
+
+        == Rendering a collection of partials
+
+        The example of partial use describes a familar pattern where a template needs
+        to iterate over a array and render a sub template for each of the elements.
+        This pattern has been implemented as a single method that accepts an array and
+        renders a partial by the same name of as the elements contained within. So the
+        three-lined example in "Using partials" can be rewritten with a single line:
+
+          <%= render_collection_of_partials "ad", @advertisements %>
+
+        So this will render "advertiser/_ad.rhtml" and pass the local variable +ad+ for
+        the template to display.
+
+*   Improved send_file by allowing a wide range of options to be applied [Jeremy Kemper]:
+
+        Sends the file by streaming it 4096 bytes at a time. This way the
+        whole file doesn't need to be read into memory at once.  This makes
+        it feasible to send even large files.
+
+        Be careful to sanitize the path parameter if it coming from a web
+        page.  send_file(@params['path'] allows a malicious user to
+        download any file on your server.
+
+        Options:
+        * <tt>:filename</tt> - specifies the filename the browser will see.
+          Defaults to File.basename(path).
+        * <tt>:type</tt> - specifies an HTTP content type.
+          Defaults to 'application/octet-stream'.
+        * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
+          Valid values are 'inline' and 'attachment' (default).
+        * <tt>:buffer_size</tt> - specifies size (in bytes) of the buffer used to stream
+          the file.  Defaults to 4096.
+
+        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
+        a variety of quirks (especially when downloading over SSL).
+
+        Simple download:
+          send_file '/path/to.zip'
+
+        Show a JPEG in browser:
+          send_file '/path/to.jpeg', :type => 'image/jpeg', :disposition => 'inline'
+
+        Read about the other Content-* HTTP headers if you'd like to
+        provide the user with more information (such as Content-Description).
+        http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11
+
+        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
+        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.
+
+*   Added pluralize method to the TextHelper that makes it easy to get strings like "1 message", "3 messages"
+
+*   Added proper escaping for the rescues *Andreas Schwarz*
+
+*   Added proper escaping for the option and collection tags *Andreas Schwarz*
+
+*   Fixed NaN errors on benchmarking *Jim Weirich*
+
+*   Fixed query string parsing for URLs that use the escaped versions of & or ; as part of a key or value
+
+*   Fixed bug with custom Content-Type headers being in addition to rather than instead of the default header.
+    (This bug didn't matter with neither CGI or mod_ruby, but FCGI exploded on it) *With help from Ara T. Howard*
+
+
+## 0.8.0 ##
+
+*   Added select, collection_select, and country_select to make it easier for Active Records to set attributes through
+    drop-down lists of options. Example:
+
+        <%= select "person", "gender", %w( Male Female ) %>
+
+    ...would give the following:
+
+        <select name="person[gender]" id="person_gender"><option>Male</option><option>Female</option></select>
+
+*   Added an option for getting multiple values on a single form name into an array instead of having the last one overwrite.
+    This is especially useful for groups of checkboxes, which can now be written as:
+
+        <input type="checkbox" name="rights[]" value="CREATE" />
+        <input type="checkbox" name="rights[]" value="UPDATE" />
+        <input type="checkbox" name="rights[]" value="DELETE" />
+
+    ...and retrieved in the controller action with:
+
+        @params["rights"] # => [ "CREATE", "UPDATE", "DELETE" ]
+
+    The old behavior (where the last one wins, "DELETE" in the example) is still available. Just don't add "[]" to the
+    end of the name. *Scott Baron*
+
+*   Added send_file which uses the new render_text block acceptance to make it feasible to send large files.
+    The files is sent with a bunch of voodoo HTTP headers required to get arbitrary files to download as
+    expected in as many browsers as possible (eg, IE hacks). Example:
+
+    def play_movie
+        send_file "/movies/that_movie.avi"
+    end
+
+    *Jeremy Kemper*
+
+*   render_text now accepts a block for deferred rendering. Useful for streaming large files, displaying
+    a “please wait” message during a complex search, etc. Streaming example:
+
+        render_text do |response|
+          File.open(path, 'rb') do |file|
+            while buf = file.read(1024)
+              print buf
+            end
+          end
+        end
+
+    *Jeremy Kemper*
+
+*   Added a new Tag Helper that can generate generic tags programmatically insted of through HTML. Example:
+
+        tag("br", "clear" => "all") => <br clear="all" />
+
+    ...that's usually not terribly interesting (unless you have a lot of options already in a hash), but it
+    gives way for more specific tags, like the new form tag:
+
+        form_tag({ :controller => "weblog", :action => "update" }, { :multipart => "true", "style" => "width: 200px"}) =>
+          <form action="/weblog/update" enctype="multipart/formdata" style="width: 200px">
+
+    There's even a "pretty" version for people who don't like to open tags in code and close them in HTML:
+
+        <%= start_form_tag :action => "update" %>
+          # all the input fields
+        <%= end_form_tag %>
+
+    (end_form_tag just returns "</form>")
+
+*   The selected parameter in options_for_select may now also an array of values to be selected when
+    using a multiple select. Example:
+
+        options_for_select([ "VISA", "Mastercard", "Discover" ], ["VISA", "Discover"]) =>
+          <option selected>VISA</option>\n<option>Mastercard</option>\n<option selected>Discover</option>
+
+    *Scott Baron*
+
+*   Changed the URL rewriter so controller_prefix and action_prefix can be used in isolation. You can now do:
+
+        url_for(:controller_prefix => "clients")
+
+    ...or:
+
+        url_for(:action_prefix => "category/messages")
+
+    Neither would have worked in isolation before (:controller_prefix required a :controller and :action_prefix required an :action)
+
+*   Started process of a cleaner separation between Action Controller and ERb-based Action Views by introducing an
+    abstract base class for views. And Amita adapter could be fitted in more easily now.
+
+*   The date helper methods date_select and datetime_select now also use the field error wrapping
+    (div with class fieldWithErrors by default).
+
+*   The date helper methods date_select and datetime_select can now discard selects
+
+*   Added option on AbstractTemplate to specify a different field error wrapping. Example:
+
+        ActionView::AbstractTemplate.field_error_proc = Proc.new do |html, instance|
+          "<p>#{instance.method_name + instance.error_message}</p><div style='background-color: red'>#{html}</div>"
+        end
+
+    ...would give the following on a Post#title (text field) error:
+
+        <p>Title can't be empty</p>
+        <div style='background-color: red'>
+          <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
+        </div>
+
+*   The UrlHelper methods url_for and link_to will now by default only return paths, not complete URIs.
+    That should make it easier to fit a Rails application behind a proxy or load-balancer.
+    You can overwrite this by passing :only_path => false as part of the options. *Suggested by U235*
+
+*   Fixed bug with having your own layout for use with scaffolding *Kevin Radloff*
+
+*   Fixed bug where redirect_to_path didn't append the port on non-standard ports *dhawkins*
+
+*   Scaffolding plays nicely with single-table inheritance (LoadErrors are caught) *Jeremy Kemper*
+
+*   Scaffolding plays nice with plural models like Category/categories *Jeremy Kemper*
+
+*   Fixed missing suffix appending in scaffolding *Kevin Radloff*
+
+
+## 0.7.9 ##
+
+*   The "form" method now present boolean fields from PostgreSQL as drop-down menu. *Scott*
+
+*   Scaffolding now automatically attempts to require the class that's being scaffolded.
+
+*   Scaffolding will use the current active layout, instead of its own, if one has been specified. Example:
+
+        class WeblogController < ActionController::Base
+          layout "layouts/weblog"
+          scaffold :post
+        end
+
+    *Suggested by Scott*
+
+*   Changed url_for (and all the that drives, like redirect_to, link_to, link_for) so you can pass it a symbol instead of a hash.
+    This symbol is a method reference which is then called to calculate the url. Example:
+
+        class WeblogController < ActionController::Base
+          def update
+            # do some update
+            redirect_to :dashboard_url
+          end
+
+          protected
+            def dashboard_url
+              if @project.active?
+                url_for :controller => "project", :action => "dashboard"
+              else
+                url_for :controller => "account", :action => "dashboard"
+              end
+            end
+        end
+
+*   Added default_url_options to specialize behavior for all url_for (and friends) calls:
+
+        Overwrite to implement a number of default options that all url_for-based methods will use.
+        The default options should come in form of a hash, just like the one you would use for
+        url_for directly. Example:
+
+          def default_url_options(options)
+            { :controller_prefix => @project.active? ? "projects/" : "accounts/" }
+          end
+
+        As you can infer from the example, this is mostly useful for situations where you want to
+        centralize dynamic dissions about the urls as they stem from the business domain. Please note
+        that any individual url_for call can always override the defaults set by this method.
+
+
+*   Changed url_for so that an "id" passed in the :params is not treated special. You need to use the dedicated :id to get
+    the special auto path-params treatment. Considering the url http://localhost:81/friends/list
+
+        url_for(:action => "show", :params => { "id" => 5 })
+          ...used to give http://localhost:81/friends/show/5
+          ......now gives http://localhost:81/friends/show?id=5
+
+        If you want the automated id behavior, do:
+
+        url_for(:action => "show", :id => 5 )
+          ....which gives http://localhost:81/friends/show/5
+
+
+*   Fixed problem with anchor being inserted before path parameters with url_for (and friends)
+
+
+## 0.7.8 ##
+
+*   Fixed session bug where you couldn't store any objects that didn't exist in the standard library
+    (such as Active Record objects).
+
+*   Added reset_session method for Action Controller objects to clear out all objects in the session.
+
+*   Fixed that exceptions raised during filters are now also caught by the default rescues
+
+*   Added new around_filter for doing before and after filtering with a single object [Florian Weber]:
+
+        class WeblogController < ActionController::Base
+          around_filter BenchmarkingFilter.new
+
+          # Before this action is performed, BenchmarkingFilter#before(controller) is executed
+          def index
+          end
+          # After this action has been performed, BenchmarkingFilter#after(controller) is executed
+        end
+
+        class BenchmarkingFilter
+          def initialize
+            @runtime
+          end
+
+          def before
+            start_timer
+          end
+
+          def after
+            stop_timer
+            report_result
+          end
+        end
+
+*   Added the options for specifying a different name and id for the form helper methods than what is guessed [Florian Weber]:
+
+        text_field "post", "title"
+          ...just gives: <input id="post_title" name="post[title]" size="30" type="text" value="" />
+
+        text_field "post", "title", "id" => "title_for_post", "name" => "first_post_title"
+          ...can now give: <input id="title_for_post" name="first_post_title" size="30" type="text" value="" />
+
+*   Added DebugHelper with a single "debug" method for doing pretty dumps of objects in the view
+    (now used in the default rescues to better present the contents of session and template variables)
+
+*   Added note to log about the templates rendered within layouts (before just the layout was shown)
+
+*   Fixed redirects on https setups *Andreas*
+
+*   Fixed scaffolding problem on the edit action when using :suffix => true *Scott*
+
+*   Fixed scaffolding problem where implementing list.rhtml wouldn't work for the index action
+
+*   URLs generated now uses &amp; instead of just & so pages using it can validate with W3C *Spotted by Andreas*
+
+
+## 0.7.7 ##
+
+*   Fixed bug in CGI extension that prevented multipart forms from working
+
+
+## 0.7.6 ##
+
+*   Included ERB::Util so all templates can easily escape HTML content with <%=h @person.content %>
+
+*   All requests are now considered local by default, so everyone will be exposed to detailed debugging screens on errors.
+    When the application is ready to go public, set ActionController::Base.consider_all_requests_local to false,
+    and implement the protected method local_request? in the controller to determine when debugging screens should be shown.
+
+*   Fixed three bugs with the url_for/redirect_to/link_to handling. Considering the url http://localhost:81/friends/show/1
+
+        url_for(:action => "list")
+          ...used to give http://localhost:81/friends/list/1
+          ......now gives http://localhost:81/friends/list
+
+        url_for(:controller => "friends", :action => "destroy", :id => 5)
+          ...used to give http://localhost:81/friends/destroy
+          ......now gives http://localhost:81/friends/destroy/5
+
+    Considering the url http://localhost:81/teachers/show/t
+
+        url_for(:action => "list", :id => 5)
+          ...used to give http://localhost:81/5eachers/list/t
+          ......now gives http://localhost:81/teachers/list/5
+
+    *Reported by David Morton & Radsaq*
+
+*   Logs exception to logfile in addition to showing them for local requests
+
+*   Protects the eruby load behind a begin/rescue block. eRuby is not required to run ActionController.
+
+*   Fixed install.rb to also install clean_logger and the templates
+
+*   Added ActiveRecordStore as a session option. Read more in lib/action_controller/session/active_record_store.rb *Tim Bates*
+
+*   Change license to MIT License (and included license file in package)
+
+*   Application error page now returns status code 500 instead of 200
+
+*   Fixed using Procs as layout handlers *Florian Weber*
+
+*   Fixed bug with using redirects ports other than 80
+
+*   Added index method that calls list on scaffolding
+
+
+## 0.7.5 ##
+
+*   First public release
-- 
cgit v1.2.3


From 1679aa56f3f93ab976a8124bd071c0f4be69c46a Mon Sep 17 00:00:00 2001
From: Franck Verrot <franck@verrot.fr>
Date: Fri, 4 Nov 2011 14:46:35 +0100
Subject: Synchronize the gemspecs since CHANGELOG has been renamed to
 CHANGELOG.md

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index c2eac234b0..c261fc8a8f 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
 
-  s.files        = Dir['CHANGELOG', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*']
+  s.files        = Dir['CHANGELOG.md', 'README.rdoc', 'MIT-LICENSE', 'lib/**/*']
   s.require_path = 'lib'
   s.requirements << 'none'
 
-- 
cgit v1.2.3


From cb06727b6cb7310808f5b9ce1bf254055806ba80 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 4 Nov 2011 16:44:59 +0530
Subject: add tests for the case where size is explicitly passed to
 number_field helper

---
 actionpack/test/template/form_helper_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index bd7b322fc9..6434d9645e 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -440,11 +440,15 @@ class FormHelperTest < ActionView::TestCase
   def test_number_field
     expected = %{<input name="order[quantity]" max="9" id="order_quantity" type="number" min="1" />}
     assert_dom_equal(expected, number_field("order", "quantity", :in => 1...10))
+    expected = %{<input name="order[quantity]" size="30" max="9" id="order_quantity" type="number" min="1" />}
+    assert_dom_equal(expected, number_field("order", "quantity", :size => 30, :in => 1...10))
   end
 
   def test_range_input
     expected = %{<input name="hifi[volume]" step="0.1" max="11" id="hifi_volume" type="range" min="0" />}
     assert_dom_equal(expected, range_field("hifi", "volume", :in => 0..11, :step => 0.1))
+    expected = %{<input name="hifi[volume]" step="0.1" size="30" max="11" id="hifi_volume" type="range" min="0" />}
+    assert_dom_equal(expected, range_field("hifi", "volume", :size => 30, :in => 0..11, :step => 0.1))
   end
 
   def test_explicit_name
-- 
cgit v1.2.3


From 10773f94eae0dacf10e2ed0c28f6bb73805c2521 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 5 Nov 2011 16:42:53 +0000
Subject: Skip test_default_external_works on the CI for Ruby 1.9.3.

This test is affected by a bug in Ruby 1.9.3p0 and trunk:
http://redmine.ruby-lang.org/issues/5564

Given we cannot fix it for ourselves, it is better to skip for now so
that we will easily see if further failures are introduced.

Jon Leighton is monitoring the bug report and will revert this when a
suitable solution is found (either a new Ruby release or a generic
workaround).

If you are using 1.9.3 in your app and have templates that are not in
UTF-8, you should add a workaround early on in the boot process. For
example, if your templates are Shift_JIS encoded, then add the
following in an initializer:

Encoding::Converter.new('Shift_JIS', 'UTF-8')
---
 actionpack/test/template/template_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 70ca876c67..f3328b5dca 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -130,6 +130,17 @@ class TestERBTemplate < ActiveSupport::TestCase
     # is set to something other than UTF-8, we don't
     # get any errors and get back a UTF-8 String.
     def test_default_external_works
+      if ENV['TRAVIS'] && RUBY_VERSION >= '1.9.3'
+        skip(
+          "There is currently a bug in Ruby trunk and in 1.9.3 which makes this test fail. " \
+          "Please see http://redmine.ruby-lang.org/issues/5564. " \
+          "Given there is no known generic workaround that this requires a fix in Ruby itself, " \
+          "this test is skipped on the CI for now so that we don't pollute the CI with failures. " \
+          "Jon Leighton is monitoring the bug report and will renable this test when a solution " \
+          "becomes available."
+        )
+      end
+
       with_external_encoding "ISO-8859-1" do
         @template = new_template("hello \xFCmlat")
         assert_equal Encoding::UTF_8, render.encoding
-- 
cgit v1.2.3


From 4d9f779b5475cfe8a206315b444e2cd3fc31ba5c Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 15:33:36 -0700
Subject: bumps up sprockets

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index c261fc8a8f..a446531a6b 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0')
-  s.add_dependency('sprockets',     '~> 2.0.3')
+  s.add_dependency('sprockets',     '~> 2.1.0.beta')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')
-- 
cgit v1.2.3


From 949b3e743f9a2ff5935bb32a247d5df70586886a Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Sun, 6 Nov 2011 11:46:28 +0400
Subject: Docs cosmetic fixes in Action View form_helper.rb

---
 actionpack/lib/action_view/helpers/form_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 5c10b67586..f148ffbd73 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -649,7 +649,7 @@ module ActionView
       #   # => <label for="post_privacy_public">Public Post</label>
       #
       #   label(:post, :terms) do
-      #     'Accept <a href="/terms">Terms</a>.'
+      #     'Accept <a href="/terms">Terms</a>.'.html_safe
       #   end
       def label(object_name, method, content_or_options = nil, options = nil, &block)
         content_is_options = content_or_options.is_a?(Hash)
@@ -738,7 +738,7 @@ module ActionView
       #   # => <input type="file" id="user_avatar" name="user[avatar]" />
       #
       #   file_field(:post, :attached, :accept => 'text/html')
-      #   # => <input type="file" id="post_attached" name="post[attached]" />
+      #   # => <input accept="text/html" type="file" id="post_attached" name="post[attached]" />
       #
       #   file_field(:attachment, :file, :class => 'file_input')
       #   # => <input type="file" id="attachment_file" name="attachment[file]" class="file_input" />
-- 
cgit v1.2.3


From 7776055e2dcd29e0f8f27154663263c0bbd1c188 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 6 Nov 2011 10:15:04 +0000
Subject: Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."

This reverts commit 10773f94eae0dacf10e2ed0c28f6bb73805c2521.
---
 actionpack/test/template/template_test.rb | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index f3328b5dca..70ca876c67 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -130,17 +130,6 @@ class TestERBTemplate < ActiveSupport::TestCase
     # is set to something other than UTF-8, we don't
     # get any errors and get back a UTF-8 String.
     def test_default_external_works
-      if ENV['TRAVIS'] && RUBY_VERSION >= '1.9.3'
-        skip(
-          "There is currently a bug in Ruby trunk and in 1.9.3 which makes this test fail. " \
-          "Please see http://redmine.ruby-lang.org/issues/5564. " \
-          "Given there is no known generic workaround that this requires a fix in Ruby itself, " \
-          "this test is skipped on the CI for now so that we don't pollute the CI with failures. " \
-          "Jon Leighton is monitoring the bug report and will renable this test when a solution " \
-          "becomes available."
-        )
-      end
-
       with_external_encoding "ISO-8859-1" do
         @template = new_template("hello \xFCmlat")
         assert_equal Encoding::UTF_8, render.encoding
-- 
cgit v1.2.3


From fc988115f75bdca6aa95454208b49125a5041117 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 6 Nov 2011 10:36:56 +0000
Subject: Implement a workaround for a bug in ruby-1.9.3p0.

The bug is that an error would be raised while attempting to convert a
template from one encoding to another.

Please see http://redmine.ruby-lang.org/issues/5564 for more details.

The workaround is to load all conversions into memory ahead of time,
and will only happen if the ruby version is *exactly* 1.9.3p0. The
hope is obviously that the underlying problem will be resolved in
the next patchlevel release of 1.9.3.
---
 actionpack/CHANGELOG.md                            |  13 +++++++++++
 .../lib/action_view/data/encoding_conversions.dump | Bin 0 -> 122854 bytes
 actionpack/lib/action_view/template.rb             |  26 +++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 actionpack/lib/action_view/data/encoding_conversions.dump

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 99c3ac3c04..74711c0320 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -62,6 +62,19 @@
     persistent between requests so if you need to manipulate the environment
     for your test you need to do it before the cookie jar is created.
 
+## Rails 3.1.2 (unreleased) ##
+
+*   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be raised
+    while attempting to convert a template from one encoding to another.
+
+    Please see http://redmine.ruby-lang.org/issues/5564 for details of the bug.
+
+    The workaround is to load all conversions into memory ahead of time, and will
+    only happen if the ruby version is *exactly* 1.9.3p0. The hope is obviously that
+    the underlying problem will be resolved in the next patchlevel release of
+    1.9.3.
+
+    *Jon Leighton*
 
 ## Rails 3.1.1 (unreleased) ##
 
diff --git a/actionpack/lib/action_view/data/encoding_conversions.dump b/actionpack/lib/action_view/data/encoding_conversions.dump
new file mode 100644
index 0000000000..18d7cd448b
Binary files /dev/null and b/actionpack/lib/action_view/data/encoding_conversions.dump differ
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 10797c010f..1f1a8f7867 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -3,6 +3,32 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/kernel/singleton_class'
 
+if RUBY_ENGINE == 'ruby' && RUBY_VERSION == '1.9.3' && RUBY_PATCHLEVEL == 0
+  # This is a hack to work around a bug in Ruby 1.9.3p0:
+  # http://redmine.ruby-lang.org/issues/5564
+  #
+  # Basically, at runtime we may need to perform some encoding conversions on the templates,
+  # but if the converter hasn't been loaded by Ruby beforehand (i.e. now), then it won't be
+  # able to find it (due to a  bug).
+  #
+  # However, we don't know what conversions we may need to do a runtime. So we load up a
+  # marshal-dumped structure which contains a pre-generated list of all the possible conversions,
+  # and we load all of them.
+  #
+  # In my testing this increased the process size by about 3.9 MB (after the conversions array
+  # is GC'd) and took around 170ms to run, which seems acceptable for a workaround.
+  #
+  # The script to dump the conversions is: https://gist.github.com/1342729
+
+  filename    = File.join(File.dirname(__FILE__), 'data', 'encoding_conversions.dump')
+  conversions = Marshal.load(File.read(filename))
+  conversions.each do |from, to_array|
+    to_array.each do |to|
+      Encoding::Converter.new(from, to)
+    end
+  end
+end
+
 module ActionView
   # = Action View Template
   class Template
-- 
cgit v1.2.3


From 8a2f0a9623e38b667fd7970337e3be52ade7a0e7 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 6 Nov 2011 10:54:59 +0000
Subject: RUBY_ENGINE is not defined on 1.8

---
 actionpack/lib/action_view/template.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 1f1a8f7867..fbc135c4a7 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -3,7 +3,7 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/kernel/singleton_class'
 
-if RUBY_ENGINE == 'ruby' && RUBY_VERSION == '1.9.3' && RUBY_PATCHLEVEL == 0
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '1.9.3' && RUBY_PATCHLEVEL == 0
   # This is a hack to work around a bug in Ruby 1.9.3p0:
   # http://redmine.ruby-lang.org/issues/5564
   #
-- 
cgit v1.2.3


From 759906d51272534941843fc80ae9f579b28c336c Mon Sep 17 00:00:00 2001
From: Dalibor Nasevic <dalibor.nasevic@gmail.com>
Date: Sun, 6 Nov 2011 14:43:11 +0100
Subject: Fixed stale doc in AbstractController::Layouts

---
 actionpack/lib/abstract_controller/layouts.rb | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 10aa34c76b..bbf5efe565 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -213,7 +213,7 @@ module AbstractController
       # true::   raise an ArgumentError
       #
       # ==== Parameters
-      # * <tt>String, Symbol, false</tt> - The layout to use.
+      # * <tt>layout</tt> - The layout to use.
       #
       # ==== Options (conditions)
       # * :only   - A list of actions to apply this layout to.
@@ -310,14 +310,10 @@ module AbstractController
     # This will be overwritten by _write_layout_method
     def _layout; end
 
-    # Determine the layout for a given name and details, taking into account
-    # the name type.
+    # Determine the layout for a given name, taking into account the name type.
     #
     # ==== Parameters
     # * <tt>name</tt> - The name of the template
-    # * <tt>details</tt> - A list of details to restrict
-    #   the lookup to. By default, layout lookup is limited to the
-    #   formats specified for the current request.
     def _layout_for_option(name)
       case name
       when String     then name
@@ -330,15 +326,12 @@ module AbstractController
       end
     end
 
-    # Returns the default layout for this controller and a given set of details.
+    # Returns the default layout for this controller.
     # Optionally raises an exception if the layout could not be found.
     #
     # ==== Parameters
-    # * <tt>details</tt> - A list of details to restrict the search by. This
-    #   might include details like the format or locale of the template.
-    # * <tt>require_layout</tt> - If this is true, raise an ArgumentError
-    #   with details about the fact that the exception could not be
-    #   found (defaults to false)
+    # * <tt>require_layout</tt> - If set to true and layout is not found,
+    #   an ArgumentError exception is raised (defaults to false)
     #
     # ==== Returns
     # * <tt>template</tt> - The template object for the default layout (or nil)
-- 
cgit v1.2.3


From cc3e738d89cc5a433473559c3f70e98c08f646de Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 7 Nov 2011 16:24:54 +0900
Subject: Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9

This was because String#respond_to?(:each) differs in 1.8 and 1.9
---
 actionpack/lib/action_controller/metal.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 0133b2ecbc..125dbf6bb5 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -182,7 +182,13 @@ module ActionController
     end
 
     def response_body=(val)
-      body = val.nil? ? nil : (val.respond_to?(:each) ? val : [val])
+      body = if val.is_a?(String)
+        [val]
+      elsif val.nil? || val.respond_to?(:each)
+        val
+      else
+        [val]
+      end
       super body
     end
 
-- 
cgit v1.2.3


From 6ac56ac93bd9e8a3e003f29eff2816218f0e5db6 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 7 Nov 2011 17:58:03 +0530
Subject: fix incorrect code example

---
 actionpack/lib/action_controller/metal/mime_responds.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 00bd1706e7..ca383be76b 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -182,7 +182,7 @@ module ActionController #:nodoc:
     #
     #     def index
     #       @people = Person.all
-    #       respond_with(@person)
+    #       respond_with(@people)
     #     end
     #   end
     #
-- 
cgit v1.2.3


From cf0a96bc6a20d58047934d6d9b78092228cc81d4 Mon Sep 17 00:00:00 2001
From: Ivan Evtukhovich <evtuhovich@gmail.com>
Date: Mon, 7 Nov 2011 18:57:55 +0400
Subject: DrbStore removed from cache backends

---
 actionpack/lib/action_controller/caching.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index 14137f2886..112573a38d 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -24,7 +24,6 @@ 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")
-- 
cgit v1.2.3


From bd559b00680b6e4c272d4df36f239768750f1a6b Mon Sep 17 00:00:00 2001
From: Bradford Folkens <bfolkens@gmail.com>
Date: Tue, 8 Nov 2011 07:52:35 -0600
Subject:     Fix trouble using :subdomain in development environment when
 using numeric addresses.

    See-also pull request #3561 from 3-1-stable

    Otherwise the following occurs:

    TypeError: can't convert nil into String
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for'
        /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send'
        /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
---
 actionpack/lib/action_dispatch/http/url.rb |  2 +-
 actionpack/test/controller/url_for_test.rb | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index c8ddd07bfa..129a8b1031 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -64,7 +64,7 @@ module ActionDispatch
         end
 
         def host_or_subdomain_and_domain(options)
-          return options[:host] if options[:subdomain].nil? && options[:domain].nil?
+          return options[:host] if !named_host?(options[:host]) || (options[:subdomain].nil? && options[:domain].nil?)
 
           tld_length = options[:tld_length] || @@tld_length
 
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index 11ced2df2a..dc07e07cb9 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -16,6 +16,10 @@ module AbstractController
         W.default_url_options[:host] = 'www.basecamphq.com'
       end
 
+      def add_numeric_host!
+        W.default_url_options[:host] = '127.0.0.1'
+      end
+
       def test_exception_is_thrown_without_host
         assert_raise ArgumentError do
           W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
@@ -81,6 +85,13 @@ module AbstractController
         )
       end
 
+      def test_subdomain_may_be_accepted_with_numeric_host
+        add_numeric_host!
+        assert_equal('http://127.0.0.1/c/a/i',
+          W.new.url_for(:subdomain => 'api', :controller => 'c', :action => 'a', :id => 'i')
+        )
+      end
+
       def test_domain_may_be_changed
         add_host!
         assert_equal('http://www.37signals.com/c/a/i',
-- 
cgit v1.2.3


From 979f3f894bf1034d4e9ee5ab9e285713f63c2824 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Tue, 8 Nov 2011 18:01:19 +0400
Subject: Fix small typo in link_to_function doc

---
 actionpack/lib/action_view/helpers/javascript_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 1adcd716f8..842f4c23a3 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -94,7 +94,7 @@ module ActionView
       # If +html_options+ has an <tt>:onclick</tt>, that one is put before +function+. Once all
       # the JavaScript is set, the helper appends "; return false;".
       #
-      # The +href+ attribute of the tag is set to "#" unles +html_options+ has one.
+      # The +href+ attribute of the tag is set to "#" unless +html_options+ has one.
       #
       #   link_to_function "Greeting", "alert('Hello world!')", :class => "nav_link"
       #   # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
-- 
cgit v1.2.3


From be7ab83b647c1ebb619b88854d310497075ea58f Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 10 Nov 2011 10:54:56 +0900
Subject: A test case to ensure that AC::Metal#response_body= always wraps the
 given value in an Array in both Ruby 1.8 and 1.9 (refs #3581)

---
 actionpack/test/controller/new_base/bare_metal_test.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb
index 3ca29f1bcf..c424dcbd8d 100644
--- a/actionpack/test/controller/new_base/bare_metal_test.rb
+++ b/actionpack/test/controller/new_base/bare_metal_test.rb
@@ -23,6 +23,12 @@ module BareMetalTest
 
       assert_equal "Hello world", string
     end
+
+    test "response_body value is wrapped in an array when the value is a String" do
+      controller = BareController.new
+      controller.index
+      assert_equal ["Hello world"], controller.response_body
+    end
   end
 
   class HeadController < ActionController::Metal
-- 
cgit v1.2.3


From 983a2dccaa263bad1f055a85d864a8097f0af8a2 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Thu, 10 Nov 2011 09:45:57 +0400
Subject: Cosmetic fix in number_to_currency docs

---
 actionpack/lib/action_view/helpers/number_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 7031694af4..e8ad043e20 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -100,10 +100,10 @@ module ActionView
       #  number_to_currency(1234567890.50)                    # => $1,234,567,890.50
       #  number_to_currency(1234567890.506)                   # => $1,234,567,890.51
       #  number_to_currency(1234567890.506, :precision => 3)  # => $1,234,567,890.506
-      #  number_to_currency(1234567890.506, :locale => :fr)   # => 1 234 567 890,506 €
+      #  number_to_currency(1234567890.506, :locale => :fr)   # => 1 234 567 890,51 €
       #
       #  number_to_currency(-1234567890.50, :negative_format => "(%u%n)")
-      #  # => ($1,234,567,890.51)
+      #  # => ($1,234,567,890.50)
       #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "")
       #  # => &pound;1234567890,50
       #  number_to_currency(1234567890.50, :unit => "&pound;", :separator => ",", :delimiter => "", :format => "%n %u")
-- 
cgit v1.2.3


From b5c3987294d3860a78b1b04ee49b2b55f3cdc614 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Thu, 10 Nov 2011 11:26:42 +0400
Subject: Fix and simplify highlight regexp

---
 actionpack/lib/action_view/helpers/text_helper.rb | 2 +-
 actionpack/test/template/text_helper_test.rb      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 21074efe86..bc8572fe69 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -120,7 +120,7 @@ module ActionView
           text
         else
           match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
-          text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
+          text.gsub(/(#{match})(?![^<]*?>)/i, options[:highlighter])
         end.html_safe
       end
 
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 02f9609483..a0afb77f05 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -194,6 +194,10 @@ class TextHelperTest < ActionView::TestCase
       "<p>This is a <strong class=\"highlight\">beautiful</strong> <a href=\"http://example.com/beautiful#top?what=beautiful%20morning&amp;when=now+then\">morning</a>, but also a <strong class=\"highlight\">beautiful</strong> day</p>",
       highlight("<p>This is a beautiful <a href=\"http://example.com/beautiful\#top?what=beautiful%20morning&when=now+then\">morning</a>, but also a beautiful day</p>", "beautiful")
     )
+    assert_equal(
+      "<div>abc <b>div</b></div>",
+      highlight("<div>abc div</div>", "div", :highlighter => '<b>\1</b>')
+    )
   end
 
   def test_excerpt
-- 
cgit v1.2.3


From a766d834a73efe6a59cbfaf4f25ab73c088465d7 Mon Sep 17 00:00:00 2001
From: Dimitar Dimitrov <wireman@gmail.com>
Date: Fri, 11 Nov 2011 19:37:54 +0200
Subject: Fix wording and minor typos in the Responder RDoc

---
 actionpack/lib/action_controller/metal/responder.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index c7827309dd..2f19c76bff 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -84,8 +84,8 @@ module ActionController #:nodoc:
   #
   # === Custom options
   #
-  # <code>respond_with</code> also allow you to pass options that are forwarded
-  # to the underlying render call. Those options are only applied success
+  # <code>respond_with</code> also allows you to pass options that are forwarded
+  # to the underlying render call. Those options are only applied for success
   # scenarios. For instance, you can do the following in the create method above:
   #
   #   def create
@@ -95,7 +95,7 @@ module ActionController #:nodoc:
   #     respond_with(@project, @task, :status => 201)
   #   end
   #
-  # This will return status 201 if the task was saved with success. If not,
+  # This will return status 201 if the task was saved successfully. If not,
   # it will simply ignore the given options and return status 422 and the
   # resource errors. To customize the failure scenario, you can pass a
   # a block to <code>respond_with</code>:
@@ -224,7 +224,7 @@ module ActionController #:nodoc:
     alias :navigation_location :resource_location
     alias :api_location :resource_location
 
-    # If a given response block was given, use it, otherwise call render on
+    # If a response block was given, use it, otherwise call render on
     # controller.
     #
     def default_render
-- 
cgit v1.2.3


From 9432163c60fc4387d1dfb11ca7c92a08ce72f1c2 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Fri, 11 Nov 2011 21:22:49 -1000
Subject: refactor RemoteIp middleware

- return the last forwarded IP before REMOTE_ADDR to handle proxies
- remove completely superfluous RemoteIpGetter class
- remove duplication of trusted proxies regexp
- remove unused constant from Request
- move comments from Request to where they are actually relevant
- edit comments for clarity of purpose

The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.
---
 actionpack/lib/action_dispatch/http/request.rb     | 19 +----
 .../lib/action_dispatch/middleware/remote_ip.rb    | 81 ++++++++++++----------
 2 files changed, 45 insertions(+), 55 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 7a5237dcf3..69ca050d0c 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -155,24 +155,7 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Which IP addresses are "trusted proxies" that can be stripped from
-    # the right-hand-side of X-Forwarded-For.
-    #
-    # http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces.
-    TRUSTED_PROXIES = %r{
-      ^127\.0\.0\.1$                | # localhost
-      ^(10                          | # private IP 10.x.x.x
-        172\.(1[6-9]|2[0-9]|3[0-1]) | # private IP in the range 172.16.0.0 .. 172.31.255.255
-        192\.168                      # private IP 192.168.x.x
-       )\.
-    }x
-
-    # Determines originating IP address. REMOTE_ADDR is the standard
-    # but will fail if the user is behind a proxy. HTTP_CLIENT_IP and/or
-    # HTTP_X_FORWARDED_FOR are set by proxies so check for these if
-    # REMOTE_ADDR is a proxy. HTTP_X_FORWARDED_FOR may be a comma-
-    # delimited list in the case of multiple chained proxies; the last
-    # address which is not trusted is the originating IP.
+    # Originating IP address, usually set by the RemoteIp middleware.
     def remote_ip
       @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
     end
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index c7d710b98e..79f9ddcd04 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -2,50 +2,57 @@ module ActionDispatch
   class RemoteIp
     class IpSpoofAttackError < StandardError ; end
 
-    class RemoteIpGetter
-      def initialize(env, check_ip_spoofing, trusted_proxies)
-        @env = env
-        @check_ip_spoofing = check_ip_spoofing
-        @trusted_proxies = trusted_proxies
+    # IP addresses that are "trusted proxies" that can be stripped from
+    # the comma-delimited list in the X-Forwarded-For header. See also:
+    # http://en.wikipedia.org/wiki/Private_network#Private_IPv4_address_spaces
+    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
+
+    def initialize(app, check_ip_spoofing = true, custom_proxies = nil)
+      @app = app
+      @check_ip_spoofing = check_ip_spoofing
+      if custom_proxies
+        custom_regexp = Regexp.new(custom_proxies, "i")
+        @trusted_proxies = Regexp.union(TRUSTED_PROXIES, custom_regexp)
+      else
+        @trusted_proxies = TRUSTED_PROXIES
       end
+    end
 
-      def remote_addrs
-        @remote_addrs ||= begin
-          list = @env['REMOTE_ADDR'] ? @env['REMOTE_ADDR'].split(/[,\s]+/) : []
-          list.reject { |addr| addr =~ @trusted_proxies }
-        end
+    # Determines originating IP address. REMOTE_ADDR is the standard
+    # but will be wrong if the user is behind a proxy. Proxies will set
+    # HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR, so we prioritize those.
+    # HTTP_X_FORWARDED_FOR may be a comma-delimited list in the case of
+    # multiple chained proxies. The last address which is not a known proxy
+    # will be the originating IP.
+    def call(env)
+      client_ip     = env['HTTP_CLIENT_IP']
+      forwarded_ips = ips_from(env, 'HTTP_X_FORWARDED_FOR')
+      remote_addrs  = ips_from(env, 'REMOTE_ADDR')
+
+      if client_ip && @check_ip_spoofing && !forwarded_ips.include?(client_ip)
+        # We don't know which came from the proxy, and which from the user
+        raise IpSpoofAttackError, "IP spoofing attack?!" \
+          "HTTP_CLIENT_IP=#{env['HTTP_CLIENT_IP'].inspect}" \
+          "HTTP_X_FORWARDED_FOR=#{env['HTTP_X_FORWARDED_FOR'].inspect}"
       end
 
-      def to_s
-        return remote_addrs.first if remote_addrs.any?
-
-        forwarded_ips = @env['HTTP_X_FORWARDED_FOR'] ? @env['HTTP_X_FORWARDED_FOR'].strip.split(/[,\s]+/) : []
-
-        if client_ip = @env['HTTP_CLIENT_IP']
-          if @check_ip_spoofing && !forwarded_ips.include?(client_ip)
-            # We don't know which came from the proxy, and which from the user
-            raise IpSpoofAttackError, "IP spoofing attack?!" \
-              "HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}" \
-              "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
-          end
-          return client_ip
-        end
-
-        return forwarded_ips.reject { |ip| ip =~ @trusted_proxies }.last || @env["REMOTE_ADDR"]
-      end
+      remote_ip = client_ip || forwarded_ips.last || remote_addrs.last
+      env["action_dispatch.remote_ip"] = remote_ip
+      @app.call(env)
     end
 
-    def initialize(app, check_ip_spoofing = true, trusted_proxies = nil)
-      @app = app
-      @check_ip_spoofing = check_ip_spoofing
-      regex = '(^127\.0\.0\.1$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\.)'
-      regex << "|(#{trusted_proxies})" if trusted_proxies
-      @trusted_proxies = Regexp.new(regex, "i")
-    end
+  protected
 
-    def call(env)
-      env["action_dispatch.remote_ip"] = RemoteIpGetter.new(env, @check_ip_spoofing, @trusted_proxies)
-      @app.call(env)
+    def ips_from(env, header)
+      ips = env[header] ? env[header].strip.split(/[,\s]+/) : []
+      ips.reject{|ip| ip =~ @trusted_proxies }
     end
+
   end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 317f4e22365e2d9b8200aefbda943798e8f85a82 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sat, 12 Nov 2011 00:45:31 -1000
Subject: defer calculating the remote IP until requested

---
 .../lib/action_dispatch/middleware/remote_ip.rb    | 60 +++++++++++++---------
 1 file changed, 36 insertions(+), 24 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 79f9ddcd04..3b813b03bb 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -13,6 +13,8 @@ module ActionDispatch
        )\.
     }x
 
+    attr_reader :check_ip_spoofing, :trusted_proxies
+
     def initialize(app, check_ip_spoofing = true, custom_proxies = nil)
       @app = app
       @check_ip_spoofing = check_ip_spoofing
@@ -24,35 +26,45 @@ module ActionDispatch
       end
     end
 
-    # Determines originating IP address. REMOTE_ADDR is the standard
-    # but will be wrong if the user is behind a proxy. Proxies will set
-    # HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR, so we prioritize those.
-    # HTTP_X_FORWARDED_FOR may be a comma-delimited list in the case of
-    # multiple chained proxies. The last address which is not a known proxy
-    # will be the originating IP.
     def call(env)
-      client_ip     = env['HTTP_CLIENT_IP']
-      forwarded_ips = ips_from(env, 'HTTP_X_FORWARDED_FOR')
-      remote_addrs  = ips_from(env, 'REMOTE_ADDR')
-
-      if client_ip && @check_ip_spoofing && !forwarded_ips.include?(client_ip)
-        # We don't know which came from the proxy, and which from the user
-        raise IpSpoofAttackError, "IP spoofing attack?!" \
-          "HTTP_CLIENT_IP=#{env['HTTP_CLIENT_IP'].inspect}" \
-          "HTTP_X_FORWARDED_FOR=#{env['HTTP_X_FORWARDED_FOR'].inspect}"
-      end
-
-      remote_ip = client_ip || forwarded_ips.last || remote_addrs.last
-      env["action_dispatch.remote_ip"] = remote_ip
+      env["action_dispatch.remote_ip"] = GetIp.new(env, self)
       @app.call(env)
     end
 
-  protected
+    class GetIp
+      def initialize(env, middleware)
+        @env, @middleware = env, middleware
+      end
+
+      # Determines originating IP address. REMOTE_ADDR is the standard
+      # but will be wrong if the user is behind a proxy. Proxies will set
+      # HTTP_CLIENT_IP and/or HTTP_X_FORWARDED_FOR, so we prioritize those.
+      # HTTP_X_FORWARDED_FOR may be a comma-delimited list in the case of
+      # multiple chained proxies. The last address which is not a known proxy
+      # will be the originating IP.
+      def to_s
+        client_ip     = @env['HTTP_CLIENT_IP']
+        forwarded_ips = ips_from('HTTP_X_FORWARDED_FOR')
+        remote_addrs  = ips_from('REMOTE_ADDR')
 
-    def ips_from(env, header)
-      ips = env[header] ? env[header].strip.split(/[,\s]+/) : []
-      ips.reject{|ip| ip =~ @trusted_proxies }
+        check_ip = client_ip && @middleware.check_ip_spoofing
+        if check_ip && !forwarded_ips.include?(client_ip)
+          # We don't know which came from the proxy, and which from the user
+          raise IpSpoofAttackError, "IP spoofing attack?!" \
+            "HTTP_CLIENT_IP=#{env['HTTP_CLIENT_IP'].inspect}" \
+            "HTTP_X_FORWARDED_FOR=#{env['HTTP_X_FORWARDED_FOR'].inspect}"
+        end
+
+        client_ip || forwarded_ips.last || remote_addrs.last
+      end
+
+    protected
+
+      def ips_from(header)
+        ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
+        ips.reject{|ip| ip =~ @middleware.trusted_proxies }
+      end
     end
 
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From b74aedff3c4df83376ac969163e646bcf20bc7d4 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Sat, 12 Nov 2011 23:15:54 +0900
Subject: Unneeded require memoizable

---
 actionpack/lib/action_dispatch/http/headers.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index 505d5560b1..040b51e040 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -1,5 +1,3 @@
-require 'active_support/memoizable'
-
 module ActionDispatch
   module Http
     class Headers < ::Hash
-- 
cgit v1.2.3


From 8f0085a483ebc6d416e902c3caff68f82934e091 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sun, 13 Nov 2011 10:19:54 -1000
Subject: change tests to expect X-F-F over REMOTE_ADDR

---
 actionpack/test/dispatch/request_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index a611252b31..4658eeea17 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -36,7 +36,7 @@ class RequestTest < ActiveSupport::TestCase
 
     request = stub_request 'REMOTE_ADDR' => '1.2.3.4',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    assert_equal '1.2.3.4', request.remote_ip
+    assert_equal '3.4.5.6', request.remote_ip
 
     request = stub_request 'REMOTE_ADDR' => '127.0.0.1',
       'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
@@ -106,7 +106,7 @@ class RequestTest < ActiveSupport::TestCase
 
     request = stub_request 'REMOTE_ADDR' => '67.205.106.74,172.16.0.1',
                            'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
-    assert_equal '67.205.106.74', request.remote_ip
+    assert_equal '3.4.5.6', request.remote_ip
 
     request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,67.205.106.73'
     assert_equal 'unknown', request.remote_ip
-- 
cgit v1.2.3


From 2189bff732490aa842c88f1691993520fa1eb9ab Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sun, 13 Nov 2011 10:20:29 -1000
Subject: correctly raise IpSpoofAttackError message

---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 3b813b03bb..3208256d56 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -51,8 +51,8 @@ module ActionDispatch
         if check_ip && !forwarded_ips.include?(client_ip)
           # We don't know which came from the proxy, and which from the user
           raise IpSpoofAttackError, "IP spoofing attack?!" \
-            "HTTP_CLIENT_IP=#{env['HTTP_CLIENT_IP'].inspect}" \
-            "HTTP_X_FORWARDED_FOR=#{env['HTTP_X_FORWARDED_FOR'].inspect}"
+            "HTTP_CLIENT_IP=#{@env['HTTP_CLIENT_IP'].inspect}" \
+            "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
         end
 
         client_ip || forwarded_ips.last || remote_addrs.last
-- 
cgit v1.2.3


From 2d063c6269a546c8bab4b36c027246f582bfaa13 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sun, 13 Nov 2011 10:20:55 -1000
Subject: turns out the tests expect remote_addrs.first

---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 3208256d56..5f81b639ae 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -55,7 +55,7 @@ module ActionDispatch
             "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
         end
 
-        client_ip || forwarded_ips.last || remote_addrs.last
+        client_ip || forwarded_ips.last || remote_addrs.first
       end
 
     protected
-- 
cgit v1.2.3


From 9c4532bf74604ae1c52a44d1aa8c1022a312ff88 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Sun, 13 Nov 2011 10:22:12 -1000
Subject: remove ignored flag, fixes warnings

---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 5f81b639ae..58e25aed5a 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -19,7 +19,7 @@ module ActionDispatch
       @app = app
       @check_ip_spoofing = check_ip_spoofing
       if custom_proxies
-        custom_regexp = Regexp.new(custom_proxies, "i")
+        custom_regexp = Regexp.new(custom_proxies)
         @trusted_proxies = Regexp.union(TRUSTED_PROXIES, custom_regexp)
       else
         @trusted_proxies = TRUSTED_PROXIES
-- 
cgit v1.2.3


From e0eb2292bb8dfce150cd7c1d9948beff14f0cd7c Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 14 Nov 2011 06:25:03 -0500
Subject: Upgrade Sprockets to 2.1.0

This version brings bug fixes for performance and caching.
---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index a446531a6b..9da9143de3 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0')
-  s.add_dependency('sprockets',     '~> 2.1.0.beta')
+  s.add_dependency('sprockets',     '~> 2.1.0')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')
-- 
cgit v1.2.3


From da02f792fe78535628f86bf983308800207b4225 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 11:28:12 +0000
Subject: Sync CHANGELOGs from 3-1-stable

---
 actionpack/CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 74711c0320..3e2dbe4e13 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -64,6 +64,15 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Ensure that the format isn't applied twice to the cache key, else it becomes impossible
+    to target with expire_action.
+
+    *Christopher Meiklejohn*
+
+*   Swallow error when can't unmarshall object from session.
+
+    *Bruno Zanchet*
+
 *   Implement a workaround for a bug in ruby-1.9.3p0 where an error would be raised
     while attempting to convert a template from one encoding to another.
 
@@ -76,6 +85,8 @@
 
     *Jon Leighton*
 
+*   Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
+
 ## Rails 3.1.1 (unreleased) ##
 
 *   javascript_path and stylesheet_path now refer to /assets if asset pipelining
-- 
cgit v1.2.3


From ca3b4689375f0f65275407f28981c58a15d50193 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 12:23:43 +0000
Subject: Sync changelog entry

---
 actionpack/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 3e2dbe4e13..4c265c41d8 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -64,6 +64,8 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Upgrade sprockets dependency to ~> 2.1.0
+
 *   Ensure that the format isn't applied twice to the cache key, else it becomes impossible
     to target with expire_action.
 
-- 
cgit v1.2.3


From 00a0a4ddebe0160f851d28e29d5fb7e8e7a2a5dc Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Mon, 14 Nov 2011 11:20:20 -1000
Subject: cleaner names

---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 58e25aed5a..446fcce823 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -13,16 +13,16 @@ module ActionDispatch
        )\.
     }x
 
-    attr_reader :check_ip_spoofing, :trusted_proxies
+    attr_reader :check_ip, :proxies
 
     def initialize(app, check_ip_spoofing = true, custom_proxies = nil)
       @app = app
-      @check_ip_spoofing = check_ip_spoofing
+      @check_ip = check_ip_spoofing
       if custom_proxies
         custom_regexp = Regexp.new(custom_proxies)
-        @trusted_proxies = Regexp.union(TRUSTED_PROXIES, custom_regexp)
+        @proxies = Regexp.union(TRUSTED_PROXIES, custom_regexp)
       else
-        @trusted_proxies = TRUSTED_PROXIES
+        @proxies = TRUSTED_PROXIES
       end
     end
 
@@ -47,7 +47,7 @@ module ActionDispatch
         forwarded_ips = ips_from('HTTP_X_FORWARDED_FOR')
         remote_addrs  = ips_from('REMOTE_ADDR')
 
-        check_ip = client_ip && @middleware.check_ip_spoofing
+        check_ip = client_ip && @middleware.check_ip
         if check_ip && !forwarded_ips.include?(client_ip)
           # We don't know which came from the proxy, and which from the user
           raise IpSpoofAttackError, "IP spoofing attack?!" \
@@ -62,7 +62,7 @@ module ActionDispatch
 
       def ips_from(header)
         ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
-        ips.reject{|ip| ip =~ @middleware.trusted_proxies }
+        ips.reject{|ip| ip =~ @middleware.proxies }
       end
     end
 
-- 
cgit v1.2.3


From cda1a5d5fe002ca92aca01586e8a60439605f960 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Mon, 14 Nov 2011 11:20:57 -1000
Subject: memoize the relatively expensive remote IP code

---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 446fcce823..ee0d19a50d 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -42,7 +42,7 @@ module ActionDispatch
       # HTTP_X_FORWARDED_FOR may be a comma-delimited list in the case of
       # multiple chained proxies. The last address which is not a known proxy
       # will be the originating IP.
-      def to_s
+      def calculate_ip
         client_ip     = @env['HTTP_CLIENT_IP']
         forwarded_ips = ips_from('HTTP_X_FORWARDED_FOR')
         remote_addrs  = ips_from('REMOTE_ADDR')
@@ -58,6 +58,12 @@ module ActionDispatch
         client_ip || forwarded_ips.last || remote_addrs.first
       end
 
+      def to_s
+        return @ip if @calculated_ip
+        @calculated_ip = true
+        @ip = calculate_ip
+      end
+
     protected
 
       def ips_from(header)
-- 
cgit v1.2.3


From 4f2bf6491cbc482d25a9357c2eb7fc8047d4f12e Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Mon, 14 Nov 2011 11:22:44 -1000
Subject: Return the calculated remote_ip or ip

This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
---
 actionpack/lib/action_dispatch/http/request.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 69ca050d0c..b10f6b48c7 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -157,7 +157,8 @@ module ActionDispatch
 
     # Originating IP address, usually set by the RemoteIp middleware.
     def remote_ip
-      @remote_ip ||= (@env["action_dispatch.remote_ip"] || ip).to_s
+      # Coerce the remote_ip object into a string, because to_s could return nil
+      @remote_ip ||= @env["action_dispatch.remote_ip"].to_s || ip
     end
 
     # Returns the unique request id, which is based off either the X-Request-Id header that can
-- 
cgit v1.2.3


From b8c85de62004868a34a27e58731f2a9e37aeebd0 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Mon, 14 Nov 2011 12:29:51 -1000
Subject: add test for bug fixed in 4f2bf64

---
 actionpack/test/dispatch/request_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 4658eeea17..4d805464c2 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -89,6 +89,11 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal '9.9.9.9', request.remote_ip
   end
 
+  test "remote ip when the remote ip middleware returns nil" do
+    request = stub_request 'REMOTE_ADDR' => '127.0.0.1'
+    assert_equal '127.0.0.1', request.remote_ip
+  end
+
   test "remote ip with user specified trusted proxies" do
     @trusted_proxies = /^67\.205\.106\.73$/i
 
-- 
cgit v1.2.3


From d743954792ccf5975a11ee88cdd690e8f1915728 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Mon, 14 Nov 2011 16:43:21 -1000
Subject: GetIp#to_s should never return nil. That's icky.

---
 actionpack/lib/action_dispatch/http/request.rb         | 5 ++---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index b10f6b48c7..0e8bd0bd6d 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -155,10 +155,9 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Originating IP address, usually set by the RemoteIp middleware.
+    # Originating IP address from the RemoteIp middleware.
     def remote_ip
-      # Coerce the remote_ip object into a string, because to_s could return nil
-      @remote_ip ||= @env["action_dispatch.remote_ip"].to_s || ip
+      @remote_ip ||= @env["action_dispatch.remote_ip"]
     end
 
     # Returns the unique request id, which is based off either the X-Request-Id header that can
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index ee0d19a50d..77aa4e743e 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -55,7 +55,10 @@ module ActionDispatch
             "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
         end
 
-        client_ip || forwarded_ips.last || remote_addrs.first
+        not_proxy = client_ip || forwarded_ips.last || remote_addrs.first
+
+        # Return first REMOTE_ADDR if there are no other options
+        not_proxy || ips_from('REMOTE_ADDR', :all).first
       end
 
       def to_s
@@ -66,9 +69,9 @@ module ActionDispatch
 
     protected
 
-      def ips_from(header)
+      def ips_from(header, allow_proxies = false)
         ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
-        ips.reject{|ip| ip =~ @middleware.proxies }
+        allow_proxies ? ips : ips.reject{|ip| ip =~ @middleware.proxies }
       end
     end
 
-- 
cgit v1.2.3


From 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 15 Nov 2011 22:47:18 +0000
Subject: Revert "Merge pull request #3640 from indirect/remote_ip"

This reverts commit 6491aadc525b8703708e0fd0fbf05bd436a47801, reversing
changes made to 83bf0b626cf2134260903e57d74f67de57384073.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.
---
 actionpack/lib/action_dispatch/http/request.rb         | 5 +++--
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 0e8bd0bd6d..b10f6b48c7 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -155,9 +155,10 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Originating IP address from the RemoteIp middleware.
+    # Originating IP address, usually set by the RemoteIp middleware.
     def remote_ip
-      @remote_ip ||= @env["action_dispatch.remote_ip"]
+      # Coerce the remote_ip object into a string, because to_s could return nil
+      @remote_ip ||= @env["action_dispatch.remote_ip"].to_s || ip
     end
 
     # Returns the unique request id, which is based off either the X-Request-Id header that can
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 77aa4e743e..ee0d19a50d 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -55,10 +55,7 @@ module ActionDispatch
             "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
         end
 
-        not_proxy = client_ip || forwarded_ips.last || remote_addrs.first
-
-        # Return first REMOTE_ADDR if there are no other options
-        not_proxy || ips_from('REMOTE_ADDR', :all).first
+        client_ip || forwarded_ips.last || remote_addrs.first
       end
 
       def to_s
@@ -69,9 +66,9 @@ module ActionDispatch
 
     protected
 
-      def ips_from(header, allow_proxies = false)
+      def ips_from(header)
         ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
-        allow_proxies ? ips : ips.reject{|ip| ip =~ @middleware.proxies }
+        ips.reject{|ip| ip =~ @middleware.proxies }
       end
     end
 
-- 
cgit v1.2.3


From 3a6a10a36d9fdcc6de0f2a8e81c73001c1331072 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Wed, 16 Nov 2011 21:37:10 +0000
Subject: Switch from marshal format to plain text for the encoding conversions
 dump. This is for windows compatibility. Fixes #3644.

---
 .../lib/action_view/data/encoding_conversions.dump | Bin 122854 -> 0 bytes
 .../lib/action_view/data/encoding_conversions.txt  |  88 +++++++++++++++++++++
 actionpack/lib/action_view/template.rb             |  13 +--
 3 files changed, 95 insertions(+), 6 deletions(-)
 delete mode 100644 actionpack/lib/action_view/data/encoding_conversions.dump
 create mode 100644 actionpack/lib/action_view/data/encoding_conversions.txt

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/data/encoding_conversions.dump b/actionpack/lib/action_view/data/encoding_conversions.dump
deleted file mode 100644
index 18d7cd448b..0000000000
Binary files a/actionpack/lib/action_view/data/encoding_conversions.dump and /dev/null differ
diff --git a/actionpack/lib/action_view/data/encoding_conversions.txt b/actionpack/lib/action_view/data/encoding_conversions.txt
new file mode 100644
index 0000000000..fdfbe28803
--- /dev/null
+++ b/actionpack/lib/action_view/data/encoding_conversions.txt
@@ -0,0 +1,88 @@
+ASCII-8BIT:UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-8:ASCII-8BIT,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+US-ASCII:ASCII-8BIT,UTF-8,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Big5:ASCII-8BIT,UTF-8,US-ASCII,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Big5-HKSCS:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Big5-UAO:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP949:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+EUC-JP:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+EUC-KR:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+GB18030:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+GBK:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-1:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-2:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-3:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-4:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-5:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-6:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-7:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-8:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-9:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-10:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-11:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-13:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-14:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-8859-15:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+KOI8-R:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+KOI8-U:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Shift_JIS:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-16BE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-16LE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-32BE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-32LE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1251:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM437:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM737:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM775:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP850:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM852:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP852:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM855:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP855:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM857:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM860:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM861:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM862:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM863:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM865:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM866:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+IBM869:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macCroatian:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macCyrillic:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macGreek:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macIceland:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macRoman:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macRomania:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macTurkish:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+macUkraine:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP950:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP951:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+stateless-ISO-2022-JP:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+eucJP-ms:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP51932:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+GB2312:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+GB12345:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-2022-JP:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP50220:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+CP50221:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1252:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1250:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1256:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1253:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1255:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1254:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+TIS-620:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-874:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-1257:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+Windows-31J:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF8-MAC:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-16:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF-32:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF8-DoCoMo:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+SJIS-DoCoMo:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF8-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+SJIS-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+ISO-2022-JP-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+stateless-ISO-2022-JP-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
+UTF8-SoftBank:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,SJIS-SoftBank
+SJIS-SoftBank:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank
\ No newline at end of file
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index fbc135c4a7..8d69880308 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -12,18 +12,19 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '1.9.3' &&
   # able to find it (due to a  bug).
   #
   # However, we don't know what conversions we may need to do a runtime. So we load up a
-  # marshal-dumped structure which contains a pre-generated list of all the possible conversions,
+  # text file which contains a pre-generated list of all the possible conversions,
   # and we load all of them.
   #
   # In my testing this increased the process size by about 3.9 MB (after the conversions array
   # is GC'd) and took around 170ms to run, which seems acceptable for a workaround.
   #
-  # The script to dump the conversions is: https://gist.github.com/1342729
+  # The script to dump the conversions is: https://gist.github.com/1371499
 
-  filename    = File.join(File.dirname(__FILE__), 'data', 'encoding_conversions.dump')
-  conversions = Marshal.load(File.read(filename))
-  conversions.each do |from, to_array|
-    to_array.each do |to|
+  filename    = File.join(File.dirname(__FILE__), 'data', 'encoding_conversions.txt')
+  conversions = File.read(filename)
+  conversions.split("\n").map do |line|
+    from, to_array = line.split(':')
+    to_array.split(',').each do |to|
       Encoding::Converter.new(from, to)
     end
   end
-- 
cgit v1.2.3


From f05ccf805a6d2a3ed73ef9928577e8b0ebbb3c49 Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Wed, 16 Nov 2011 12:53:43 -1000
Subject: Revert "Revert "Merge pull request #3640 from indirect/remote_ip""

This reverts commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f, because I have fixed the issues this commit caused in the next commit.
---
 actionpack/lib/action_dispatch/http/request.rb         | 5 ++---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 9 ++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index b10f6b48c7..0e8bd0bd6d 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -155,10 +155,9 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Originating IP address, usually set by the RemoteIp middleware.
+    # Originating IP address from the RemoteIp middleware.
     def remote_ip
-      # Coerce the remote_ip object into a string, because to_s could return nil
-      @remote_ip ||= @env["action_dispatch.remote_ip"].to_s || ip
+      @remote_ip ||= @env["action_dispatch.remote_ip"]
     end
 
     # Returns the unique request id, which is based off either the X-Request-Id header that can
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index ee0d19a50d..77aa4e743e 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -55,7 +55,10 @@ module ActionDispatch
             "HTTP_X_FORWARDED_FOR=#{@env['HTTP_X_FORWARDED_FOR'].inspect}"
         end
 
-        client_ip || forwarded_ips.last || remote_addrs.first
+        not_proxy = client_ip || forwarded_ips.last || remote_addrs.first
+
+        # Return first REMOTE_ADDR if there are no other options
+        not_proxy || ips_from('REMOTE_ADDR', :all).first
       end
 
       def to_s
@@ -66,9 +69,9 @@ module ActionDispatch
 
     protected
 
-      def ips_from(header)
+      def ips_from(header, allow_proxies = false)
         ips = @env[header] ? @env[header].strip.split(/[,\s]+/) : []
-        ips.reject{|ip| ip =~ @middleware.proxies }
+        allow_proxies ? ips : ips.reject{|ip| ip =~ @middleware.proxies }
       end
     end
 
-- 
cgit v1.2.3


From 5621abd5698536f1676306930f6aef105d7ae6dc Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Wed, 16 Nov 2011 12:49:15 -1000
Subject: :facepalm: Request#remote_ip has to work without the middleware

---
 actionpack/lib/action_dispatch/http/request.rb         | 4 ++--
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 0e8bd0bd6d..4e6feb708e 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -155,9 +155,9 @@ module ActionDispatch
       @ip ||= super
     end
 
-    # Originating IP address from the RemoteIp middleware.
+    # Originating IP address, usually set by the RemoteIp middleware.
     def remote_ip
-      @remote_ip ||= @env["action_dispatch.remote_ip"]
+      @remote_ip ||= @env["action_dispatch.remote_ip"] || ip
     end
 
     # Returns the unique request id, which is based off either the X-Request-Id header that can
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 77aa4e743e..3a88f2ca43 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -58,7 +58,7 @@ module ActionDispatch
         not_proxy = client_ip || forwarded_ips.last || remote_addrs.first
 
         # Return first REMOTE_ADDR if there are no other options
-        not_proxy || ips_from('REMOTE_ADDR', :all).first
+        not_proxy || ips_from('REMOTE_ADDR', :allow_proxies).first
       end
 
       def to_s
-- 
cgit v1.2.3


From a9044d011790063e17159209f7bb1cbea255d4dd Mon Sep 17 00:00:00 2001
From: Andre Arko <andre@arko.net>
Date: Wed, 16 Nov 2011 12:58:49 -1000
Subject: the object itself isn't the IP, #to_s is the IP

---
 actionpack/lib/action_dispatch/http/request.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 4e6feb708e..69ca050d0c 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -157,7 +157,7 @@ module ActionDispatch
 
     # Originating IP address, usually set by the RemoteIp middleware.
     def remote_ip
-      @remote_ip ||= @env["action_dispatch.remote_ip"] || 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
-- 
cgit v1.2.3


From e3671422556ac61f39539264713ba9c04814b80f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 16:55:11 -0800
Subject: Initialize our instance variables.

---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 3a88f2ca43..8dbe3af6f1 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -33,7 +33,9 @@ module ActionDispatch
 
     class GetIp
       def initialize(env, middleware)
-        @env, @middleware = env, middleware
+        @env          = env
+        @middleware   = middleware
+        @calculate_ip = false
       end
 
       # Determines originating IP address. REMOTE_ADDR is the standard
-- 
cgit v1.2.3


From c2b6f63bbe2740fd63a36eeefe17d51813a17324 Mon Sep 17 00:00:00 2001
From: Alexander Uvarov <alexander.uvarov@gmail.com>
Date: Thu, 17 Nov 2011 12:04:46 +0600
Subject: Fix impractical I18n lookup in nested fields_for

---
 actionpack/lib/action_view/helpers/form_helper.rb | 10 ++++-
 actionpack/test/template/form_helper_test.rb      | 46 +++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index f148ffbd73..d687866d0d 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -995,8 +995,16 @@ module ActionView
           label_tag(name_and_id["id"], options, &block)
         else
           content = if text.blank?
+            object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1')
             method_and_value = tag_value.present? ? "#{method_name}.#{tag_value}" : method_name
-            I18n.t("helpers.label.#{object_name}.#{method_and_value}", :default => "").presence
+
+            if object.respond_to?(:to_model)
+              key = object.class.model_name.i18n_key
+              i18n_default = ["#{key}.#{method_and_value}".to_sym, ""]
+            end
+
+            i18n_default ||= ""
+            I18n.t("#{object_name}.#{method_and_value}", :default => i18n_default, :scope => "helpers.label").presence
           else
             text.to_s
           end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 6434d9645e..34486bb151 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -27,7 +27,13 @@ class FormHelperTest < ActionView::TestCase
             :body => "Write entire text here",
             :color => {
               :red => "Rojo"
+            },
+            :comments => {
+              :body => "Write body here"
             }
+          },
+          :tag => {
+            :value => "Tag"
           }
         }
       }
@@ -68,6 +74,12 @@ class FormHelperTest < ActionView::TestCase
     @post.secret      = 1
     @post.written_on  = Date.new(2004, 6, 15)
 
+    @post.comments = []
+    @post.comments << @comment
+
+    @post.tags = []
+    @post.tags << Tag.new
+
     @blog_post = Blog::Post.new("And his name will be forty and four.", 44)
   end
 
@@ -151,6 +163,40 @@ class FormHelperTest < ActionView::TestCase
     I18n.locale = old_locale
   end
 
+  def test_label_with_locales_and_nested_attributes
+    old_locale, I18n.locale = I18n.locale, :label
+    form_for(@post, :html => { :id => 'create-post' }) do |f|
+      f.fields_for(:comments) do |cf|
+        concat cf.label(:body)
+      end
+    end
+
+    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => "put") do
+      "<label for=\"post_comments_attributes_0_body\">Write body here</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  ensure
+    I18n.locale = old_locale
+  end
+
+  def test_label_with_locales_fallback_and_nested_attributes
+    old_locale, I18n.locale = I18n.locale, :label
+    form_for(@post, :html => { :id => 'create-post' }) do |f|
+      f.fields_for(:tags) do |cf|
+        concat cf.label(:value)
+      end
+    end
+
+    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => "put") do
+      "<label for=\"post_tags_attributes_0_value\">Tag</label>"
+    end
+
+    assert_dom_equal expected, output_buffer
+  ensure
+    I18n.locale = old_locale
+  end
+
   def test_label_with_for_attribute_as_symbol
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
   end
-- 
cgit v1.2.3


From c3ae1d2aec400d6aaea78bd94eb7845b71f1ec15 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 17 Nov 2011 12:50:19 +0530
Subject: It should be @calculated_ip not @calculate_ip

We are using @calculated_ip.
@calculate_ip is no where used
---
 actionpack/lib/action_dispatch/middleware/remote_ip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 8dbe3af6f1..66ece60860 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -35,7 +35,7 @@ module ActionDispatch
       def initialize(env, middleware)
         @env          = env
         @middleware   = middleware
-        @calculate_ip = false
+        @calculated_ip = false
       end
 
       # Determines originating IP address. REMOTE_ADDR is the standard
-- 
cgit v1.2.3


From d57d8098fc269a26ea0051a9027a33af1a9a4b2b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 17 Nov 2011 23:07:06 +0100
Subject: warn the user values are directly interpolated into _html translation
 strings

---
 actionpack/lib/action_view/helpers/translation_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index be64dc823e..0e6c3c5724 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -43,6 +43,8 @@ module ActionView
       # a safe HTML string that won't be escaped by other HTML helper methods. This
       # naming convention helps to identify translations that include HTML tags so that
       # you know what kind of output to expect when you call translate in a template.
+      # Note however that rule extends to interpolated values, so you are responsible
+      # for passing them already escaped in the call, if they need to be.
       def translate(key, options = {})
         options.merge!(:rescue_format => :html) unless options.key?(:rescue_format)
         translation = I18n.translate(scope_key_by_partial(key), options)
-- 
cgit v1.2.3


From 1079724fe643fe63e6d58a37274c2cf0ff172a8b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 17 Nov 2011 23:59:19 +0100
Subject: Revert "warn the user values are directly interpolated into _html
 translation strings"

Reason: After another round of discussion, it has been
decided to let interpolation deal with unsafe strings
as it should do.

This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b.
---
 actionpack/lib/action_view/helpers/translation_helper.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 0e6c3c5724..be64dc823e 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -43,8 +43,6 @@ module ActionView
       # a safe HTML string that won't be escaped by other HTML helper methods. This
       # naming convention helps to identify translations that include HTML tags so that
       # you know what kind of output to expect when you call translate in a template.
-      # Note however that rule extends to interpolated values, so you are responsible
-      # for passing them already escaped in the call, if they need to be.
       def translate(key, options = {})
         options.merge!(:rescue_format => :html) unless options.key?(:rescue_format)
         translation = I18n.translate(scope_key_by_partial(key), options)
-- 
cgit v1.2.3


From e8d57f361a9982382f75449ec0d65d6c798b9ce2 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Thu, 17 Nov 2011 18:29:55 +0300
Subject: _html translation should escape interpolated arguments

---
 actionpack/CHANGELOG.md                                  | 14 ++++++++++++++
 actionpack/lib/action_view/helpers/translation_helper.rb | 13 +++++++++----
 actionpack/test/template/translation_helper_test.rb      |  6 ++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 4c265c41d8..9d847c763b 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -64,6 +64,20 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
+    in combination with HTML-safe translations, the interpolated input would not get HTML
+    escaped. *GH 3664*
+
+    Before:
+
+        translate('foo_html', :something => '<script>') # => "...<script>..."
+
+    After:
+
+        translate('foo_html', :something => '<script>') # => "...&lt;script&gt;..."
+
+    *Sergey Nartimov*
+
 *   Upgrade sprockets dependency to ~> 2.1.0
 
 *   Ensure that the format isn't applied twice to the cache key, else it becomes impossible
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index be64dc823e..42726f888c 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -45,11 +45,16 @@ module ActionView
       # you know what kind of output to expect when you call translate in a template.
       def translate(key, options = {})
         options.merge!(:rescue_format => :html) unless options.key?(:rescue_format)
-        translation = I18n.translate(scope_key_by_partial(key), options)
-        if html_safe_translation_key?(key) && translation.respond_to?(:html_safe)
-          translation.html_safe
+        if html_safe_translation_key?(key)
+          html_safe_options = options.dup
+          options.except(*I18n::RESERVED_KEYS).each do |name, value|
+            html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+          end
+          translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
+
+          translation.respond_to?(:html_safe) ? translation.html_safe : translation
         else
-          translation
+          I18n.translate(scope_key_by_partial(key), options)
         end
       end
       alias :t :translate
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index cd9f54e04c..cabb29cfad 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -17,6 +17,7 @@ class TranslationHelperTest < ActiveSupport::TestCase
         :hello => '<a>Hello World</a>',
         :html => '<a>Hello World</a>',
         :hello_html => '<a>Hello World</a>',
+        :interpolated_html => '<a>Hello %{word}</a>',
         :array_html => %w(foo bar),
         :array => %w(foo bar)
       }
@@ -83,6 +84,11 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert translate(:'translations.hello_html').html_safe?
   end
 
+  def test_translate_escapes_interpolations_in_translations_with_a_html_suffix
+    assert_equal '<a>Hello &lt;World&gt;</a>', translate(:'translations.interpolated_html', :word => '<World>')
+    assert_equal '<a>Hello &lt;World&gt;</a>', translate(:'translations.interpolated_html', :word => stub(:to_s => "<World>"))
+  end
+
   def test_translation_returning_an_array_ignores_html_suffix
     assert_equal ["foo", "bar"], translate(:'translations.array_html')
   end
-- 
cgit v1.2.3


From fe88745d5f1f9419f11bda84b422e5dfa54a5ab8 Mon Sep 17 00:00:00 2001
From: Edward Anderson <edward.anderson@scimedsolutions.com>
Date: Thu, 17 Nov 2011 20:10:49 -0500
Subject: Fix a number_with_delimiter :separator example

---
 actionpack/lib/action_view/helpers/number_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index e8ad043e20..c642716b18 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -193,7 +193,7 @@ module ActionView
       #  number_with_delimiter(12345678)                        # => 12,345,678
       #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
       #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
-      #  number_with_delimiter(12345678, :separator => ",")     # => 12,345,678
+      #  number_with_delimiter(12345678.05, :separator => " ")  # => 12,345,678 05
       #  number_with_delimiter(12345678.05, :locale => :fr)     # => 12 345 678,05
       #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
       #  # => 98 765 432,98
-- 
cgit v1.2.3


From 5a2db4c7c379553692957ff807170c9ebaa87889 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 18 Nov 2011 23:09:30 +0530
Subject: put back the removed eg

---
 actionpack/lib/action_view/helpers/number_helper.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index c642716b18..b37e837a23 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -193,6 +193,7 @@ module ActionView
       #  number_with_delimiter(12345678)                        # => 12,345,678
       #  number_with_delimiter(12345678.05)                     # => 12,345,678.05
       #  number_with_delimiter(12345678, :delimiter => ".")     # => 12.345.678
+      #  number_with_delimiter(12345678, :delimiter => ",")     # => 12,345,678
       #  number_with_delimiter(12345678.05, :separator => " ")  # => 12,345,678 05
       #  number_with_delimiter(12345678.05, :locale => :fr)     # => 12 345 678,05
       #  number_with_delimiter(98765432.98, :delimiter => " ", :separator => ",")
-- 
cgit v1.2.3


From 76780c34f5e0f0e821e408482172454751514241 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 10:25:47 -0700
Subject: some refactoring of the match method

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 42 ++++++++++--------------
 1 file changed, 17 insertions(+), 25 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 970236a05a..ff96b43a9d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1245,32 +1245,38 @@ module ActionDispatch
           parent_resource.instance_of?(Resource) && @scope[:shallow]
         end
 
-        def match(*args)
-          options = args.extract_options!.dup
+        def match(path, *rest)
+          if rest.empty? && Hash === path
+            options  = path
+            path, to = options.find { |name, value| name.is_a?(String) }
+            options.merge!(:to => to).delete(path)
+            paths = [path]
+          else
+            options = rest.pop || {}
+            paths = [path] + rest
+          end
+
           options[:anchor] = true unless options.key?(:anchor)
 
-          if args.length > 1
-            args.each { |path| match(path, options.dup) }
+          if paths.length > 1
+            paths.each { |path| match(path, options.dup) }
             return self
           end
 
           on = options.delete(:on)
           if VALID_ON_OPTIONS.include?(on)
-            args.push(options)
-            return send(on){ match(*args) }
+            return send(on){ match(path, options) }
           elsif on
             raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
           end
 
           if @scope[:scope_level] == :resources
-            args.push(options)
-            return nested { match(*args) }
+            return nested { match(path, options) }
           elsif @scope[:scope_level] == :resource
-            args.push(options)
-            return member { match(*args) }
+            return member { match(path, options) }
           end
 
-          action = args.first
+          action = path
           path = path_for_action(action, options.delete(:path))
 
           if action.to_s =~ /^[\w\/]+$/
@@ -1466,19 +1472,6 @@ module ActionDispatch
           end
       end
 
-      module Shorthand #:nodoc:
-        def match(path, *rest)
-          if rest.empty? && Hash === path
-            options  = path
-            path, to = options.find { |name, value| name.is_a?(String) }
-            options.merge!(:to => to).delete(path)
-            super(path, options)
-          else
-            super
-          end
-        end
-      end
-
       def initialize(set) #:nodoc:
         @set = set
         @scope = { :path_names => @set.resources_path_names }
@@ -1489,7 +1482,6 @@ module ActionDispatch
       include Redirection
       include Scoping
       include Resources
-      include Shorthand
     end
   end
 end
-- 
cgit v1.2.3


From 494ab25772ba5eca741fe98f6beb48954949993f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 11:15:41 -0700
Subject: breaking match down to smaller methods

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 41 +++++++++++++-----------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ff96b43a9d..4c4b99c03e 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -374,10 +374,6 @@ module ActionDispatch
         #     # Matches any request starting with 'path'
         #     match 'path' => 'c#a', :anchor => false
         def match(path, options=nil)
-          mapping = Mapping.new(@set, @scope, path, options || {})
-          app, conditions, requirements, defaults, as, anchor = mapping.to_route
-          @set.add_route(app, conditions, requirements, defaults, as, anchor)
-          self
         end
 
         # Mount a Rack-based application to be used within the application.
@@ -1249,7 +1245,8 @@ module ActionDispatch
           if rest.empty? && Hash === path
             options  = path
             path, to = options.find { |name, value| name.is_a?(String) }
-            options.merge!(:to => to).delete(path)
+            options[:to] = to
+            options.delete(path)
             paths = [path]
           else
             options = rest.pop || {}
@@ -1258,25 +1255,29 @@ module ActionDispatch
 
           options[:anchor] = true unless options.key?(:anchor)
 
-          if paths.length > 1
-            paths.each { |path| match(path, options.dup) }
-            return self
-          end
+          paths.each { |path| decomposed_match(path, options.dup) }
+          self
+        end
 
+        def decomposed_match(path, options) # :nodoc:
           on = options.delete(:on)
           if VALID_ON_OPTIONS.include?(on)
-            return send(on){ match(path, options) }
+            return send(on){ decomposed_match(path, options) }
           elsif on
             raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
           end
 
-          if @scope[:scope_level] == :resources
-            return nested { match(path, options) }
-          elsif @scope[:scope_level] == :resource
-            return member { match(path, options) }
+          case @scope[:scope_level]
+          when :resources
+            nested { decomposed_match(path, options) }
+          when :resource
+            member { decomposed_match(path, options) }
+          else
+            add_route(path, options)
           end
+        end
 
-          action = path
+        def add_route(action, options) # :nodoc:
           path = path_for_action(action, options.delete(:path))
 
           if action.to_s =~ /^[\w\/]+$/
@@ -1285,13 +1286,15 @@ module ActionDispatch
             action = nil
           end
 
-          if options.key?(:as) && !options[:as]
+          if !options.fetch(:as) { true }
             options.delete(:as)
           else
             options[:as] = name_for_action(options[:as], action)
           end
 
-          super(path, options)
+          mapping = Mapping.new(@set, @scope, path, options)
+          app, conditions, requirements, defaults, as, anchor = mapping.to_route
+          @set.add_route(app, conditions, requirements, defaults, as, anchor)
         end
 
         def root(options={})
@@ -1355,11 +1358,11 @@ module ActionDispatch
           end
 
           def resource_scope? #:nodoc:
-            @scope[:scope_level].in?([:resource, :resources])
+            [:resource, :resources].include? @scope[:scope_level]
           end
 
           def resource_method_scope? #:nodoc:
-            @scope[:scope_level].in?([:collection, :member, :new])
+            [:collection, :member, :new].include? @scope[:scope_level]
           end
 
           def with_exclusive_scope
-- 
cgit v1.2.3


From 7459ba4f6c7d7b98fc0985255ccfd93186b0950f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 11:42:59 -0700
Subject: pushing hash validation up

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 4c4b99c03e..d196f16600 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1255,25 +1255,26 @@ module ActionDispatch
 
           options[:anchor] = true unless options.key?(:anchor)
 
+          if options[:on] && !VALID_ON_OPTIONS.include?(options[:on])
+            raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
+          end
+
           paths.each { |path| decomposed_match(path, options.dup) }
           self
         end
 
         def decomposed_match(path, options) # :nodoc:
-          on = options.delete(:on)
-          if VALID_ON_OPTIONS.include?(on)
-            return send(on){ decomposed_match(path, options) }
-          elsif on
-            raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
-          end
-
-          case @scope[:scope_level]
-          when :resources
-            nested { decomposed_match(path, options) }
-          when :resource
-            member { decomposed_match(path, options) }
+          if on = options.delete(:on)
+            send(on) { decomposed_match(path, options) }
           else
-            add_route(path, options)
+            case @scope[:scope_level]
+            when :resources
+              nested { decomposed_match(path, options) }
+            when :resource
+              member { decomposed_match(path, options) }
+            else
+              add_route(path, options)
+            end
           end
         end
 
-- 
cgit v1.2.3


From 648f6113d1f0c6f9cdb2352a24e84c2c204d564b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 15:04:48 -0700
Subject: move constants to methods since nothing else is using them

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index d196f16600..f49155349c 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -863,8 +863,6 @@ module ActionDispatch
         CANONICAL_ACTIONS = %w(index create new show update destroy)
 
         class Resource #:nodoc:
-          DEFAULT_ACTIONS = [:index, :create, :new, :show, :update, :destroy, :edit]
-
           attr_reader :controller, :path, :options
 
           def initialize(entities, options = {})
@@ -876,7 +874,7 @@ module ActionDispatch
           end
 
           def default_actions
-            self.class::DEFAULT_ACTIONS
+            [:index, :create, :new, :show, :update, :destroy, :edit]
           end
 
           def actions
@@ -930,16 +928,17 @@ module ActionDispatch
         end
 
         class SingletonResource < Resource #:nodoc:
-          DEFAULT_ACTIONS = [:show, :create, :update, :destroy, :new, :edit]
-
           def initialize(entities, options)
             super
-
             @as         = nil
             @controller = (options[:controller] || plural).to_s
             @as         = options[:as]
           end
 
+          def default_actions
+            [:show, :create, :update, :destroy, :new, :edit]
+          end
+
           def plural
             @plural ||= name.to_s.pluralize
           end
-- 
cgit v1.2.3


From 33543ac87148cfdd5b1917a0698bccaf55690e28 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 15:14:25 -0700
Subject: stop doing is_a? checks on the resource type

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index f49155349c..91220e1cf7 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -986,7 +986,7 @@ module ActionDispatch
             return self
           end
 
-          resource_scope(SingletonResource.new(resources.pop, options)) do
+          resource_scope(:resource, SingletonResource.new(resources.pop, options)) do
             yield if block_given?
 
             collection do
@@ -1117,7 +1117,7 @@ module ActionDispatch
             return self
           end
 
-          resource_scope(Resource.new(resources.pop, options)) do
+          resource_scope(:resources, Resource.new(resources.pop, options)) do
             yield if block_given?
 
             collection do
@@ -1387,8 +1387,8 @@ module ActionDispatch
             @scope[:scope_level_resource] = old_resource
           end
 
-          def resource_scope(resource) #:nodoc:
-            with_scope_level(resource.is_a?(SingletonResource) ? :resource : :resources, resource) do
+          def resource_scope(level, resource) #:nodoc:
+            with_scope_level(level, resource) do
               scope(parent_resource.resource_scope) do
                 yield
               end
-- 
cgit v1.2.3


From 636405d2a6187cf1fe90f35b5e2945758afde160 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 15:18:36 -0700
Subject: cleaning up variable names to match method parameter names

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 91220e1cf7..4fc0d78267 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1387,8 +1387,8 @@ module ActionDispatch
             @scope[:scope_level_resource] = old_resource
           end
 
-          def resource_scope(level, resource) #:nodoc:
-            with_scope_level(level, resource) do
+          def resource_scope(kind, resource) #:nodoc:
+            with_scope_level(kind, resource) do
               scope(parent_resource.resource_scope) do
                 yield
               end
@@ -1396,10 +1396,12 @@ module ActionDispatch
           end
 
           def nested_options #:nodoc:
-            {}.tap do |options|
-              options[:as] = parent_resource.member_name
-              options[:constraints] = { "#{parent_resource.singular}_id".to_sym => id_constraint } if id_constraint?
-            end
+            options = { :as => parent_resource.member_name }
+            options[:constraints] = {
+              :"#{parent_resource.singular}_id" => id_constraint
+            } if id_constraint?
+
+            options
           end
 
           def id_constraint? #:nodoc:
-- 
cgit v1.2.3


From ecbae9947830bb3ec42db097140bf1b2154dee31 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 15:40:10 -0700
Subject: no need for type checking

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 4fc0d78267..f2a2e92011 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1350,7 +1350,7 @@ module ActionDispatch
           end
 
           def scope_action_options? #:nodoc:
-            @scope[:options].is_a?(Hash) && (@scope[:options][:only] || @scope[:options][:except])
+            @scope[:options] && (@scope[:options][:only] || @scope[:options][:except])
           end
 
           def scope_action_options #:nodoc:
-- 
cgit v1.2.3


From 3178cc9a80262d3bf7754f3507ef60243b46634f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 21 Oct 2011 16:47:49 -0700
Subject: copy options keys to the right place so that undo will work correctly

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index f2a2e92011..21624bcfc2 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -603,9 +603,12 @@ module ActionDispatch
 
           options[:constraints] ||= {}
           unless options[:constraints].is_a?(Hash)
-            block, options[:constraints] = options[:constraints], {}
+            options[:blocks]      = options[:constraints]
+            options[:constraints] = {}
           end
 
+          options[:options] = options
+
           scope_options.each do |option|
             if value = options.delete(option)
               recover[option] = @scope[option]
@@ -613,21 +616,12 @@ module ActionDispatch
             end
           end
 
-          recover[:block] = @scope[:blocks]
-          @scope[:blocks] = merge_blocks_scope(@scope[:blocks], block)
-
-          recover[:options] = @scope[:options]
-          @scope[:options]  = merge_options_scope(@scope[:options], options)
-
           yield
           self
         ensure
           scope_options.each do |option|
             @scope[option] = recover[option] if recover.has_key?(option)
           end
-
-          @scope[:options] = recover[:options]
-          @scope[:blocks]  = recover[:block]
         end
 
         # Scopes routes to a specific controller
-- 
cgit v1.2.3


From 4589b2419b6c2f6d8b1ea0873999a4d0fa21bdb3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 31 Oct 2011 16:26:11 -0400
Subject: require that all blocks have arity of 2

---
 actionpack/lib/action_dispatch/routing/redirection.rb | 15 ++++++++++-----
 actionpack/test/dispatch/routing_test.rb              |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index 804991ad5f..27dbf72519 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -43,13 +43,19 @@ module ActionDispatch
         path = args.shift
 
         path_proc = if path.is_a?(String)
-          proc { |params| (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params) }
+          proc { |params, request| (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params) }
         elsif options.any?
           options_proc(options)
         elsif path.respond_to?(:call)
           proc { |params, request| path.call(params, request) }
         elsif block
-          block
+          if block.arity < 2
+            msg = "redirect blocks with arity of #{block.arity} are deprecated. Your block must take 2 parameters: the environment, and a request object"
+            ActiveSupport::Deprecation.warn msg
+            lambda { |params, _| block.call(params) }
+          else
+            block
+          end
         else
           raise ArgumentError, "redirection argument not supported"
         end
@@ -85,8 +91,7 @@ module ActionDispatch
           lambda do |env|
             req = Request.new(env)
 
-            params = [req.symbolized_path_parameters]
-            params << req if path_proc.arity > 1
+            params = [req.symbolized_path_parameters, req]
 
             uri = URI.parse(path_proc.call(*params))
             uri.scheme ||= req.scheme
@@ -107,4 +112,4 @@ module ActionDispatch
 
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index cf22731823..66b2263790 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -79,7 +79,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       match 'sign_in' => "sessions#new"
 
       match 'account/modulo/:name', :to => redirect("/%{name}s")
-      match 'account/proc/:name', :to => redirect {|params| "/#{params[:name].pluralize}" }
+      match 'account/proc/:name', :to => redirect {|params, req| "/#{params[:name].pluralize}" }
       match 'account/proc_req' => redirect {|params, req| "/#{req.method}" }
 
       match 'account/google' => redirect('http://www.google.com/', :status => 302)
-- 
cgit v1.2.3


From 163b645472b863231558c93abcdc1454db00b287 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 31 Oct 2011 16:28:38 -0400
Subject: arity check has been pushed up, so no need for proc wrapping

---
 actionpack/lib/action_dispatch/routing/redirection.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index 27dbf72519..d61320980d 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -47,7 +47,7 @@ module ActionDispatch
         elsif options.any?
           options_proc(options)
         elsif path.respond_to?(:call)
-          proc { |params, request| path.call(params, request) }
+          path
         elsif block
           if block.arity < 2
             msg = "redirect blocks with arity of #{block.arity} are deprecated. Your block must take 2 parameters: the environment, and a request object"
-- 
cgit v1.2.3


From a8a4264858d5eac4f11ce6545f63e854bbc35759 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 31 Oct 2011 16:36:48 -0400
Subject: make sure to require the right deprecation warning file

---
 actionpack/lib/action_dispatch/routing/redirection.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index d61320980d..a234e26151 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -1,4 +1,5 @@
 require 'action_dispatch/http/request'
+require 'active_support/deprecation/reporting'
 
 module ActionDispatch
   module Routing
-- 
cgit v1.2.3


From 0809c675ef5831852b7c1aa8497402b2beff5185 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 31 Oct 2011 17:49:20 -0400
Subject: remove the :path feature to redirects, since it cannot work

---
 .../lib/action_dispatch/routing/redirection.rb     | 22 +++++----------
 actionpack/test/dispatch/routing_test.rb           | 33 ----------------------
 2 files changed, 7 insertions(+), 48 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index a234e26151..cd9ba5a4db 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -68,23 +68,15 @@ module ActionDispatch
 
         def options_proc(options)
           proc do |params, request|
-            path = if options[:path].nil?
-              request.path
-            elsif params.empty? || !options[:path].match(/%\{\w*\}/)
-              options.delete(:path)
-            else
-              (options.delete(:path) % params)
-            end
-
-            default_options = {
+            url_options = {
               :protocol => request.protocol,
-              :host => request.host,
-              :port => request.optional_port,
-              :path => path,
-              :params => request.query_parameters
-            }
+              :host     => request.host,
+              :port     => request.optional_port,
+              :path     => request.path,
+              :params   => request.query_parameters
+            }.merge options
 
-            ActionDispatch::Http::URL.url_for(options.reverse_merge(default_options))
+            ActionDispatch::Http::URL.url_for url_options
           end
         end
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 66b2263790..c887fe7e6a 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -62,13 +62,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       match 'secure', :to => redirect("/secure/login")
 
       match 'mobile', :to => redirect(:subdomain => 'mobile')
-      match 'documentation', :to => redirect(:domain => 'example-documentation.com', :path => '')
-      match 'new_documentation', :to => redirect(:path => '/documentation/new')
       match 'super_new_documentation', :to => redirect(:host => 'super-docs.com')
 
-      match 'stores/:name',        :to => redirect(:subdomain => 'stores', :path => '/%{name}')
-      match 'stores/:name(*rest)', :to => redirect(:subdomain => 'stores', :path => '/%{name}%{rest}')
-
       match 'youtube_favorites/:youtube_id/:name', :to => redirect(YoutubeFavoritesRedirector)
 
       constraints(lambda { |req| true }) do
@@ -711,20 +706,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_redirect_hash_with_domain_and_path
-    with_test_routes do
-      get '/documentation'
-      verify_redirect 'http://www.example-documentation.com'
-    end
-  end
-
-  def test_redirect_hash_with_path
-    with_test_routes do
-      get '/new_documentation'
-      verify_redirect 'http://www.example.com/documentation/new'
-    end
-  end
-
   def test_redirect_hash_with_host
     with_test_routes do
       get '/super_new_documentation?section=top'
@@ -732,20 +713,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_redirect_hash_path_substitution
-    with_test_routes do
-      get '/stores/iernest'
-      verify_redirect 'http://stores.example.com/iernest'
-    end
-  end
-
-  def test_redirect_hash_path_substitution_with_catch_all
-    with_test_routes do
-      get '/stores/iernest/products'
-      verify_redirect 'http://stores.example.com/iernest/products'
-    end
-  end
-
   def test_redirect_class
     with_test_routes do
       get '/youtube_favorites/oHg5SJYRHA0/rick-rolld'
-- 
cgit v1.2.3


From d34efdd260d7a894537267a6186f16abe1b9335c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 31 Oct 2011 18:18:04 -0400
Subject: moving redirection to objects

---
 .../lib/action_dispatch/routing/redirection.rb     | 103 ++++++++++++---------
 1 file changed, 58 insertions(+), 45 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index cd9ba5a4db..35dabae1f2 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -3,6 +3,54 @@ require 'active_support/deprecation/reporting'
 
 module ActionDispatch
   module Routing
+    class Redirect
+      attr_reader :status, :block
+
+      def initialize(status, block)
+        @status = status
+        @block  = block
+      end
+
+      def call(env)
+        req = Request.new(env)
+
+        uri = URI.parse(path(req.symbolized_path_parameters, req))
+        uri.scheme ||= req.scheme
+        uri.host   ||= req.host
+        uri.port   ||= req.port unless req.standard_port?
+
+        body = %(<html><body>You are being <a href="#{ERB::Util.h(uri.to_s)}">redirected</a>.</body></html>)
+
+        headers = {
+          'Location' => uri.to_s,
+          'Content-Type' => 'text/html',
+          'Content-Length' => body.length.to_s
+        }
+
+        [ status, headers, [body] ]
+      end
+
+      def path(params, request)
+        block.call params, request
+      end
+    end
+
+    class OptionRedirect < Redirect
+      alias :options :block
+
+      def path(params, request)
+        url_options = {
+          :protocol => request.protocol,
+          :host     => request.host,
+          :port     => request.optional_port,
+          :path     => request.path,
+          :params   => request.query_parameters
+        }.merge options
+
+        ActionDispatch::Http::URL.url_for url_options
+      end
+    end
+
     module Redirection
 
       # Redirect any path to another path:
@@ -43,66 +91,31 @@ module ActionDispatch
 
         path = args.shift
 
-        path_proc = if path.is_a?(String)
-          proc { |params, request| (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params) }
+        if path.is_a?(String)
+          block_redirect status, lambda { |params, request|
+            (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params)
+          }
         elsif options.any?
-          options_proc(options)
+          OptionRedirect.new(status, options)
         elsif path.respond_to?(:call)
-          path
+          block_redirect status, path
         elsif block
           if block.arity < 2
             msg = "redirect blocks with arity of #{block.arity} are deprecated. Your block must take 2 parameters: the environment, and a request object"
             ActiveSupport::Deprecation.warn msg
-            lambda { |params, _| block.call(params) }
+            block_redirect status, lambda { |params, _| block.call(params) }
           else
-            block
+            block_redirect status, block
           end
         else
           raise ArgumentError, "redirection argument not supported"
         end
-
-        redirection_proc(status, path_proc)
       end
 
       private
-
-        def options_proc(options)
-          proc do |params, request|
-            url_options = {
-              :protocol => request.protocol,
-              :host     => request.host,
-              :port     => request.optional_port,
-              :path     => request.path,
-              :params   => request.query_parameters
-            }.merge options
-
-            ActionDispatch::Http::URL.url_for url_options
-          end
-        end
-
-        def redirection_proc(status, path_proc)
-          lambda do |env|
-            req = Request.new(env)
-
-            params = [req.symbolized_path_parameters, req]
-
-            uri = URI.parse(path_proc.call(*params))
-            uri.scheme ||= req.scheme
-            uri.host   ||= req.host
-            uri.port   ||= req.port unless req.standard_port?
-
-            body = %(<html><body>You are being <a href="#{ERB::Util.h(uri.to_s)}">redirected</a>.</body></html>)
-
-            headers = {
-              'Location' => uri.to_s,
-              'Content-Type' => 'text/html',
-              'Content-Length' => body.length.to_s
-            }
-
-            [ status, headers, [body] ]
-          end
+        def block_redirect(status, path_proc)
+          Redirect.new status, path_proc
         end
-
     end
   end
 end
-- 
cgit v1.2.3


From 99d94f126d05398ec0917d75253ab1548bc54ba3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Nov 2011 15:53:02 -0200
Subject: Refactoring the redirect method for the router api.

---
 .../lib/action_dispatch/routing/redirection.rb     | 44 ++++++++++------------
 actionpack/test/dispatch/routing_test.rb           |  5 +++
 2 files changed, 24 insertions(+), 25 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index 35dabae1f2..b7df456e91 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -3,7 +3,7 @@ require 'active_support/deprecation/reporting'
 
 module ActionDispatch
   module Routing
-    class Redirect
+    class Redirect # :nodoc:
       attr_reader :status, :block
 
       def initialize(status, block)
@@ -35,7 +35,7 @@ module ActionDispatch
       end
     end
 
-    class OptionRedirect < Redirect
+    class OptionRedirect < Redirect # :nodoc:
       alias :options :block
 
       def path(params, request)
@@ -89,33 +89,27 @@ module ActionDispatch
         options = args.last.is_a?(Hash) ? args.pop : {}
         status  = options.delete(:status) || 301
 
+        return OptionRedirect.new(status, options) if options.any?
+
         path = args.shift
 
-        if path.is_a?(String)
-          block_redirect status, lambda { |params, request|
-            (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params)
-          }
-        elsif options.any?
-          OptionRedirect.new(status, options)
-        elsif path.respond_to?(:call)
-          block_redirect status, path
-        elsif block
-          if block.arity < 2
-            msg = "redirect blocks with arity of #{block.arity} are deprecated. Your block must take 2 parameters: the environment, and a request object"
-            ActiveSupport::Deprecation.warn msg
-            block_redirect status, lambda { |params, _| block.call(params) }
-          else
-            block_redirect status, block
-          end
-        else
-          raise ArgumentError, "redirection argument not supported"
-        end
-      end
+        block = lambda { |params, request|
+          (params.empty? || !path.match(/%\{\w*\}/)) ? path : (path % params)
+        } if String === path
+
+        block = path if path.respond_to? :call
 
-      private
-        def block_redirect(status, path_proc)
-          Redirect.new status, path_proc
+        # :FIXME: remove in Rails 4.0
+        if block && block.respond_to?(:arity) && block.arity < 2
+          msg = "redirect blocks with arity of #{block.arity} are deprecated. Your block must take 2 parameters: the environment, and a request object"
+          ActiveSupport::Deprecation.warn msg
+          block = lambda { |params, _| block.call(params) }
         end
+
+        raise ArgumentError, "redirection argument not supported" unless block
+
+        Redirect.new status, block
+      end
     end
   end
 end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c887fe7e6a..19eee379fd 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2299,6 +2299,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal "/forced_collision", routes_forced_collision_path
   end
 
+  def test_redirect_argument_error
+    routes = Class.new { include ActionDispatch::Routing::Redirection }.new
+    assert_raises(ArgumentError) { routes.redirect Object.new }
+  end
+
   def test_explicitly_avoiding_the_named_route
     assert !respond_to?(:routes_no_collision_path)
   end
-- 
cgit v1.2.3


From 396ef44be48dbcbc75d313980d0ba272a6200099 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 18 Nov 2011 10:36:02 -0800
Subject: Revert "make sure to require the right deprecation warning file"

This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
---
 actionpack/lib/action_dispatch/routing/redirection.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index b7df456e91..330400e139 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -1,5 +1,4 @@
 require 'action_dispatch/http/request'
-require 'active_support/deprecation/reporting'
 
 module ActionDispatch
   module Routing
-- 
cgit v1.2.3


From d806ea20506f824efbe2c8b69928929977cc3a59 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 19 Nov 2011 11:29:29 +0530
Subject: Warning removed for shadowing variable

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 21624bcfc2..e3ad3f9ba7 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1252,7 +1252,7 @@ module ActionDispatch
             raise ArgumentError, "Unknown scope #{on.inspect} given to :on"
           end
 
-          paths.each { |path| decomposed_match(path, options.dup) }
+          paths.each { |_path| decomposed_match(_path, options.dup) }
           self
         end
 
-- 
cgit v1.2.3


From 771635e858e486e1e9f2d181b710d81205e6bb4e Mon Sep 17 00:00:00 2001
From: Tobias Svensson <tob@tobiassvensson.co.uk>
Date: Sat, 19 Nov 2011 13:02:56 +0000
Subject: Meaningful errors for unexpected partial arguments. Fixes #3573

---
 actionpack/lib/action_view/renderer/partial_renderer.rb | 9 +++++++--
 actionpack/test/template/render_test.rb                 | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 15cb9d0f76..54a0ba96ff 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -366,8 +366,13 @@ module ActionView
       path = if object.respond_to?(:to_partial_path)
         object.to_partial_path
       else
-        ActiveSupport::Deprecation.warn "ActiveModel-compatible objects whose classes return a #model_name that responds to #partial_path are deprecated. Please respond to #to_partial_path directly instead."
-        object.class.model_name.partial_path
+        klass = object.class
+        if klass.respond_to?(:model_name)
+          ActiveSupport::Deprecation.warn "ActiveModel-compatible objects whose classes return a #model_name that responds to #partial_path are deprecated. Please respond to #to_partial_path directly instead."
+          klass.model_name.partial_path
+        else
+          raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object that returns a valid partial path.")
+        end
       end
 
       @partial_names[path] ||= path.dup.tap do |object_path|
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 77659918f7..c29519276d 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -142,6 +142,13 @@ module RenderTestCases
                                 "and is followed by any combinations of letters, numbers, or underscores.", e.message
   end
 
+  def test_render_partial_with_incompatible_object
+    @view.render(:partial => nil)
+    flunk "Render did not raise ArgumentError"
+  rescue ArgumentError => e
+    assert_equal "'#{nil.inspect}' is not an ActiveModel-compatible object that returns a valid partial path.", e.message
+  end
+
   def test_render_partial_with_errors
     @view.render(:partial => "test/raise")
     flunk "Render did not raise Template::Error"
-- 
cgit v1.2.3


From 86b5e81e8ac6590995e1e0643959fe8f527b4e49 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 19 Nov 2011 13:06:34 +0000
Subject: Bump sprockets to 2.1.1

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 9da9143de3..41bada43ef 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0')
-  s.add_dependency('sprockets',     '~> 2.1.0')
+  s.add_dependency('sprockets',     '~> 2.1.1')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')
-- 
cgit v1.2.3


From 603a679e87d0317957eb44ce3928d593a0c50bb5 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 19 Nov 2011 13:19:20 +0000
Subject: Don't html-escape the :count option to translate if it's a Numeric.
 Fixes #3685.

---
 actionpack/CHANGELOG.md                                  |  7 +++++++
 actionpack/lib/action_view/helpers/translation_helper.rb |  4 +++-
 actionpack/test/template/translation_helper_test.rb      | 12 +++++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 9d847c763b..dc52262503 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -62,6 +62,13 @@
     persistent between requests so if you need to manipulate the environment
     for your test you need to do it before the cookie jar is created.
 
+## Rails 3.1.3 (unreleased) ##
+
+*   Fix using `tranlate` helper with a html translation which uses the `:count` option for
+    pluralization.
+
+    *Jon Leighton*
+
 ## Rails 3.1.2 (unreleased) ##
 
 *   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 42726f888c..cc74eff53a 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -48,7 +48,9 @@ module ActionView
         if html_safe_translation_key?(key)
           html_safe_options = options.dup
           options.except(*I18n::RESERVED_KEYS).each do |name, value|
-            html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            unless name == :count && value.is_a?(Numeric)
+              html_safe_options[name] = ERB::Util.html_escape(value.to_s)
+            end
           end
           translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
 
diff --git a/actionpack/test/template/translation_helper_test.rb b/actionpack/test/template/translation_helper_test.rb
index cabb29cfad..397de9c2ce 100644
--- a/actionpack/test/template/translation_helper_test.rb
+++ b/actionpack/test/template/translation_helper_test.rb
@@ -19,7 +19,11 @@ class TranslationHelperTest < ActiveSupport::TestCase
         :hello_html => '<a>Hello World</a>',
         :interpolated_html => '<a>Hello %{word}</a>',
         :array_html => %w(foo bar),
-        :array => %w(foo bar)
+        :array => %w(foo bar),
+        :count_html => {
+          :one   => '<a>One %{count}</a>',
+          :other => '<a>Other %{count}</a>'
+        }
       }
     )
     @view = ::ActionView::Base.new(ActionController::Base.view_paths, {})
@@ -89,6 +93,12 @@ class TranslationHelperTest < ActiveSupport::TestCase
     assert_equal '<a>Hello &lt;World&gt;</a>', translate(:'translations.interpolated_html', :word => stub(:to_s => "<World>"))
   end
 
+  def test_translate_with_html_count
+    assert_equal '<a>One 1</a>', translate(:'translations.count_html', :count => 1)
+    assert_equal '<a>Other 2</a>', translate(:'translations.count_html', :count => 2)
+    assert_equal '<a>Other &lt;One&gt;</a>', translate(:'translations.count_html', :count => '<One>')
+  end
+
   def test_translation_returning_an_array_ignores_html_suffix
     assert_equal ["foo", "bar"], translate(:'translations.array_html')
   end
-- 
cgit v1.2.3


From 3d2bd6938586086fbce4d6c087e4f9cd528e0212 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 19 Nov 2011 20:35:54 -0800
Subject: Revert "copy options keys to the right place so that undo will work
 correctly"

This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index e3ad3f9ba7..7947e9d393 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -603,12 +603,9 @@ module ActionDispatch
 
           options[:constraints] ||= {}
           unless options[:constraints].is_a?(Hash)
-            options[:blocks]      = options[:constraints]
-            options[:constraints] = {}
+            block, options[:constraints] = options[:constraints], {}
           end
 
-          options[:options] = options
-
           scope_options.each do |option|
             if value = options.delete(option)
               recover[option] = @scope[option]
@@ -616,12 +613,21 @@ module ActionDispatch
             end
           end
 
+          recover[:block] = @scope[:blocks]
+          @scope[:blocks] = merge_blocks_scope(@scope[:blocks], block)
+
+          recover[:options] = @scope[:options]
+          @scope[:options]  = merge_options_scope(@scope[:options], options)
+
           yield
           self
         ensure
           scope_options.each do |option|
             @scope[option] = recover[option] if recover.has_key?(option)
           end
+
+          @scope[:options] = recover[:options]
+          @scope[:blocks]  = recover[:block]
         end
 
         # Scopes routes to a specific controller
-- 
cgit v1.2.3


From a9e8cf78fda696738f63e726796f6232c3751603 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Mon, 21 Nov 2011 20:13:54 +0300
Subject: add ActionController::Metal#show_detailed_exceptions?

---
 actionpack/lib/action_controller/metal.rb          |  5 +++
 .../action_dispatch/middleware/show_exceptions.rb  | 16 ++++----
 actionpack/test/dispatch/show_exceptions_test.rb   | 45 +++++++++++++---------
 3 files changed, 38 insertions(+), 28 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 125dbf6bb5..d5f150e7c9 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -196,10 +196,15 @@ module ActionController
       @_request = request
       @_env = request.env
       @_env['action_controller.instance'] = self
+      @_env['action_dispatch.show_detailed_exceptions'] = show_detailed_exceptions?
       process(name)
       to_a
     end
 
+    def show_detailed_exceptions?
+      defined?(Rails.application) && Rails.application.config.consider_all_requests_local || request.local?
+    end
+
     def to_a #:nodoc:
       response ? response.to_a : [status, headers, response_body]
     end
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 2fa68c64c5..569063f4db 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -38,9 +38,8 @@ module ActionDispatch
        "application's log file and/or the web server's log file to find out what " <<
        "went wrong.</body></html>"]]
 
-    def initialize(app, consider_all_requests_local = false)
+    def initialize(app)
       @app = app
-      @consider_all_requests_local = consider_all_requests_local
     end
 
     def call(env)
@@ -65,11 +64,10 @@ module ActionDispatch
         log_error(exception)
         exception = original_exception(exception)
 
-        request = Request.new(env)
-        if @consider_all_requests_local || request.local?
-          rescue_action_locally(request, exception)
+        if env['action_dispatch.show_detailed_exceptions'] == true
+          rescue_action_diagnostics(env, exception)
         else
-          rescue_action_in_public(exception)
+          rescue_action_error_page(exception)
         end
       rescue Exception => failsafe_error
         $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
@@ -78,9 +76,9 @@ module ActionDispatch
 
       # Render detailed diagnostics for unhandled exceptions rescued from
       # a controller action.
-      def rescue_action_locally(request, exception)
+      def rescue_action_diagnostics(env, exception)
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          :request => request,
+          :request => Request.new(env),
           :exception => exception,
           :application_trace => application_trace(exception),
           :framework_trace => framework_trace(exception),
@@ -98,7 +96,7 @@ module ActionDispatch
       # it will first attempt to render the file at <tt>public/500.da.html</tt>
       # then attempt to render <tt>public/500.html</tt>. If none of them exist,
       # the body of the response will be left empty.
-      def rescue_action_in_public(exception)
+      def rescue_action_error_page(exception)
         status = status_code(exception)
         locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
         path = "#{public_path}/#{status}.html"
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 42f6c7f79f..09eebb3ab5 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -2,28 +2,35 @@ require 'abstract_unit'
 
 class ShowExceptionsTest < ActionDispatch::IntegrationTest
 
-  Boomer = lambda do |env|
-    req = ActionDispatch::Request.new(env)
-    case req.path
-    when "/not_found"
-      raise ActionController::UnknownAction
-    when "/runtime_error"
-      raise RuntimeError
-    when "/method_not_allowed"
-      raise ActionController::MethodNotAllowed
-    when "/not_implemented"
-      raise ActionController::NotImplemented
-    when "/unprocessable_entity"
-      raise ActionController::InvalidAuthenticityToken
-    when "/not_found_original_exception"
-      raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
-    else
-      raise "puke!"
+  class Boomer
+    def initialize(show_exceptions = false)
+      @show_exceptions = show_exceptions
+    end
+
+    def call(env)
+      env['action_dispatch.show_exceptions'] = @show_exceptions
+      req = ActionDispatch::Request.new(env)
+      case req.path
+      when "/not_found"
+        raise ActionController::UnknownAction
+      when "/runtime_error"
+        raise RuntimeError
+      when "/method_not_allowed"
+        raise ActionController::MethodNotAllowed
+      when "/not_implemented"
+        raise ActionController::NotImplemented
+      when "/unprocessable_entity"
+        raise ActionController::InvalidAuthenticityToken
+      when "/not_found_original_exception"
+        raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
+      else
+        raise "puke!"
+      end
     end
   end
 
-  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer, false)
-  DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer, true)
+  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new(false))
+  DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer.new(true))
 
   test "rescue in public from a remote ip" do
     @app = ProductionApp
-- 
cgit v1.2.3


From c6d6b28bb4e105fd0ae7a0ef3c7df4bc416bd397 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Tue, 22 Nov 2011 11:24:05 +0300
Subject: refactor show exceptions tests

---
 actionpack/test/controller/show_exceptions_test.rb | 59 +++++++++++++++++++++
 actionpack/test/dispatch/show_exceptions_test.rb   | 61 +++++++---------------
 2 files changed, 78 insertions(+), 42 deletions(-)
 create mode 100644 actionpack/test/controller/show_exceptions_test.rb

(limited to 'actionpack')

diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
new file mode 100644
index 0000000000..c328a42e89
--- /dev/null
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -0,0 +1,59 @@
+require 'abstract_unit'
+
+module ShowExceptions
+  class ShowExceptionsController < ActionController::Metal
+    use ActionDispatch::ShowExceptions
+
+    def boom
+      raise 'boom!'
+    end
+  end
+
+  class ShowExceptionsTest < ActionDispatch::IntegrationTest
+    test 'show error page from a remote ip' do
+      @app = ShowExceptionsController.action(:boom)
+      self.remote_addr = '208.77.188.166'
+      get '/'
+      assert_equal "500 error fixture\n", body
+    end
+
+    test 'show diagnostics from a local ip' do
+      @app = ShowExceptionsController.action(:boom)
+      ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
+        self.remote_addr = ip_address
+        get '/'
+        assert_match /boom/, body
+      end
+    end
+
+    test 'show diagnostics from a remote ip when consider_all_requests_local is true' do
+      Rails.stubs(:application).returns stub(:config => stub(:consider_all_requests_local => true))
+      @app = ShowExceptionsController.action(:boom)
+      self.remote_addr = '208.77.188.166'
+      get '/'
+      assert_match /boom/, body
+    end
+  end
+
+  class ShowExceptionsOverridenController < ShowExceptionsController
+    private
+
+    def show_detailed_exceptions?
+      params['detailed'] == '1'
+    end
+  end
+
+  class ShowExceptionsOverridenTest < ActionDispatch::IntegrationTest
+    test 'show error page' do
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get '/', {'detailed' => '0'}
+      assert_equal "500 error fixture\n", body
+    end
+
+    test 'show diagnostics message' do
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get '/', {'detailed' => '1'}
+      assert_match /boom/, body
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 09eebb3ab5..9f4d6c530f 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -3,12 +3,12 @@ require 'abstract_unit'
 class ShowExceptionsTest < ActionDispatch::IntegrationTest
 
   class Boomer
-    def initialize(show_exceptions = false)
-      @show_exceptions = show_exceptions
+    def initialize(detailed  = false)
+      @detailed = detailed
     end
 
     def call(env)
-      env['action_dispatch.show_exceptions'] = @show_exceptions
+      env['action_dispatch.show_detailed_exceptions'] = @detailed
       req = ActionDispatch::Request.new(env)
       case req.path
       when "/not_found"
@@ -32,9 +32,8 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
   ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new(false))
   DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer.new(true))
 
-  test "rescue in public from a remote ip" do
+  test "rescue with error page when show_exceptions is false" do
     @app = ProductionApp
-    self.remote_addr = '208.77.188.166'
 
     get "/", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 500
@@ -49,32 +48,28 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_equal "", body
   end
 
-  test "rescue locally from a local request" do
-    @app = ProductionApp
-    ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
-      self.remote_addr = ip_address
+  test "rescue with diagnostics message when show_exceptions is true" do
+    @app = DevelopmentApp
 
-      get "/", {}, {'action_dispatch.show_exceptions' => true}
-      assert_response 500
-      assert_match(/puke/, body)
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 500
+    assert_match(/puke/, body)
 
-      get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
-      assert_response 404
-      assert_match(/#{ActionController::UnknownAction.name}/, body)
+    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_match(/#{ActionController::UnknownAction.name}/, body)
 
-      get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
-      assert_response 405
-      assert_match(/ActionController::MethodNotAllowed/, body)
-    end
+    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 405
+    assert_match(/ActionController::MethodNotAllowed/, body)
   end
 
-  test "localize public rescue message" do
+  test "localize rescue error page" do
     # Change locale
     old_locale, I18n.locale = I18n.locale, :da
 
     begin
       @app = ProductionApp
-      self.remote_addr = '208.77.188.166'
 
       get "/", {}, {'action_dispatch.show_exceptions' => true}
       assert_response 500
@@ -88,23 +83,6 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "always rescue locally in development mode" do
-    @app = DevelopmentApp
-    self.remote_addr = '208.77.188.166'
-
-    get "/", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 500
-    assert_match(/puke/, body)
-
-    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 404
-    assert_match(/#{ActionController::UnknownAction.name}/, body)
-
-    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 405
-    assert_match(/ActionController::MethodNotAllowed/, body)
-  end
-
   test "does not show filtered parameters" do
     @app = DevelopmentApp
 
@@ -114,16 +92,15 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
   end
 
-  test "show registered original exception for wrapped exceptions when consider_all_requests_local is false" do
+  test "show registered original exception for wrapped exceptions when show_exceptions is false" do
     @app = ProductionApp
-    self.remote_addr = '208.77.188.166'
 
     get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 404
     assert_match(/404 error/, body)
   end
 
-  test "show registered original exception for wrapped exceptions when consider_all_requests_local is true" do
+  test "show registered original exception for wrapped exceptions when show_exceptions is true" do
     @app = DevelopmentApp
 
     get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
@@ -132,7 +109,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
   end
 
   test "show the controller name in the diagnostics template when controller name is present" do
-    @app = ProductionApp
+    @app = DevelopmentApp
     get("/runtime_error", {}, {
       'action_dispatch.show_exceptions' => true,
       'action_dispatch.request.parameters' => {
-- 
cgit v1.2.3


From 5bcd119b8d9bb6d88c949956de1ce13c2673b877 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Tue, 22 Nov 2011 13:34:13 +0300
Subject: move show_detailed_exceptions? to Rescue module

---
 actionpack/lib/action_controller/metal.rb          |  5 -----
 actionpack/lib/action_controller/metal/rescue.rb   | 10 ++++++++++
 actionpack/lib/action_controller/railtie.rb        |  2 ++
 actionpack/test/controller/show_exceptions_test.rb |  4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index d5f150e7c9..125dbf6bb5 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -196,15 +196,10 @@ module ActionController
       @_request = request
       @_env = request.env
       @_env['action_controller.instance'] = self
-      @_env['action_dispatch.show_detailed_exceptions'] = show_detailed_exceptions?
       process(name)
       to_a
     end
 
-    def show_detailed_exceptions?
-      defined?(Rails.application) && Rails.application.config.consider_all_requests_local || request.local?
-    end
-
     def to_a #:nodoc:
       response ? response.to_a : [status, headers, response_body]
     end
diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb
index eb037aa1b0..736ff5b31c 100644
--- a/actionpack/lib/action_controller/metal/rescue.rb
+++ b/actionpack/lib/action_controller/metal/rescue.rb
@@ -3,6 +3,11 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
 
+    included do
+      config_accessor :consider_all_requests_local
+      self.consider_all_requests_local = false if consider_all_requests_local.nil?
+    end
+
     def rescue_with_handler(exception)
       if (exception.respond_to?(:original_exception) &&
           (orig_exception = exception.original_exception) &&
@@ -12,10 +17,15 @@ module ActionController #:nodoc:
       super(exception)
     end
 
+    def show_detailed_exceptions?
+      consider_all_requests_local || request.local?
+    end
+
     private
       def process_action(*args)
         super
       rescue Exception => exception
+        request.env['action_dispatch.show_detailed_exceptions'] = show_detailed_exceptions?
         rescue_with_handler(exception) || raise(exception)
       end
   end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index f0c29825ba..de7b837ecc 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -21,6 +21,8 @@ module ActionController
       paths   = app.config.paths
       options = app.config.action_controller
 
+      options.consider_all_requests_local ||= app.config.consider_all_requests_local
+
       options.assets_dir           ||= paths["public"].first
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index c328a42e89..39245e9574 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 
 module ShowExceptions
-  class ShowExceptionsController < ActionController::Metal
+  class ShowExceptionsController < ActionController::Base
     use ActionDispatch::ShowExceptions
 
     def boom
@@ -27,7 +27,7 @@ module ShowExceptions
     end
 
     test 'show diagnostics from a remote ip when consider_all_requests_local is true' do
-      Rails.stubs(:application).returns stub(:config => stub(:consider_all_requests_local => true))
+      ShowExceptionsController.any_instance.stubs(:consider_all_requests_local).returns(true)
       @app = ShowExceptionsController.action(:boom)
       self.remote_addr = '208.77.188.166'
       get '/'
-- 
cgit v1.2.3


From aa491f6a9c90641a2d4115420b14e45514962834 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Tue, 22 Nov 2011 16:39:07 +0300
Subject: javascript_include_tag should add '.js' to sources that contain '.'

---
 actionpack/lib/sprockets/helpers/rails_helper.rb  | 2 +-
 actionpack/test/template/sprockets_helper_test.rb | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index ddf9b08b54..1ebe7f68f7 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -154,7 +154,7 @@ module Sprockets
         end
 
         def rewrite_extension(source, dir, ext)
-          if ext && File.extname(source).empty?
+          if ext && File.extname(source) != ".#{ext}"
             "#{source}.#{ext}"
           else
             source
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index db69f95130..26a504beb8 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -217,6 +217,9 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_match %r{<script src="/assets/xmlhr-[0-9a-f]+.js\?body=1" type="text/javascript"></script>\n<script src="/assets/application-[0-9a-f]+.js\?body=1" type="text/javascript"></script>},
       javascript_include_tag(:application, :debug => true)
 
+    assert_match %r{<script src="/assets/jquery.plugin.js" type="text/javascript"></script>},
+      javascript_include_tag('jquery.plugin', :digest => false)
+
     @config.assets.compile = true
     @config.assets.debug = true
     assert_match %r{<script src="/javascripts/application.js" type="text/javascript"></script>},
-- 
cgit v1.2.3


From 3a1d51959bf569a7419fe8ab9416b338334b4800 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Tue, 22 Nov 2011 17:36:58 +0300
Subject: deprecation warning, changelog entry

---
 actionpack/CHANGELOG.md                                      | 4 ++++
 actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index dc52262503..fe422f71d5 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Refactor ActionDispatch::ShowExceptions. Controller is responsible for choice to show exceptions. *Sergey Nartimov*
+
+    It's possible to override +show_detailed_exceptions?+ in controllers to specify which requests should provide debugging information on errors.
+
 *   Responders now return 204 No Content for API requests without a response body (as in the new scaffold) *José Valim*
 
 *   Added ActionDispatch::RequestId middleware that'll make a unique X-Request-Id header available to the response and enables the ActionDispatch::Request#uuid method. This makes it easy to trace requests from end-to-end in the stack and to identify individual requests in mixed logs like Syslog *DHH*
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 569063f4db..52dce4cc81 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -2,6 +2,7 @@ require 'active_support/core_ext/exception'
 require 'action_controller/metal/exceptions'
 require 'active_support/notifications'
 require 'action_dispatch/http/request'
+require 'active_support/deprecation'
 
 module ActionDispatch
   # This middleware rescues any exception returned by the application and renders
@@ -38,7 +39,8 @@ module ActionDispatch
        "application's log file and/or the web server's log file to find out what " <<
        "went wrong.</body></html>"]]
 
-    def initialize(app)
+    def initialize(app, consider_all_requests_local = nil)
+      ActiveSupport::Deprecation.warn "Passing consider_all_requests_local option to ActionDispatch::ShowExceptions middleware no longer works" unless consider_all_requests_local.nil?
       @app = app
     end
 
-- 
cgit v1.2.3


From 05e02deb686fc21f99c2d1dcf3abc987796e0e19 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Tue, 22 Nov 2011 15:16:23 -0500
Subject: Make explicit the default media when calling stylesheet_tag and
 change the default generators.

---
 .../action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb    | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index 343153c8c5..41958c6559 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -68,6 +68,9 @@ module ActionView
         # Returns a stylesheet link tag for the sources specified as arguments. If
         # you don't specify an extension, <tt>.css</tt> will be appended automatically.
         # You can modify the link attributes by passing a hash as the last argument.
+        # For historical reasons, the 'media' attribute will always be present and defaults
+        # to "screen", so you must explicitely set it to "all" for the stylesheet(s) to
+        # apply to all media types.
         #
         # ==== Examples
         #   stylesheet_link_tag "style" # =>
-- 
cgit v1.2.3


From 745b7a14377607c5fddb8cd1151d69267095242c Mon Sep 17 00:00:00 2001
From: Marc Chung <mchung@gmail.com>
Date: Tue, 22 Nov 2011 17:04:19 -0700
Subject: - Avoid using .first since it will create an additional query. -
 Handle scenario where @posts is empty.

---
 actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 39c37b25dc..73824dc1f8 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -32,7 +32,7 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated(@posts.first.created_at)
+      #       feed.updated(@posts[0].created_at) if @posts.length > 0
       #
       #       @posts.each do |post|
       #         feed.entry(post) do |entry|
-- 
cgit v1.2.3


From 453f5534b4a8517c6fd39702fc98f0c6f1d5fd9e Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Thu, 24 Nov 2011 00:10:34 +0900
Subject: Warnings removed. (ambiguous first argument)

---
 actionpack/test/controller/show_exceptions_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 39245e9574..74067cb895 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -22,7 +22,7 @@ module ShowExceptions
       ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
         self.remote_addr = ip_address
         get '/'
-        assert_match /boom/, body
+        assert_match(/boom/, body)
       end
     end
 
@@ -31,7 +31,7 @@ module ShowExceptions
       @app = ShowExceptionsController.action(:boom)
       self.remote_addr = '208.77.188.166'
       get '/'
-      assert_match /boom/, body
+      assert_match(/boom/, body)
     end
   end
 
@@ -53,7 +53,7 @@ module ShowExceptions
     test 'show diagnostics message' do
       @app = ShowExceptionsOverridenController.action(:boom)
       get '/', {'detailed' => '1'}
-      assert_match /boom/, body
+      assert_match(/boom/, body)
     end
   end
 end
-- 
cgit v1.2.3


From ea70e027b63a1b8bfe4087a4de978ad4eef5575b Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Wed, 23 Nov 2011 23:49:43 +0900
Subject: Remove unreachable code, and add additional testcases.

---
 actionpack/lib/action_dispatch/middleware/params_parser.rb   |  7 +------
 actionpack/test/dispatch/request/json_params_parsing_test.rb | 12 ++++++++++++
 actionpack/test/dispatch/request/xml_params_parsing_test.rb  | 12 ++++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index d4208ca96e..84e3dd16dd 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -54,12 +54,7 @@ module ActionDispatch
       rescue Exception => e # YAML, XML or Ruby code block errors
         logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
 
-        raise
-          { "body"           => request.raw_post,
-            "content_type"   => request.content_mime_type,
-            "content_length" => request.content_length,
-            "exception"      => "#{e.message} (#{e.class})",
-            "backtrace"      => e.backtrace }
+        raise e
       end
 
       def content_type_from_legacy_post_data_format_header(env)
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index d854d55173..d481a2df13 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -45,6 +45,18 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "occurring a parse error if parsing unsuccessful" do
+    with_test_routing do
+      begin
+        $stderr = StringIO.new # suppress the log
+        json = "[\"person]\": {\"name\": \"David\"}}"
+        assert_raise(MultiJson::DecodeError) { post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => false} }
+      ensure
+        $stderr = STDERR
+      end
+    end
+  end
+
   private
     def assert_parses(expected, actual, headers = {})
       with_test_routing do
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index 38453dfe48..65a25557b7 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -67,6 +67,18 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "occurring a parse error if parsing unsuccessful" do
+    with_test_routing do
+      begin
+        $stderr = StringIO.new # suppress the log
+        xml = "<person><name>David</name></pineapple>"
+        assert_raise(REXML::ParseException) { post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => false) }
+      ensure
+        $stderr = STDERR
+      end
+    end
+  end
+
   test "parses multiple files" do
     xml = <<-end_body
       <person>
-- 
cgit v1.2.3


From fd86a1b6b068df87164d5763bdcd4a323a1e76f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 19:06:45 +0000
Subject: Rely on a public contract between railties instead of accessing
 railtie methods directly.

---
 actionpack/lib/abstract_controller/railties/routes_helpers.rb | 4 ++--
 actionpack/lib/action_controller/railties/paths.rb            | 7 ++++---
 actionpack/test/activerecord/polymorphic_routes_test.rb       | 6 ++----
 actionpack/test/lib/controller/fake_models.rb                 | 4 ++--
 actionpack/test/template/form_helper_test.rb                  | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/railties/routes_helpers.rb b/actionpack/lib/abstract_controller/railties/routes_helpers.rb
index dec1e9d6d9..6684f46f64 100644
--- a/actionpack/lib/abstract_controller/railties/routes_helpers.rb
+++ b/actionpack/lib/abstract_controller/railties/routes_helpers.rb
@@ -5,8 +5,8 @@ module AbstractController
         Module.new do
           define_method(:inherited) do |klass|
             super(klass)
-            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
-              klass.send(:include, namespace._railtie.routes.url_helpers)
+            if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_routes_url_helpers) }
+              klass.send(:include, namespace.railtie_routes_url_helpers)
             else
               klass.send(:include, routes.url_helpers)
             end
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
index 699c44c62c..bbe63149ad 100644
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ b/actionpack/lib/action_controller/railties/paths.rb
@@ -6,13 +6,14 @@ module ActionController
           define_method(:inherited) do |klass|
             super(klass)
 
-            if namespace = klass.parents.detect {|m| m.respond_to?(:_railtie) }
-              paths = namespace._railtie.paths["app/helpers"].existent
+            if namespace = klass.parents.detect { |m| m.respond_to?(:railtie_helpers_paths) }
+              paths = namespace.railtie_helpers_paths
             else
-              paths = app.config.helpers_paths
+              paths = app.helpers_paths
             end
 
             klass.helpers_path = paths
+
             if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
               klass.helper :all
             end
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 20d11377f6..fc829aa6b4 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -34,10 +34,8 @@ module Blog
     set_table_name 'projects'
   end
 
-  def self._railtie
-    o = Object.new
-    def o.railtie_name; "blog" end
-    o
+  def self.use_relative_model_naming?
+    true
   end
 end
 
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 363403092b..f2362714d7 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -175,8 +175,8 @@ class HashBackedAuthor < Hash
 end
 
 module Blog
-  def self._railtie
-    self
+  def self.use_relative_model_naming?
+    true
   end
 
   class Post < Struct.new(:title, :id)
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 34486bb151..ccedcd7dac 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -740,7 +740,7 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
-  def test_form_for_with_isolated_namespaced_model
+  def test_form_for_with_model_using_relative_model_naming
     form_for(@blog_post) do |f|
       concat f.text_field :title
       concat f.submit('Edit post')
-- 
cgit v1.2.3


From 98a1717e7c094d011c89ea1ed88673a595af2de8 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 23 Nov 2011 23:36:56 +0300
Subject: configuration option to always write cookie

---
 actionpack/lib/action_dispatch/middleware/cookies.rb | 5 ++++-
 actionpack/lib/action_dispatch/railtie.rb            | 4 +++-
 actionpack/test/dispatch/cookies_test.rb             | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index a4ffd40a66..51cec41a34 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -243,10 +243,13 @@ module ActionDispatch
         @delete_cookies.clear
       end
 
+      mattr_accessor :always_write_cookie
+      self.always_write_cookie = false
+
       private
 
         def write_cookie?(cookie)
-          @secure || !cookie[:secure] || defined?(Rails.env) && Rails.env.development?
+          @secure || !cookie[:secure] || always_write_cookie
         end
     end
 
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 1af89858d1..f18ebabf29 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -10,10 +10,12 @@ module ActionDispatch
     config.action_dispatch.tld_length = 1
     config.action_dispatch.ignore_accept_header = false
     config.action_dispatch.rack_cache = {:metastore => "rails:/", :entitystore => "rails:/", :verbose => true}
-
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
+
+      config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
+      ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
     end
   end
 end
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 49da448001..3765b7eb44 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -210,8 +210,8 @@ class CookiesTest < ActionController::TestCase
     assert_equal({"user_name" => "david"}, @response.cookies)
   end
 
-  def test_setting_cookie_with_secure_in_development
-    Rails.env.stubs(:development?).returns(true)
+  def test_setting_cookie_with_secure_when_always_write_cookie_is_true
+    ActionDispatch::Cookies::CookieJar.any_instance.stubs(:always_write_cookie).returns(true)
     get :authenticate_with_secure
     assert_cookie_header "user_name=david; path=/; secure"
     assert_equal({"user_name" => "david"}, @response.cookies)
-- 
cgit v1.2.3


From 7fcc8c0a1f38c77b12cb6ffe81fb2887e6c60b85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 23:45:27 +0000
Subject: Rely solely on active_model_serializer and remove the fancy constant
 lookup.

---
 actionpack/lib/action_controller/metal/serialization.rb |  4 +++-
 actionpack/test/controller/render_json_test.rb          | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/serialization.rb b/actionpack/lib/action_controller/metal/serialization.rb
index 9bb665a9ae..9fb49f512e 100644
--- a/actionpack/lib/action_controller/metal/serialization.rb
+++ b/actionpack/lib/action_controller/metal/serialization.rb
@@ -13,7 +13,9 @@ module ActionController
     end
 
     def _render_option_json(json, options)
-      json = json.active_model_serializer.new(json, serialization_scope) if json.respond_to?(:active_model_serializer)
+      if json.respond_to?(:active_model_serializer) && (serializer = json.active_model_serializer)
+        json = serializer.new(json, serialization_scope)
+      end
       super
     end
 
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index f886af1a95..dc09812ba3 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -26,8 +26,12 @@ class RenderJsonTest < ActionController::TestCase
   end
 
   class JsonSerializable
+    def initialize(skip=false)
+      @skip = skip
+    end
+
     def active_model_serializer
-      JsonSerializer
+      JsonSerializer unless @skip
     end
 
     def as_json(*)
@@ -89,6 +93,11 @@ class RenderJsonTest < ActionController::TestCase
       @current_user = Struct.new(:as_json).new(:current_user => true)
       render :json => JsonSerializable.new
     end
+
+    def render_json_with_serializer_api_but_without_serializer
+      @current_user = Struct.new(:as_json).new(:current_user => true)
+      render :json => JsonSerializable.new(true)
+    end
   end
 
   tests TestController
@@ -166,4 +175,9 @@ class RenderJsonTest < ActionController::TestCase
     assert_match '"scope":{"current_user":true}', @response.body
     assert_match '"object":{"serializable_object":true}', @response.body
   end
+
+  def test_render_json_with_serializer_api_but_without_serializer
+    get :render_json_with_serializer_api_but_without_serializer
+    assert_match '{"serializable_object":true}', @response.body
+  end
 end
-- 
cgit v1.2.3


From 696d01f7f4a8ed787924a41cce6df836cd73c46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Nov 2011 09:49:54 +0000
Subject: Add docs to serializers. Update CHANGELOGs.

---
 .../lib/action_controller/metal/serialization.rb   | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/serialization.rb b/actionpack/lib/action_controller/metal/serialization.rb
index 9fb49f512e..628d5996d7 100644
--- a/actionpack/lib/action_controller/metal/serialization.rb
+++ b/actionpack/lib/action_controller/metal/serialization.rb
@@ -1,4 +1,27 @@
 module ActionController
+  # Action Controller Serialization
+  #
+  # Overrides render :json to check if the given object implements +active_model_serializer+
+  # as a method. If so, use the returned serializer instead of calling +to_json+ in the object.
+  #
+  # This module also provides a serialization_scope method that allows you to configure the
+  # +serialization_scope+ of the serializer. Most apps will likely set the +serialization_scope+
+  # to the current user:
+  #
+  #    class ApplicationController < ActionController::Base
+  #      serialization_scope :current_user
+  #    end
+  #
+  # If you need more complex scope rules, you can simply override the serialization_scope:
+  #
+  #    class ApplicationController < ActionController::Base
+  #      private
+  #      
+  #      def serialization_scope
+  #        current_user
+  #      end
+  #    end
+  #
   module Serialization
     extend ActiveSupport::Concern
 
-- 
cgit v1.2.3


From cd9d28d6fdff6819dac3c6643fe882eb568b5a39 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Thu, 24 Nov 2011 22:37:48 +0300
Subject: middlewares should use logger from env

---
 .../lib/action_dispatch/middleware/params_parser.rb      |  6 +++---
 .../lib/action_dispatch/middleware/show_exceptions.rb    | 16 ++++++++++------
 actionpack/test/abstract_unit.rb                         |  4 ++--
 .../test/dispatch/request/json_params_parsing_test.rb    | 16 ++++++----------
 .../test/dispatch/request/xml_params_parsing_test.rb     | 16 ++++++----------
 actionpack/test/dispatch/show_exceptions_test.rb         |  7 +++++++
 6 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 84e3dd16dd..6ded9dbfed 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -52,7 +52,7 @@ module ActionDispatch
           false
         end
       rescue Exception => e # YAML, XML or Ruby code block errors
-        logger.debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
+        logger(env).debug "Error occurred while parsing request parameters.\nContents:\n\n#{request.raw_post}"
 
         raise e
       end
@@ -68,8 +68,8 @@ module ActionDispatch
         nil
       end
 
-      def logger
-        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
+      def logger(env)
+        env['action_dispatch.logger'] || Logger.new($stderr)
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 52dce4cc81..8dc2820d37 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -63,7 +63,7 @@ module ActionDispatch
 
     private
       def render_exception(env, exception)
-        log_error(exception)
+        log_error(env, exception)
         exception = original_exception(exception)
 
         if env['action_dispatch.show_detailed_exceptions'] == true
@@ -124,14 +124,14 @@ module ActionDispatch
         defined?(Rails.public_path) ? Rails.public_path : 'public_path'
       end
 
-      def log_error(exception)
-        return unless logger
+      def log_error(env, exception)
+        return unless logger(env)
 
         ActiveSupport::Deprecation.silence do
           message = "\n#{exception.class} (#{exception.message}):\n"
           message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
           message << "  " << application_trace(exception).join("\n  ")
-          logger.fatal("#{message}\n\n")
+          logger(env).fatal("#{message}\n\n")
         end
       end
 
@@ -153,8 +153,12 @@ module ActionDispatch
           exception.backtrace
       end
 
-      def logger
-        defined?(Rails.logger) ? Rails.logger : Logger.new($stderr)
+      def logger(env)
+        env['action_dispatch.logger'] || stderr_logger
+      end
+
+      def stderr_logger
+        Logger.new($stderr)
       end
 
     def original_exception(exception)
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 24d071df39..cbb8968496 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -333,9 +333,9 @@ module ActionDispatch
         "#{FIXTURE_LOAD_PATH}/public"
       end
 
-      remove_method :logger
+      remove_method :stderr_logger
       # Silence logger
-      def logger
+      def stderr_logger
         nil
       end
   end
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index d481a2df13..ad44b4b16a 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -32,16 +32,12 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "logs error if parsing unsuccessful" do
     with_test_routing do
-      begin
-        $stderr = StringIO.new
-        json = "[\"person]\": {\"name\": \"David\"}}"
-        post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true}
-        assert_response :error
-        $stderr.rewind && err = $stderr.read
-        assert err =~ /Error occurred while parsing request parameters/
-      ensure
-        $stderr = STDERR
-      end
+      output = StringIO.new
+      json = "[\"person]\": {\"name\": \"David\"}}"
+      post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+      assert_response :error
+      output.rewind && err = output.read
+      assert err =~ /Error occurred while parsing request parameters/
     end
   end
 
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index 65a25557b7..d8fa751548 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -54,16 +54,12 @@ class XmlParamsParsingTest < ActionDispatch::IntegrationTest
 
   test "logs error if parsing unsuccessful" do
     with_test_routing do
-      begin
-        $stderr = StringIO.new
-        xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></pineapple>"
-        post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => true)
-        assert_response :error
-        $stderr.rewind && err = $stderr.read
-        assert err =~ /Error occurred while parsing request parameters/
-      ensure
-        $stderr = STDERR
-      end
+      output = StringIO.new
+      xml = "<person><name>David</name><avatar type='file' name='me.jpg' content_type='image/jpg'>#{ActiveSupport::Base64.encode64('ABC')}</avatar></pineapple>"
+      post "/parse", xml, default_headers.merge('action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output))
+      assert_response :error
+      output.rewind && err = output.read
+      assert err =~ /Error occurred while parsing request parameters/
     end
   end
 
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 9f4d6c530f..5875725b5d 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -128,4 +128,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     get "/", {}, {'action_dispatch.show_exceptions' => true}
     assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
+
+  test 'uses logger from env' do
+    @app = ProductionApp
+    output = StringIO.new
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+    assert_match(/puke/, output.rewind && output.read)
+  end
 end
-- 
cgit v1.2.3


From 9a45867b094c0a41303e24b68414bc69d2263bc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Fri, 25 Nov 2011 14:22:36 +0200
Subject: Remove unnecessary comment.

---
 actionpack/lib/action_dispatch/routing/url_for.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 8fc8dc191b..334ddd5c2f 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -42,7 +42,7 @@ module ActionDispatch
     #   url_for(:controller => 'users',
     #           :action => 'new',
     #           :message => 'Welcome!',
-    #           :host => 'www.example.com')        # Changed this.
+    #           :host => 'www.example.com')
     #   # => "http://www.example.com/users/new?message=Welcome%21"
     #
     # By default, all controllers and views have access to a special version of url_for,
-- 
cgit v1.2.3


From a607a9d978c4a84935fa23556de1dde5aea274d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Fri, 25 Nov 2011 14:24:14 +0200
Subject: what's -> that's

---
 actionpack/lib/action_dispatch/routing/url_for.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 334ddd5c2f..39ba83fb9a 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -52,7 +52,7 @@ module ActionDispatch
     #
     # For convenience reasons, mailers provide a shortcut for ActionController::UrlFor#url_for.
     # So within mailers, you only have to type 'url_for' instead of 'ActionController::UrlFor#url_for'
-    # in full. However, mailers don't have hostname information, and what's why you'll still
+    # in full. However, mailers don't have hostname information, and that's why you'll still
     # have to specify the <tt>:host</tt> argument when generating URLs in mailers.
     #
     #
-- 
cgit v1.2.3


From 0a4035b12a6c59253cb60f9e3456513c6a6a9d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 25 Nov 2011 19:29:39 +0000
Subject: Revert the serializers API as other alternatives are now also under
 discussion

---
 actionpack/lib/action_controller.rb                |  1 -
 .../lib/action_controller/metal/serialization.rb   | 51 ----------------------
 actionpack/test/controller/render_json_test.rb     | 48 --------------------
 3 files changed, 100 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/metal/serialization.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 3829e60bb0..f4eaa2fd1b 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,7 +31,6 @@ module ActionController
     autoload :RequestForgeryProtection
     autoload :Rescue
     autoload :Responder
-    autoload :Serialization
     autoload :SessionManagement
     autoload :Streaming
     autoload :Testing
diff --git a/actionpack/lib/action_controller/metal/serialization.rb b/actionpack/lib/action_controller/metal/serialization.rb
deleted file mode 100644
index 628d5996d7..0000000000
--- a/actionpack/lib/action_controller/metal/serialization.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-module ActionController
-  # Action Controller Serialization
-  #
-  # Overrides render :json to check if the given object implements +active_model_serializer+
-  # as a method. If so, use the returned serializer instead of calling +to_json+ in the object.
-  #
-  # This module also provides a serialization_scope method that allows you to configure the
-  # +serialization_scope+ of the serializer. Most apps will likely set the +serialization_scope+
-  # to the current user:
-  #
-  #    class ApplicationController < ActionController::Base
-  #      serialization_scope :current_user
-  #    end
-  #
-  # If you need more complex scope rules, you can simply override the serialization_scope:
-  #
-  #    class ApplicationController < ActionController::Base
-  #      private
-  #      
-  #      def serialization_scope
-  #        current_user
-  #      end
-  #    end
-  #
-  module Serialization
-    extend ActiveSupport::Concern
-
-    include ActionController::Renderers
-
-    included do
-      class_attribute :_serialization_scope
-    end
-
-    def serialization_scope
-      send(_serialization_scope)
-    end
-
-    def _render_option_json(json, options)
-      if json.respond_to?(:active_model_serializer) && (serializer = json.active_model_serializer)
-        json = serializer.new(json, serialization_scope)
-      end
-      super
-    end
-
-    module ClassMethods
-      def serialization_scope(scope)
-        self._serialization_scope = scope
-      end
-    end
-  end
-end
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index dc09812ba3..fc604a2db3 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -15,36 +15,9 @@ class RenderJsonTest < ActionController::TestCase
     end
   end
 
-  class JsonSerializer
-    def initialize(object, scope)
-      @object, @scope = object, scope
-    end
-
-    def as_json(*)
-      { :object => @object.as_json, :scope => @scope.as_json }
-    end
-  end
-
-  class JsonSerializable
-    def initialize(skip=false)
-      @skip = skip
-    end
-
-    def active_model_serializer
-      JsonSerializer unless @skip
-    end
-
-    def as_json(*)
-      { :serializable_object => true }
-    end
-  end
-
   class TestController < ActionController::Base
     protect_from_forgery
 
-    serialization_scope :current_user
-    attr_reader :current_user
-
     def self.controller_path
       'test'
     end
@@ -88,16 +61,6 @@ class RenderJsonTest < ActionController::TestCase
     def render_json_without_options
       render :json => JsonRenderable.new
     end
-
-    def render_json_with_serializer
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      render :json => JsonSerializable.new
-    end
-
-    def render_json_with_serializer_api_but_without_serializer
-      @current_user = Struct.new(:as_json).new(:current_user => true)
-      render :json => JsonSerializable.new(true)
-    end
   end
 
   tests TestController
@@ -169,15 +132,4 @@ class RenderJsonTest < ActionController::TestCase
     get :render_json_without_options
     assert_equal '{"a":"b"}', @response.body
   end
-
-  def test_render_json_with_serializer
-    get :render_json_with_serializer
-    assert_match '"scope":{"current_user":true}', @response.body
-    assert_match '"object":{"serializable_object":true}', @response.body
-  end
-
-  def test_render_json_with_serializer_api_but_without_serializer
-    get :render_json_with_serializer_api_but_without_serializer
-    assert_match '{"serializable_object":true}', @response.body
-  end
 end
-- 
cgit v1.2.3


From b6916e0b925d4c8b4487d574fe07b11440f2ec5e Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 25 Nov 2011 15:06:30 -0800
Subject: removes a Serialization constant left in the previous revert

---
 actionpack/lib/action_controller/base.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index cfb9cf5e6e..98bfe72fef 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -190,7 +190,6 @@ module ActionController
       Redirecting,
       Rendering,
       Renderers::All,
-      Serialization,
       ConditionalGet,
       RackDelegation,
       SessionManagement,
-- 
cgit v1.2.3


From c4af5f00f602b9e1c3166872902265836daf321b Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 26 Nov 2011 18:52:10 +0530
Subject: use any? to check for size

---
 actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 73824dc1f8..90589d2238 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -32,7 +32,7 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated(@posts[0].created_at) if @posts.length > 0
+      #       feed.updated(@posts.first.created_at) if @posts.any?
       #
       #       @posts.each do |post|
       #         feed.entry(post) do |entry|
-- 
cgit v1.2.3


From bc81ba2451a6a6c5507ad497cf838935e9d1ece2 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Sun, 27 Nov 2011 16:59:44 +0300
Subject: fix label with block in erb

---
 actionpack/lib/action_view/helpers/form_helper.rb   | 4 ++--
 actionpack/test/fixtures/test/_label_with_block.erb | 4 ++++
 actionpack/test/template/form_helper_test.rb        | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 actionpack/test/fixtures/test/_label_with_block.erb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index d687866d0d..4471a2b541 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -960,7 +960,7 @@ module ActionView
     end
 
     class InstanceTag
-      include Helpers::CaptureHelper, Context, Helpers::TagHelper, Helpers::FormTagHelper
+      include Helpers::TagHelper, Helpers::FormTagHelper
 
       attr_reader :object, :method_name, :object_name
 
@@ -992,7 +992,7 @@ module ActionView
         options["for"] ||= name_and_id["id"]
 
         if block_given?
-          label_tag(name_and_id["id"], options, &block)
+          @template_object.label_tag(name_and_id["id"], options, &block)
         else
           content = if text.blank?
             object_name.gsub!(/\[(.*)_attributes\]\[\d\]/, '.\1')
diff --git a/actionpack/test/fixtures/test/_label_with_block.erb b/actionpack/test/fixtures/test/_label_with_block.erb
new file mode 100644
index 0000000000..40117e594e
--- /dev/null
+++ b/actionpack/test/fixtures/test/_label_with_block.erb
@@ -0,0 +1,4 @@
+<%= label 'post', 'message' do %>
+  Message
+  <%= text_field 'post', 'message' %>
+<% end %>
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index ccedcd7dac..0758106a40 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -230,6 +230,13 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal('<label for="post_title">The title, please:</label>', label(:post, :title) { "The title, please:" })
   end
 
+  def test_label_with_block_in_erb
+    path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
+    view_paths = ActionView::PathSet.new([path])
+    view = ActionView::Base.new(view_paths)
+    assert_equal "<label for=\"post_message\">\n  Message\n  <input id=\"post_message\" name=\"post[message]\" size=\"30\" type=\"text\" />\n</label>", view.render("test/label_with_block")
+  end
+
   def test_text_field
     assert_dom_equal(
       '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title")
-- 
cgit v1.2.3


From fb8b555c490553ffe32d099303deaa37397029df Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sun, 27 Nov 2011 23:41:23 +0300
Subject: add namespace options to form_for

You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
The namespace attribute will be prefixed with underscore on the generate HTML id
---
 actionpack/lib/action_view/helpers/form_helper.rb | 11 +++-
 actionpack/test/template/form_helper_test.rb      | 76 +++++++++++++++++++++++
 2 files changed, 85 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 4471a2b541..6c97d75922 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -158,6 +158,9 @@ module ActionView
       # * <tt>:url</tt> - The URL the form is submitted to. It takes the same
       #   fields you pass to +url_for+ or +link_to+. In particular you may pass
       #   here a named route directly as well. Defaults to the current action.
+      # * <tt>:namespace</tt> - A namespace for your form to ensure uniqueness of
+      #   id attributes on form elements. The namespace attribute will be prefixed
+      #   with underscore on the generate HTML id.
       # * <tt>:html</tt> - Optional HTML attributes for the form tag.
       #
       # Also note that +form_for+ doesn't create an exclusive scope. It's still
@@ -385,7 +388,7 @@ module ActionView
         action, method = object.respond_to?(:persisted?) && object.persisted? ? [:edit, :put] : [:new, :post]
         options[:html].reverse_merge!(
           :class  => as ? "#{as}_#{action}" : dom_class(object, action),
-          :id     => as ? "#{as}_#{action}" : dom_id(object, action),
+          :id     => as ? "#{as}_#{action}" : [options[:namespace], dom_id(object, action)].compact.join("_").presence,
           :method => method
         )
 
@@ -971,6 +974,7 @@ module ActionView
       def initialize(object_name, method_name, template_object, object = nil)
         @object_name, @method_name = object_name.to_s.dup, method_name.to_s.dup
         @template_object = template_object
+
         @object_name.sub!(/\[\]$/,"") || @object_name.sub!(/\[\]\]$/,"]")
         @object = retrieve_object(object)
         @auto_index = retrieve_autoindex(Regexp.last_match.pre_match) if Regexp.last_match
@@ -989,6 +993,7 @@ module ActionView
 
         add_default_name_and_id_for_value(tag_value, name_and_id)
         options.delete("index")
+        options.delete("namespace")
         options["for"] ||= name_and_id["id"]
 
         if block_given?
@@ -1195,6 +1200,7 @@ module ActionView
             options["name"] ||= tag_name + (options['multiple'] ? '[]' : '')
             options["id"] = options.fetch("id"){ tag_id }
           end
+          options["id"] = [options.delete('namespace'), options["id"]].compact.join("_").presence
         end
 
         def tag_name
@@ -1253,7 +1259,7 @@ module ActionView
         @nested_child_index = {}
         @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc
         @parent_builder = options[:parent_builder]
-        @default_options = @options ? @options.slice(:index) : {}
+        @default_options = @options ? @options.slice(:index, :namespace) : {}
         if @object_name.to_s.match(/\[\]$/)
           if object ||= @template.instance_variable_get("@#{Regexp.last_match.pre_match}") and object.respond_to?(:to_param)
             @auto_index = object.to_param
@@ -1280,6 +1286,7 @@ module ActionView
         fields_options, record_object = record_object, nil if record_object.is_a?(Hash) && record_object.extractable_options?
         fields_options[:builder] ||= options[:builder]
         fields_options[:parent_builder] = self
+        fields_options[:namespace] = fields_options[:parent_builder].options[:namespace]
 
         case record_name
         when String, Symbol
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 0758106a40..ad876df65d 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -935,6 +935,82 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_form_for_with_namespace
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.check_box(:secret)
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'put') do
+      "<input name='post[title]' size='30' type='text' id='namespace_post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='namespace_post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[secret]' type='hidden' value='0' />" +
+      "<input name='post[secret]' checked='checked' type='checkbox' id='namespace_post_secret' value='1' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_form_for_with_namespace_with_label
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.label(:title)
+      concat f.text_field(:title)
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'put') do
+      "<label for='namespace_post_title'>Title</label>" +
+      "<input name='post[title]' size='30' type='text' id='namespace_post_title' value='Hello World' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_two_form_for_with_namespace
+    form_for(@post, :namespace => 'namespace_1') do |f|
+      concat f.label(:title)
+      concat f.text_field(:title)
+    end
+
+    expected_1 = whole_form('/posts/123', 'namespace_1_edit_post_123', 'edit_post', 'put') do
+      "<label for='namespace_1_post_title'>Title</label>" +
+      "<input name='post[title]' size='30' type='text' id='namespace_1_post_title' value='Hello World' />"
+    end
+
+    assert_dom_equal expected_1, output_buffer
+
+    form_for(@post, :namespace => 'namespace_2') do |f|
+      concat f.label(:title)
+      concat f.text_field(:title)
+    end
+
+    expected_2 = whole_form('/posts/123', 'namespace_2_edit_post_123', 'edit_post', 'put') do
+      "<label for='namespace_2_post_title'>Title</label>" +
+      "<input name='post[title]' size='30' type='text' id='namespace_2_post_title' value='Hello World' />"
+    end
+
+    assert_dom_equal expected_2, output_buffer
+  end
+
+  def test_fields_for_with_namespace
+    @comment.body = 'Hello World'
+    form_for(@post, :namespace => 'namespace') do |f|
+      concat f.text_field(:title)
+      concat f.text_area(:body)
+      concat f.fields_for(@comment) { |c|
+        concat c.text_field(:body)
+      }
+    end
+
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'put') do
+      "<input name='post[title]' size='30' type='text' id='namespace_post_title' value='Hello World' />" +
+      "<textarea name='post[body]' id='namespace_post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+      "<input name='post[comment][body]' size='30' type='text' id='namespace_post_comment_body' value='Hello World' />"
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_submit_with_object_as_new_record_and_locale_strings
     old_locale, I18n.locale = I18n.locale, :submit
 
-- 
cgit v1.2.3


From 25592569638689f9d863f21862b1f23b5b390833 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Mon, 28 Nov 2011 10:54:12 +0300
Subject: update CHANGELOG

---
 actionpack/CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fe422f71d5..314aa7181c 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
+    The namespace attribute will be prefixed with underscore on the generate HTML id. *Vasiliy Ermolovich*
+
+    Example:
+
+        <%= form_for(@offer, :namespace => 'namespace') do |f| %>
+          <%= f.label :version, 'Version' %>:
+          <%= f.text_field :version %>
+        <% end %>
+
 *   Refactor ActionDispatch::ShowExceptions. Controller is responsible for choice to show exceptions. *Sergey Nartimov*
 
     It's possible to override +show_detailed_exceptions?+ in controllers to specify which requests should provide debugging information on errors.
-- 
cgit v1.2.3


From 9d7795638da94a52e474f36e188ee8c2f80f6701 Mon Sep 17 00:00:00 2001
From: Marc Bowes <marcbowes@gmail.com>
Date: Mon, 28 Nov 2011 11:55:14 +0200
Subject: * A `/` is required if you want to explicitly skip the assets
 directory. This is important because `public/assets` is typically
 git-ignored. * The asset id is no longer generated.

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 7d01e5ddb8..653e12c7d8 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -228,23 +228,19 @@ module ActionView
         )
       end
 
-      # Web browsers cache favicons. If you just throw a <tt>favicon.ico</tt> into the document
-      # root of your application and it changes later, clients that have it in their cache
-      # won't see the update. Using this helper prevents that because it appends an asset ID:
-      #
       #   <%= favicon_link_tag %>
       #
       # generates
       #
-      #   <link href="/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   <link href="/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # You may specify a different file in the first argument:
       #
-      #   <%= favicon_link_tag 'favicon.ico' %>
+      #   <%= favicon_link_tag '/myicon.ico' %>
       #
       # That's passed to +path_to_image+ as is, so it gives
       #
-      #   <link href="/images/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
+      #   <link href="/myicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
       #
       # The helper accepts an additional options hash where you can override "rel" and "type".
       #
-- 
cgit v1.2.3


From 9ca58ba492fdd1729aa03ca8ec89be941a0f6d4e Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 28 Nov 2011 16:29:55 +0530
Subject: Revert "use any? to check for size"

This reverts commit c4af5f00f602b9e1c3166872902265836daf321b.
---
 actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
index 90589d2238..73824dc1f8 100644
--- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb
+++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb
@@ -32,7 +32,7 @@ module ActionView
       #   app/views/posts/index.atom.builder:
       #     atom_feed do |feed|
       #       feed.title("My great blog!")
-      #       feed.updated(@posts.first.created_at) if @posts.any?
+      #       feed.updated(@posts[0].created_at) if @posts.length > 0
       #
       #       @posts.each do |post|
       #         feed.entry(post) do |entry|
-- 
cgit v1.2.3


From fe7d4f09ef2296e45ab4a82c1556c63382856607 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Mon, 28 Nov 2011 19:25:37 +0300
Subject: put backtrace_cleaner to env

---
 .../action_dispatch/middleware/show_exceptions.rb  | 26 +++++++++++-----------
 actionpack/test/dispatch/show_exceptions_test.rb   |  7 ++++++
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 8dc2820d37..c850e25507 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -82,9 +82,9 @@ module ActionDispatch
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
           :request => Request.new(env),
           :exception => exception,
-          :application_trace => application_trace(exception),
-          :framework_trace => framework_trace(exception),
-          :full_trace => full_trace(exception)
+          :application_trace => application_trace(env, exception),
+          :framework_trace => framework_trace(env, exception),
+          :full_trace => full_trace(env, exception)
         )
         file = "rescues/#{@@rescue_templates[exception.class.name]}"
         body = template.render(:template => file, :layout => 'rescues/layout')
@@ -130,26 +130,26 @@ module ActionDispatch
         ActiveSupport::Deprecation.silence do
           message = "\n#{exception.class} (#{exception.message}):\n"
           message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
-          message << "  " << application_trace(exception).join("\n  ")
+          message << "  " << application_trace(env, exception).join("\n  ")
           logger(env).fatal("#{message}\n\n")
         end
       end
 
-      def application_trace(exception)
-        clean_backtrace(exception, :silent)
+      def application_trace(env, exception)
+        clean_backtrace(env, exception, :silent)
       end
 
-      def framework_trace(exception)
-        clean_backtrace(exception, :noise)
+      def framework_trace(env, exception)
+        clean_backtrace(env, exception, :noise)
       end
 
-      def full_trace(exception)
-        clean_backtrace(exception, :all)
+      def full_trace(env, exception)
+        clean_backtrace(env, exception, :all)
       end
 
-      def clean_backtrace(exception, *args)
-        defined?(Rails) && Rails.respond_to?(:backtrace_cleaner) ?
-          Rails.backtrace_cleaner.clean(exception.backtrace, *args) :
+      def clean_backtrace(env, exception, *args)
+        env['action_dispatch.backtrace_cleaner'] ?
+          env['action_dispatch.backtrace_cleaner'].clean(exception.backtrace, *args) :
           exception.backtrace
       end
 
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 5875725b5d..90f13a3bb9 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -135,4 +135,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
     assert_match(/puke/, output.rewind && output.read)
   end
+
+  test 'uses backtrace cleaner from env' do
+    @app = DevelopmentApp
+    cleaner = stub(:clean => ['passed backtrace cleaner'])
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
+    assert_match(/passed backtrace cleaner/, body)
+  end
 end
-- 
cgit v1.2.3


From 237272e049e409c9f620dfadb7cf0688e8c91b0f Mon Sep 17 00:00:00 2001
From: Travis Pew <travis@travispew.com>
Date: Mon, 28 Nov 2011 15:46:09 -0500
Subject: Fix ActionDispatch::Request method explanations

The methods, "post?", "put?", "head?", etc. contain an incorrect
explanation. They state that they are equivalent to request_method ==
:type, but this is not accurate because the methods convert the string
to a symbol. They are actually equivalent to:
  request_method_symbol == :type
---
 actionpack/lib/action_dispatch/http/request.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 69ca050d0c..e86dfd64d2 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -94,31 +94,31 @@ module ActionDispatch
     end
 
     # Is this a GET (or HEAD) request?
-    # Equivalent to <tt>request.request_method == :get</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :get</tt>.
     def get?
       HTTP_METHOD_LOOKUP[request_method] == :get
     end
 
     # Is this a POST request?
-    # Equivalent to <tt>request.request_method == :post</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :post</tt>.
     def post?
       HTTP_METHOD_LOOKUP[request_method] == :post
     end
 
     # Is this a PUT request?
-    # Equivalent to <tt>request.request_method == :put</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :put</tt>.
     def put?
       HTTP_METHOD_LOOKUP[request_method] == :put
     end
 
     # Is this a DELETE request?
-    # Equivalent to <tt>request.request_method == :delete</tt>.
+    # Equivalent to <tt>request.request_method_symbol == :delete</tt>.
     def delete?
       HTTP_METHOD_LOOKUP[request_method] == :delete
     end
 
     # Is this a HEAD request?
-    # Equivalent to <tt>request.method == :head</tt>.
+    # Equivalent to <tt>request.method_symbol == :head</tt>.
     def head?
       HTTP_METHOD_LOOKUP[method] == :head
     end
-- 
cgit v1.2.3


From d3bc12b27feb96e8799e2bcdc6e52b2704360aa3 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Tue, 29 Nov 2011 01:59:36 -0500
Subject: Handle correctly optional parameters for callable asset_host.

---
 actionpack/lib/action_view/asset_paths.rb         | 4 ++--
 actionpack/test/template/sprockets_helper_test.rb | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/asset_paths.rb b/actionpack/lib/action_view/asset_paths.rb
index 1d16e34df6..aa5db0d7bc 100644
--- a/actionpack/lib/action_view/asset_paths.rb
+++ b/actionpack/lib/action_view/asset_paths.rb
@@ -103,8 +103,8 @@ module ActionView
         if host.respond_to?(:call)
           args = [source]
           arity = arity_of(host)
-          if arity > 1 && !has_request?
-            invalid_asset_host!("Remove the second argument to your asset_host Proc if you do not need the request.")
+          if (arity > 1 || arity < -2) && !has_request?
+            invalid_asset_host!("Remove the second argument to your asset_host Proc if you do not need the request, or make it optional.")
           end
           args << current_request if (arity > 1 || arity < 0) && has_request?
           host.call(*args)
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 26a504beb8..64fdd53e73 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -41,6 +41,10 @@ class SprocketsHelperTest < ActionView::TestCase
     @controller ? @controller.config : @config
   end
 
+  def compute_host(source, request, options = {})
+    raise "Should never get here"
+  end
+
   test "asset_path" do
     assert_match %r{/assets/logo-[0-9a-f]+.png},
       asset_path("logo.png")
@@ -125,6 +129,10 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_raises ActionController::RoutingError do
       asset_path("logo.png")
     end
+    @config.asset_host = method :compute_host
+    assert_raises ActionController::RoutingError do
+      asset_path("logo.png")
+    end
   end
 
   test "image_tag" do
-- 
cgit v1.2.3


From 0b72a04d0c93b666c23500aefbe4a6a76593cd36 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 29 Nov 2011 12:28:04 +0000
Subject: Deprecate set_table_name in favour of self.table_name= or defining
 your own method.

---
 actionpack/test/activerecord/polymorphic_routes_test.rb | 16 ++++++++--------
 actionpack/test/fixtures/developer.rb                   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index fc829aa6b4..90e7f4ae59 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -2,36 +2,36 @@ require 'active_record_unit'
 require 'fixtures/project'
 
 class Task < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Step < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Bid < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Tax < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Fax < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 class Series < ActiveRecord::Base
-  set_table_name 'projects'
+  self.table_name = 'projects'
 end
 
 module Blog
   class Post < ActiveRecord::Base
-    set_table_name 'projects'
+    self.table_name = 'projects'
   end
 
   class Blog < ActiveRecord::Base
-    set_table_name 'projects'
+    self.table_name = 'projects'
   end
 
   def self.use_relative_model_naming?
diff --git a/actionpack/test/fixtures/developer.rb b/actionpack/test/fixtures/developer.rb
index c70eda34c6..dd14548fac 100644
--- a/actionpack/test/fixtures/developer.rb
+++ b/actionpack/test/fixtures/developer.rb
@@ -5,5 +5,5 @@ class Developer < ActiveRecord::Base
 end
 
 class DeVeLoPeR < ActiveRecord::Base
-  set_table_name "developers"
+  self.table_name = "developers"
 end
-- 
cgit v1.2.3


From 7af719e81c46d06f50cd9b3caff38b945c5f2d84 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Tue, 29 Nov 2011 16:33:50 +0000
Subject: Deprecate set_sequence_name in favour of self.sequence_name=

---
 actionpack/test/fixtures/company.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/fixtures/company.rb b/actionpack/test/fixtures/company.rb
index cd39ea7898..e29978801e 100644
--- a/actionpack/test/fixtures/company.rb
+++ b/actionpack/test/fixtures/company.rb
@@ -1,10 +1,10 @@
 class Company < ActiveRecord::Base
   has_one :mascot
   attr_protected :rating
-  set_sequence_name :companies_nonstd_seq
+  self.sequence_name = :companies_nonstd_seq
 
   validates_presence_of :name
   def validate
     errors.add('rating', 'rating should not be 2') if rating == 2
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From e3bc1385f1e8d2816deb215880d99aca136c0cc3 Mon Sep 17 00:00:00 2001
From: Aviv Ben-Yosef <aviv.by@gmail.com>
Date: Wed, 30 Nov 2011 06:55:34 +0200
Subject: Fixing incorrect documentation

`path_names` can only be used for affecting `new` and `edit`
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 7947e9d393..88e422c05d 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1046,8 +1046,8 @@ module ActionDispatch
         # Takes same options as <tt>Base#match</tt> as well as:
         #
         # [:path_names]
-        #   Allows you to change the paths of the seven default actions.
-        #   Paths not specified are not changed.
+        #   Allows you to change the segment component of the +edit+ and +new+ actions.
+        #   Actions not specified are not changed.
         #
         #     resources :posts, :path_names => { :new => "brand_new" }
         #
-- 
cgit v1.2.3


From 6093d88ed8b50647c1ca235cd4c167ee78955e56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 29 Nov 2011 10:17:25 +0100
Subject: Fixes for using action view template in isolation.

---
 actionpack/lib/action_view.rb                           |  1 +
 actionpack/lib/action_view/template/handlers/builder.rb | 11 ++++++++++-
 actionpack/lib/action_view/template/handlers/erb.rb     |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index d7229419a9..c24109a547 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -33,6 +33,7 @@ module ActionView
     autoload :AssetPaths
     autoload :Base
     autoload :Context
+    autoload :CompiledTemplates, "action_view/context"
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
diff --git a/actionpack/lib/action_view/template/handlers/builder.rb b/actionpack/lib/action_view/template/handlers/builder.rb
index 2c52cfd90e..34397c3bcf 100644
--- a/actionpack/lib/action_view/template/handlers/builder.rb
+++ b/actionpack/lib/action_view/template/handlers/builder.rb
@@ -6,12 +6,21 @@ module ActionView
       self.default_format = Mime::XML
 
       def call(template)
-        require 'builder'
+        require_engine
         "xml = ::Builder::XmlMarkup.new(:indent => 2);" +
           "self.output_buffer = xml.target!;" +
           template.source +
           ";xml.target!;"
       end
+
+      protected
+
+      def require_engine
+        @required ||= begin
+          require "builder"
+          true
+        end
+      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 77720e2bc8..25f26dd609 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,5 +1,5 @@
 require 'action_dispatch/http/mime_type'
-require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/class/attribute'
 require 'erubis'
 
 module ActionView
-- 
cgit v1.2.3


From a6ee246e5cea1c1a71631c6bef3740a4bf4eb250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 29 Nov 2011 10:19:54 +0100
Subject: Update sprockets which theoretically fixes the regression we have
 seen.

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 41bada43ef..d6e9519915 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0')
-  s.add_dependency('sprockets',     '~> 2.1.1')
+  s.add_dependency('sprockets',     '~> 2.1.2')
   s.add_dependency('erubis',        '~> 2.7.0')
 
   s.add_development_dependency('tzinfo', '~> 0.3.29')
-- 
cgit v1.2.3


From 38ab982cfff98570b5f12933cff489364845789c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 30 Nov 2011 09:52:52 +0100
Subject: Log 'Filter chain halted as CALLBACKNAME rendered or redirected'
 every time a before callback halts.

---
 actionpack/CHANGELOG.md                                   |  2 ++
 actionpack/lib/action_controller/log_subscriber.rb        |  4 ++++
 actionpack/lib/action_controller/metal/instrumentation.rb |  7 ++++++-
 actionpack/test/controller/log_subscriber_test.rb         | 13 ++++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 314aa7181c..b091d12d2c 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts. *José Valim*
+
 *   You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
     The namespace attribute will be prefixed with underscore on the generate HTML id. *Vasiliy Ermolovich*
 
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 35e29398e6..8666ecc9c8 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -29,6 +29,10 @@ module ActionController
       info(message)
     end
 
+    def halted_callback(event)
+      info "Filter chain halted as #{event.payload[:filter]} rendered or redirected"
+    end
+
     def send_file(event)
       message = "Sent file %s"
       message << " (%.1fms)"
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 777a0ab343..640ebf5f00 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -64,7 +64,12 @@ module ActionController
       end
     end
 
-  protected
+  private
+
+    # A hook invoked everytime a before callback is halted.
+    def halted_callback_hook(filter)
+      ActiveSupport::Notifications.instrument("halted_callback.action_controller", :filter => filter)
+    end
 
     # A hook which allows you to clean up any time taken into account in
     # views wrongly, like database querying time.
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index ccdfcb0b2c..700fd788fa 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -13,6 +13,11 @@ module Another
       head :status => 406
     end
 
+    before_filter :redirector, :only => :never_executed
+
+    def never_executed
+    end
+
     def show
       render :nothing => true
     end
@@ -49,7 +54,6 @@ module Another
     def with_rescued_exception
       raise SpecialException
     end
-
   end
 end
 
@@ -86,6 +90,13 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_equal "Processing by Another::LogSubscribersController#show as HTML", logs.first
   end
 
+  def test_halted_callback
+    get :never_executed
+    wait
+    assert_equal 4, logs.size
+    assert_equal "Filter chain halted as :redirector rendered or redirected", logs.third
+  end
+
   def test_process_action
     get :show
     wait
-- 
cgit v1.2.3


From e975fe710a1a78d723cfd91c07014627f92e3250 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 30 Nov 2011 17:38:09 +0300
Subject: test helpers in erb using erb

---
 actionpack/test/abstract_unit.rb                         |  8 ++++++++
 .../fixtures/test/_content_tag_nested_in_content_tag.erb |  3 +++
 actionpack/test/template/form_helper_test.rb             |  5 ++---
 actionpack/test/template/form_tag_helper_test.rb         | 16 +++++++++-------
 actionpack/test/template/record_tag_helper_test.rb       |  6 ++++--
 actionpack/test/template/tag_helper_test.rb              | 10 +++++-----
 6 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb

(limited to 'actionpack')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index cbb8968496..644422a6a8 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -73,6 +73,14 @@ module RackTestUtils
 end
 
 module RenderERBUtils
+  def view
+    @view ||= begin
+      path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
+      view_paths = ActionView::PathSet.new([path])
+      ActionView::Base.new(view_paths)
+    end
+  end
+
   def render_erb(string)
     template = ActionView::Template.new(
       string.strip,
diff --git a/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb b/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
new file mode 100644
index 0000000000..2f21a75dd9
--- /dev/null
+++ b/actionpack/test/fixtures/test/_content_tag_nested_in_content_tag.erb
@@ -0,0 +1,3 @@
+<%= content_tag 'p' do %>
+  <%= content_tag 'b', 'Hello' %>
+<% end %>
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index ad876df65d..3fee366804 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -3,6 +3,8 @@ require 'controller/fake_models'
 require 'active_support/core_ext/object/inclusion'
 
 class FormHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::FormHelper
 
   def form_for(*)
@@ -231,9 +233,6 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_label_with_block_in_erb
-    path = ActionView::FileSystemResolver.new(FIXTURE_LOAD_PATH)
-    view_paths = ActionView::PathSet.new([path])
-    view = ActionView::Base.new(view_paths)
     assert_equal "<label for=\"post_message\">\n  Message\n  <input id=\"post_message\" name=\"post[message]\" size=\"30\" type=\"text\" />\n</label>", view.render("test/label_with_block")
   end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 6eae9bf846..233907d07a 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -2,6 +2,8 @@ require 'abstract_unit'
 require 'active_support/core_ext/object/inclusion'
 
 class FormTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::FormTagHelper
 
   def setup
@@ -104,14 +106,14 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_form_tag_with_block_in_erb
-    output_buffer = form_tag("http://www.example.com") { concat "Hello world!" }
+    output_buffer = render_erb("<%= form_tag('http://www.example.com') do %>Hello world!<% end %>")
 
     expected = whole_form { "Hello world!" }
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method_in_erb
-    output_buffer = form_tag("http://www.example.com", :method => :put) { concat "Hello world!" }
+    output_buffer = render_erb("<%= form_tag('http://www.example.com', :method => :put) do %>Hello world!<% end %>")
 
     expected = whole_form("http://www.example.com", :method => "put") do
       "Hello world!"
@@ -485,27 +487,27 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_field_set_tag_in_erb
-    output_buffer = field_set_tag("Your details") { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('Your details') do %>Hello world!<% end %>")
 
     expected = %(<fieldset><legend>Your details</legend>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag do %>Hello world!<% end %>")
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag('') { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('') do %>Hello world!<% end %>")
 
     expected = %(<fieldset>Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
 
-    output_buffer = field_set_tag('', :class => 'format') { concat "Hello world!" }
+    output_buffer = render_erb("<%= field_set_tag('', :class => 'format') do %>Hello world!<% end %>")
 
     expected = %(<fieldset class="format">Hello world!</fieldset>)
     assert_dom_equal expected, output_buffer
   end
-  
+
   def test_text_area_tag_options_symbolize_keys_side_effects
     options = { :option => "random_option" }
     text_area_tag "body", "hello world", options
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
index 7f23629e05..ec777d15c4 100644
--- a/actionpack/test/template/record_tag_helper_test.rb
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -22,6 +22,8 @@ class Post
 end
 
 class RecordTagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::RecordTagHelper
 
   def setup
@@ -58,13 +60,13 @@ class RecordTagHelperTest < ActionView::TestCase
 
   def test_block_works_with_content_tag_for_in_erb
     expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
-    actual = content_tag_for(:tr, @post) { concat @post.body }
+    actual = render_erb("<%= content_tag_for(:tr, @post) do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
   def test_div_for_in_erb
     expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
-    actual = div_for(@post, :class => "bar") { concat @post.body }
+    actual = render_erb("<%= div_for(@post, :class => 'bar') do %><%= @post.body %><% end %>")
     assert_dom_equal expected, actual
   end
 
diff --git a/actionpack/test/template/tag_helper_test.rb b/actionpack/test/template/tag_helper_test.rb
index 60b466a9ff..6c325d5abb 100644
--- a/actionpack/test/template/tag_helper_test.rb
+++ b/actionpack/test/template/tag_helper_test.rb
@@ -1,6 +1,8 @@
 require 'abstract_unit'
 
 class TagHelperTest < ActionView::TestCase
+  include RenderERBUtils
+
   tests ActionView::Helpers::TagHelper
 
   def test_tag
@@ -44,12 +46,12 @@ class TagHelperTest < ActionView::TestCase
   end
 
   def test_content_tag_with_block_in_erb
-    buffer = content_tag(:div) { concat "Hello world!" }
+    buffer = render_erb("<%= content_tag(:div) do %>Hello world!<% end %>")
     assert_dom_equal "<div>Hello world!</div>", buffer
   end
 
   def test_content_tag_with_block_and_options_in_erb
-    buffer = content_tag(:div, :class => "green") { concat "Hello world!" }
+    buffer = render_erb("<%= content_tag(:div, :class => 'green') do %>Hello world!<% end %>")
     assert_dom_equal %(<div class="green">Hello world!</div>), buffer
   end
 
@@ -68,10 +70,8 @@ class TagHelperTest < ActionView::TestCase
                  output_buffer
   end
 
-  # TAG TODO: Move this into a real template
   def test_content_tag_nested_in_content_tag_in_erb
-    buffer = content_tag("p") { concat content_tag("b", "Hello") }
-    assert_equal '<p><b>Hello</b></p>', buffer
+    assert_equal "<p>\n  <b>Hello</b>\n</p>", view.render("test/content_tag_nested_in_content_tag")
   end
 
   def test_content_tag_with_escaped_array_class
-- 
cgit v1.2.3


From a985309abc8993ddc33c7a604bc41868909f457c Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 30 Nov 2011 18:05:23 +0300
Subject: fix warning in tests when using render_erb helper

---
 actionpack/test/abstract_unit.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 644422a6a8..680d562379 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -82,6 +82,8 @@ module RenderERBUtils
   end
 
   def render_erb(string)
+    @virtual_path = nil
+
     template = ActionView::Template.new(
       string.strip,
       "test template",
-- 
cgit v1.2.3


From 565d92f57891c1114801a27cf45ba8ee4ec02cf9 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 30 Nov 2011 18:34:16 +0300
Subject: fix method redefined warnings in tests

---
 actionpack/test/abstract_unit.rb                       | 5 +++++
 actionpack/test/controller/routing_test.rb             | 6 ------
 actionpack/test/controller/url_for_integration_test.rb | 6 ------
 3 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 680d562379..d191a203dd 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -351,3 +351,8 @@ module ActionDispatch
   end
 end
 
+module RoutingTestHelpers
+  def url_for(set, options, recall = nil)
+    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
+  end
+end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 5bf68decca..4a67380f59 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -11,12 +11,6 @@ end
 
 ROUTING = ActionDispatch::Routing
 
-module RoutingTestHelpers
-  def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
-  end
-end
-
 # See RFC 3986, section 3.3 for allowed path characters.
 class UriReservedCharactersRoutingTest < Test::Unit::TestCase
   include RoutingTestHelpers
diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb
index 7b734ff0fb..451ea6027d 100644
--- a/actionpack/test/controller/url_for_integration_test.rb
+++ b/actionpack/test/controller/url_for_integration_test.rb
@@ -3,12 +3,6 @@ require 'abstract_unit'
 require 'controller/fake_controllers'
 require 'active_support/core_ext/object/with_options'
 
-module RoutingTestHelpers
-  def url_for(set, options, recall = nil)
-    set.send(:url_for, options.merge(:only_path => true, :_path_segments => recall))
-  end
-end
-
 module ActionPack
   class URLForIntegrationTest < ActiveSupport::TestCase
     include RoutingTestHelpers
-- 
cgit v1.2.3


From 13cab6ef50ab665e634f2834acbb0212300a3797 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 30 Nov 2011 21:51:01 +0300
Subject: fix exception page when template contains utf-8 and parameters
 contain utf-8

---
 actionpack/lib/action_view/template/error.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index 587e37a84f..fe27e54037 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -89,10 +89,14 @@ module ActionView
         line_counter = start_on_line
         return unless source_code = source_code[start_on_line..end_on_line]
 
-        source_code.sum do |line|
+        extract = source_code.sum do |line|
           line_counter += 1
           "#{indent}#{line_counter}: #{line}\n"
         end
+
+        extract.encode! if extract.respond_to?(:encode!)
+
+        extract
       end
 
       def sub_template_of(template_path)
-- 
cgit v1.2.3


From a72839bc9dc5fb3d56e79f7dc7f85975550d6fde Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Thu, 1 Dec 2011 01:06:24 +0530
Subject: minor typo fix

---
 actionpack/lib/action_view/helpers/form_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 6c97d75922..e674e12509 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -160,7 +160,7 @@ module ActionView
       #   here a named route directly as well. Defaults to the current action.
       # * <tt>:namespace</tt> - A namespace for your form to ensure uniqueness of
       #   id attributes on form elements. The namespace attribute will be prefixed
-      #   with underscore on the generate HTML id.
+      #   with underscore on the generated HTML id.
       # * <tt>:html</tt> - Optional HTML attributes for the form tag.
       #
       # Also note that +form_for+ doesn't create an exclusive scope. It's still
-- 
cgit v1.2.3


From 88237daae48c9867fca3b0e14e779d4f4cdd88d0 Mon Sep 17 00:00:00 2001
From: Jonathan del Strother <jon.delStrother@audioboo.fm>
Date: Thu, 17 Nov 2011 11:48:12 +0000
Subject: Leave default_asset_host_protocol unset

When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)
---
 actionpack/lib/sprockets/railtie.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 3d330bd91a..a7eb03acaf 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -10,8 +10,6 @@ module Sprockets
 
   # TODO: Get rid of config.assets.enabled
   class Railtie < ::Rails::Railtie
-    config.action_controller.default_asset_host_protocol = :relative
-
     rake_tasks do
       load "sprockets/assets.rake"
     end
-- 
cgit v1.2.3


From 1e51cd957e3c90f4be35f1f0c4c380d8f7d40d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 13:22:28 +0100
Subject: Update CHANGELOG.

---
 actionpack/CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b091d12d2c..26c4703150 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## Rails 3.2.0 (unreleased) ##
 
-*   Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts. *José Valim*
+*   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
+
+*   Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts *José Valim*
 
 *   You can provide a namespace for your form to ensure uniqueness of id attributes on form elements.
     The namespace attribute will be prefixed with underscore on the generate HTML id. *Vasiliy Ermolovich*
-- 
cgit v1.2.3


From 218c2729384be487b7b743a58ac39753cb5a8856 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 1 Dec 2011 19:09:22 +0100
Subject: Allow fresh_when/stale? to take a record instead of an options hash
 [DHH]

---
 actionpack/CHANGELOG.md                            |  2 +
 .../lib/action_controller/metal/conditional_get.rb | 53 ++++++++++++++++++++--
 actionpack/test/controller/render_test.rb          | 46 +++++++++++++++++++
 3 files changed, 97 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 26c4703150..6037e251f2 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Allow fresh_when/stale? to take a record instead of an options hash *DHH*
+
 *   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
 
 *   Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts *José Valim*
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index a5e37172c9..1645400693 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -23,8 +23,27 @@ module ActionController
     # This will render the show template if the request isn't sending a matching etag or
     # If-Modified-Since header and just a <tt>304 Not Modified</tt> response if there's a match.
     #
-    def fresh_when(options)
-      options.assert_valid_keys(:etag, :last_modified, :public)
+    # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #     fresh_when(@article)
+    #   end
+    #
+    # When passing a record, you can still set whether the public header:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #     fresh_when(@article, :public => true)
+    #   end
+    def fresh_when(record_or_options, additional_options = {})
+      if record_or_options.is_a? Hash
+        options = record_or_options
+        options.assert_valid_keys(:etag, :last_modified, :public)
+      else
+        record  = record_or_options
+        options = { :etag => record, :last_modified => record.try(:updated_at) }.merge(additional_options)
+      end
 
       response.etag          = options[:etag]          if options[:etag]
       response.last_modified = options[:last_modified] if options[:last_modified]
@@ -55,8 +74,34 @@ module ActionController
     #       end
     #     end
     #   end
-    def stale?(options)
-      fresh_when(options)
+    #
+    # You can also just pass a record where last_modified will be set by calling updated_at and the etag by passing the object itself. Example:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #
+    #     if stale?(@article)
+    #       @statistics = @article.really_expensive_call
+    #       respond_to do |format|
+    #         # all the supported formats
+    #       end
+    #     end
+    #   end
+    #
+    # When passing a record, you can still set whether the public header:
+    #
+    #   def show
+    #     @article = Article.find(params[:id])
+    #
+    #     if stale?(@article, :public => true)
+    #       @statistics = @article.really_expensive_call
+    #       respond_to do |format|
+    #         # all the supported formats
+    #       end
+    #     end
+    #   end
+    def stale?(record_or_options, additional_options = {})
+      fresh_when(record_or_options, additional_options)
       !request.fresh?(response)
     end
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index aea603b014..243bad8749 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -50,12 +50,28 @@ class TestController < ActionController::Base
     end
   end
 
+  def conditional_hello_with_record
+    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+    
+    if stale?(record)
+      render :action => 'hello_world'
+    end
+  end
+
   def conditional_hello_with_public_header
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
       render :action => 'hello_world'
     end
   end
 
+  def conditional_hello_with_public_header_with_record
+    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+
+    if stale?(record, :public => true)
+      render :action => 'hello_world'
+    end
+  end
+
   def conditional_hello_with_public_header_and_expires_at
     expires_in 1.minute
     if stale?(:last_modified => Time.now.utc.beginning_of_day, :etag => [:foo, 123], :public => true)
@@ -1440,6 +1456,36 @@ class LastModifiedRenderTest < ActionController::TestCase
     assert_equal @last_modified, @response.headers['Last-Modified']
   end
 
+
+  def test_responds_with_last_modified_with_record
+    get :conditional_hello_with_record
+    assert_equal @last_modified, @response.headers['Last-Modified']
+  end
+
+  def test_request_not_modified_with_record
+    @request.if_modified_since = @last_modified
+    get :conditional_hello_with_record
+    assert_equal 304, @response.status.to_i
+    assert_blank @response.body
+    assert_equal @last_modified, @response.headers['Last-Modified']
+  end
+
+  def test_request_not_modified_but_etag_differs_with_record
+    @request.if_modified_since = @last_modified
+    @request.if_none_match = "234"
+    get :conditional_hello_with_record
+    assert_response :success
+  end
+
+  def test_request_modified_with_record
+    @request.if_modified_since = 'Thu, 16 Jul 2008 00:00:00 GMT'
+    get :conditional_hello_with_record
+    assert_equal 200, @response.status.to_i
+    assert_present @response.body
+    assert_equal @last_modified, @response.headers['Last-Modified']
+  end
+
+
   def test_request_with_bang_gets_last_modified
     get :conditional_hello_with_bangs
     assert_equal @last_modified, @response.headers['Last-Modified']
-- 
cgit v1.2.3


From b4359bc7234b61c9a4a104542fa77f63bb84d7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 19:16:19 +0100
Subject: Allow rescue responses to be configured through a railtie.

---
 actionpack/CHANGELOG.md                                     |  2 ++
 .../lib/action_dispatch/middleware/show_exceptions.rb       | 12 ++++--------
 actionpack/lib/action_dispatch/railtie.rb                   | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 26c4703150..51e377b084 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Allow rescue responses to be configured through a railtie as in `config.action_dispatch.rescue_responses`. Please look at ActiveRecord::Railtie for an example. *José Valim*
+
 *   Assets should use the request protocol by default or default to relative if no request is available *Jonathan del Strother*
 
 *   Log "Filter chain halted as CALLBACKNAME rendered or redirected" every time a before callback halts *José Valim*
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index c850e25507..420cd99ca1 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -12,26 +12,22 @@ module ActionDispatch
 
     cattr_accessor :rescue_responses
     @@rescue_responses = Hash.new(:internal_server_error)
-    @@rescue_responses.update({
+    @@rescue_responses.merge!(
       'ActionController::RoutingError'             => :not_found,
       'AbstractController::ActionNotFound'         => :not_found,
-      'ActiveRecord::RecordNotFound'               => :not_found,
-      'ActiveRecord::StaleObjectError'             => :conflict,
-      'ActiveRecord::RecordInvalid'                => :unprocessable_entity,
-      'ActiveRecord::RecordNotSaved'               => :unprocessable_entity,
       'ActionController::MethodNotAllowed'         => :method_not_allowed,
       'ActionController::NotImplemented'           => :not_implemented,
       'ActionController::InvalidAuthenticityToken' => :unprocessable_entity
-    })
+    )
 
     cattr_accessor :rescue_templates
     @@rescue_templates = Hash.new('diagnostics')
-    @@rescue_templates.update({
+    @@rescue_templates.merge!(
       'ActionView::MissingTemplate'         => 'missing_template',
       'ActionController::RoutingError'      => 'routing_error',
       'AbstractController::ActionNotFound'  => 'unknown_action',
       'ActionView::Template::Error'         => 'template_error'
-    })
+    )
 
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
       ["<html><body><h1>500 Internal Server Error</h1>" <<
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index f18ebabf29..36a31be0c2 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -9,11 +9,22 @@ module ActionDispatch
     config.action_dispatch.best_standards_support = true
     config.action_dispatch.tld_length = 1
     config.action_dispatch.ignore_accept_header = false
-    config.action_dispatch.rack_cache = {:metastore => "rails:/", :entitystore => "rails:/", :verbose => true}
+    config.action_dispatch.rescue_templates = { }
+    config.action_dispatch.rescue_responses = { }
+
+    config.action_dispatch.rack_cache = {
+      :metastore => "rails:/",
+      :entitystore => "rails:/",
+      :verbose => true
+    }
+
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
 
+      ActionDispatch::ShowExceptions.rescue_responses.merge!(config.action_dispatch.rescue_responses)
+      ActionDispatch::ShowExceptions.rescue_templates.merge!(config.action_dispatch.rescue_templates)
+
       config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
       ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
     end
-- 
cgit v1.2.3


From 535853e83b9092078035a5abb2aa242fba815c05 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 1 Dec 2011 19:47:14 +0100
Subject: Added ActiveRecord::Base#last_modified to work with the new
 fresh_when/stale? conditional get methods from Action Pack

---
 actionpack/lib/action_controller/metal/conditional_get.rb | 4 ++--
 actionpack/test/controller/render_test.rb                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 1645400693..a6747fca7c 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -23,7 +23,7 @@ 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:
+    # You can also just pass a record where last_modified will be set by calling last_modified and the etag by passing the object itself. Example:
     #
     #   def show
     #     @article = Article.find(params[:id])
@@ -42,7 +42,7 @@ module ActionController
         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)
+        options = { :etag => record, :last_modified => record.try(:last_modified) }.merge(additional_options)
       end
 
       response.etag          = options[:etag]          if options[:etag]
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 243bad8749..e014d08ec9 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -51,7 +51,7 @@ class TestController < ActionController::Base
   end
 
   def conditional_hello_with_record
-    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+    record = Struct.new(:last_modified, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
     
     if stale?(record)
       render :action => 'hello_world'
@@ -65,7 +65,7 @@ class TestController < ActionController::Base
   end
 
   def conditional_hello_with_public_header_with_record
-    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+    record = Struct.new(:last_modified, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
 
     if stale?(record, :public => true)
       render :action => 'hello_world'
-- 
cgit v1.2.3


From 0b677b18ff75cd4bf8fd0b2f9579cd84ca3dc2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 20:02:00 +0100
Subject: Add an ExceptionWrapper that wraps an exception and provide
 convenience helpers.

---
 actionpack/lib/action_controller/log_subscriber.rb |  2 +-
 actionpack/lib/action_dispatch.rb                  |  1 +
 .../middleware/exception_wrapper.rb                | 77 +++++++++++++++++
 .../action_dispatch/middleware/show_exceptions.rb  | 97 +++++-----------------
 actionpack/lib/action_dispatch/railtie.rb          |  4 +-
 5 files changed, 104 insertions(+), 77 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/exception_wrapper.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 8666ecc9c8..de250053d3 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -20,7 +20,7 @@ module ActionController
 
       status = payload[:status]
       if status.nil? && payload[:exception].present?
-        status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil
+        status = Rack::Utils.status_code(ActionDispatch::ExceptionWrapper.new({}, payload[:exception]).status_code)
       end
       message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
       message << " (#{additions.join(" | ")})" unless additions.blank?
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 1e92d14542..1f403b5e1a 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -51,6 +51,7 @@ module ActionDispatch
     autoload :BestStandardsSupport
     autoload :Callbacks
     autoload :Cookies
+    autoload :ExceptionWrapper
     autoload :Flash
     autoload :Head
     autoload :ParamsParser
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
new file mode 100644
index 0000000000..96598b529d
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -0,0 +1,77 @@
+require 'active_support/core_ext/exception'
+
+module ActionDispatch
+  class ExceptionWrapper
+    cattr_accessor :rescue_responses
+    @@rescue_responses = Hash.new(:internal_server_error)
+    @@rescue_responses.merge!(
+      'ActionController::RoutingError'             => :not_found,
+      'AbstractController::ActionNotFound'         => :not_found,
+      'ActionController::MethodNotAllowed'         => :method_not_allowed,
+      'ActionController::NotImplemented'           => :not_implemented,
+      'ActionController::InvalidAuthenticityToken' => :unprocessable_entity
+    )
+
+    cattr_accessor :rescue_templates
+    @@rescue_templates = Hash.new('diagnostics')
+    @@rescue_templates.merge!(
+      'ActionView::MissingTemplate'         => 'missing_template',
+      'ActionController::RoutingError'      => 'routing_error',
+      'AbstractController::ActionNotFound'  => 'unknown_action',
+      'ActionView::Template::Error'         => 'template_error'
+    )
+
+    attr_reader :env, :exception
+
+    def initialize(env, exception)
+      @env = env
+      @exception = original_exception(exception)
+    end
+
+    def rescue_template
+      @@rescue_templates[@exception.class.name]
+    end
+
+    def status_code
+      Rack::Utils.status_code(@@rescue_responses[@exception.class.name])
+    end
+
+    def application_trace
+      clean_backtrace(:silent)
+    end
+
+    def framework_trace
+      clean_backtrace(:noise)
+    end
+
+    def full_trace
+      clean_backtrace(:all)
+    end
+
+    private
+
+    def original_exception(exception)
+      if registered_original_exception?(exception)
+        exception.original_exception
+      else
+        exception
+      end
+    end
+
+    def registered_original_exception?(exception)
+      exception.respond_to?(:original_exception) && @@rescue_responses.has_key?(exception.original_exception.class.name)
+    end
+
+    def clean_backtrace(*args)
+      if backtrace_cleaner
+        backtrace_cleaner.clean(@exception.backtrace, *args)
+      else
+        @exception.backtrace
+      end
+    end
+
+    def backtrace_cleaner
+      @backtrace_cleaner ||= @env['action_dispatch.backtrace_cleaner']
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 420cd99ca1..d5ed89ee9f 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -1,7 +1,6 @@
-require 'active_support/core_ext/exception'
 require 'action_controller/metal/exceptions'
-require 'active_support/notifications'
 require 'action_dispatch/http/request'
+require 'action_dispatch/middleware/exception_wrapper'
 require 'active_support/deprecation'
 
 module ActionDispatch
@@ -10,25 +9,6 @@ module ActionDispatch
   class ShowExceptions
     RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
 
-    cattr_accessor :rescue_responses
-    @@rescue_responses = Hash.new(:internal_server_error)
-    @@rescue_responses.merge!(
-      'ActionController::RoutingError'             => :not_found,
-      'AbstractController::ActionNotFound'         => :not_found,
-      'ActionController::MethodNotAllowed'         => :method_not_allowed,
-      'ActionController::NotImplemented'           => :not_implemented,
-      'ActionController::InvalidAuthenticityToken' => :unprocessable_entity
-    )
-
-    cattr_accessor :rescue_templates
-    @@rescue_templates = Hash.new('diagnostics')
-    @@rescue_templates.merge!(
-      'ActionView::MissingTemplate'         => 'missing_template',
-      'ActionController::RoutingError'      => 'routing_error',
-      'AbstractController::ActionNotFound'  => 'unknown_action',
-      'ActionView::Template::Error'         => 'template_error'
-    )
-
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
       ["<html><body><h1>500 Internal Server Error</h1>" <<
        "If you are the administrator of this website, then please read this web " <<
@@ -59,13 +39,13 @@ module ActionDispatch
 
     private
       def render_exception(env, exception)
-        log_error(env, exception)
-        exception = original_exception(exception)
+        wrapper = ExceptionWrapper.new(env, exception)
+        log_error(env, wrapper)
 
         if env['action_dispatch.show_detailed_exceptions'] == true
-          rescue_action_diagnostics(env, exception)
+          rescue_action_diagnostics(wrapper)
         else
-          rescue_action_error_page(exception)
+          rescue_action_error_page(wrapper)
         end
       rescue Exception => failsafe_error
         $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
@@ -74,17 +54,17 @@ module ActionDispatch
 
       # Render detailed diagnostics for unhandled exceptions rescued from
       # a controller action.
-      def rescue_action_diagnostics(env, exception)
+      def rescue_action_diagnostics(wrapper)
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          :request => Request.new(env),
-          :exception => exception,
-          :application_trace => application_trace(env, exception),
-          :framework_trace => framework_trace(env, exception),
-          :full_trace => full_trace(env, exception)
+          :request => Request.new(wrapper.env),
+          :exception => wrapper.exception,
+          :application_trace => wrapper.application_trace,
+          :framework_trace => wrapper.framework_trace,
+          :full_trace => wrapper.full_trace
         )
-        file = "rescues/#{@@rescue_templates[exception.class.name]}"
+        file = "rescues/#{wrapper.rescue_template}"
         body = template.render(:template => file, :layout => 'rescues/layout')
-        render(status_code(exception), body)
+        render(wrapper.status_code, body)
       end
 
       # Attempts to render a static error page based on the
@@ -94,8 +74,8 @@ module ActionDispatch
       # it will first attempt to render the file at <tt>public/500.da.html</tt>
       # then attempt to render <tt>public/500.html</tt>. If none of them exist,
       # the body of the response will be left empty.
-      def rescue_action_error_page(exception)
-        status = status_code(exception)
+      def rescue_action_error_page(wrapper)
+        status = wrapper.status_code
         locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
         path = "#{public_path}/#{status}.html"
 
@@ -108,10 +88,6 @@ module ActionDispatch
         end
       end
 
-      def status_code(exception)
-        Rack::Utils.status_code(@@rescue_responses[exception.class.name])
-      end
-
       def render(status, body)
         [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
       end
@@ -120,53 +96,26 @@ module ActionDispatch
         defined?(Rails.public_path) ? Rails.public_path : 'public_path'
       end
 
-      def log_error(env, exception)
-        return unless logger(env)
+      def log_error(env, wrapper)
+        logger = logger(env)
+        return unless logger
+
+        exception = wrapper.exception
 
         ActiveSupport::Deprecation.silence do
           message = "\n#{exception.class} (#{exception.message}):\n"
           message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
-          message << "  " << application_trace(env, exception).join("\n  ")
-          logger(env).fatal("#{message}\n\n")
+          message << "  " << wrapper.application_trace.join("\n  ")
+          logger.fatal("#{message}\n\n")
         end
       end
 
-      def application_trace(env, exception)
-        clean_backtrace(env, exception, :silent)
-      end
-
-      def framework_trace(env, exception)
-        clean_backtrace(env, exception, :noise)
-      end
-
-      def full_trace(env, exception)
-        clean_backtrace(env, exception, :all)
-      end
-
-      def clean_backtrace(env, exception, *args)
-        env['action_dispatch.backtrace_cleaner'] ?
-          env['action_dispatch.backtrace_cleaner'].clean(exception.backtrace, *args) :
-          exception.backtrace
-      end
-
       def logger(env)
         env['action_dispatch.logger'] || stderr_logger
       end
 
       def stderr_logger
-        Logger.new($stderr)
-      end
-
-    def original_exception(exception)
-      if registered_original_exception?(exception)
-        exception.original_exception
-      else
-        exception
+        @stderr_logger ||= Logger.new($stderr)
       end
-    end
-
-    def registered_original_exception?(exception)
-      exception.respond_to?(:original_exception) && @@rescue_responses.has_key?(exception.original_exception.class.name)
-    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 36a31be0c2..2ba3198ebd 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -22,8 +22,8 @@ module ActionDispatch
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
 
-      ActionDispatch::ShowExceptions.rescue_responses.merge!(config.action_dispatch.rescue_responses)
-      ActionDispatch::ShowExceptions.rescue_templates.merge!(config.action_dispatch.rescue_templates)
+      ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
+      ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)
 
       config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
       ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
-- 
cgit v1.2.3


From 956ecff8337908d7c3908977a5c8e12296a5b576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 20:16:12 +0100
Subject: Add a deprecation to old show exceptions API (even though it was not
 public).

---
 .../lib/action_dispatch/middleware/show_exceptions.rb      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index d5ed89ee9f..aa7a5e4d64 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -15,6 +15,20 @@ module ActionDispatch
        "application's log file and/or the web server's log file to find out what " <<
        "went wrong.</body></html>"]]
 
+    class << self
+      def rescue_responses
+        ActiveSupport::Deprecation.warn "ActionDispatch::ShowExceptions.rescue_responses is deprecated. " \
+          "Please configure your exceptions using a railtie or in your application config instead."
+        ExceptionWrapper.rescue_responses
+      end
+
+      def rescue_templates
+        ActiveSupport::Deprecation.warn "ActionDispatch::ShowExceptions.rescue_templates is deprecated. " \
+          "Please configure your exceptions using a railtie or in your application config instead."
+        ExceptionWrapper.rescue_templates
+      end
+    end
+
     def initialize(app, consider_all_requests_local = nil)
       ActiveSupport::Deprecation.warn "Passing consider_all_requests_local option to ActionDispatch::ShowExceptions middleware no longer works" unless consider_all_requests_local.nil?
       @app = app
-- 
cgit v1.2.3


From 83d29a283ceb13ff431da535e8cc35db6828016c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 1 Dec 2011 20:45:47 +0100
Subject: Revert "Added ActiveRecord::Base#last_modified to work with the new
 fresh_when/stale? conditional get methods from Action Pack"

Needless indirection with no added value.

This reverts commit 535853e83b9092078035a5abb2aa242fba815c05.
---
 actionpack/lib/action_controller/metal/conditional_get.rb | 4 ++--
 actionpack/test/controller/render_test.rb                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index a6747fca7c..1645400693 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -23,7 +23,7 @@ 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 last_modified and the etag by passing the object itself. Example:
+    # 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])
@@ -42,7 +42,7 @@ module ActionController
         options.assert_valid_keys(:etag, :last_modified, :public)
       else
         record  = record_or_options
-        options = { :etag => record, :last_modified => record.try(:last_modified) }.merge(additional_options)
+        options = { :etag => record, :last_modified => record.try(:updated_at) }.merge(additional_options)
       end
 
       response.etag          = options[:etag]          if options[:etag]
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index e014d08ec9..243bad8749 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -51,7 +51,7 @@ class TestController < ActionController::Base
   end
 
   def conditional_hello_with_record
-    record = Struct.new(:last_modified, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
     
     if stale?(record)
       render :action => 'hello_world'
@@ -65,7 +65,7 @@ class TestController < ActionController::Base
   end
 
   def conditional_hello_with_public_header_with_record
-    record = Struct.new(:last_modified, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
+    record = Struct.new(:updated_at, :cache_key).new(Time.now.utc.beginning_of_day, "foo/123")
 
     if stale?(record, :public => true)
       render :action => 'hello_world'
-- 
cgit v1.2.3


From 750bb5c865ac9234da91ec451eec7d9de55b8f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 20:46:18 +0100
Subject: Split ShowExceptions responsibilities in two middlewares.

---
 actionpack/lib/action_dispatch.rb                  |   1 +
 .../action_dispatch/middleware/debug_exceptions.rb |  77 +++++++++++++++
 .../middleware/exception_wrapper.rb                |   1 +
 .../action_dispatch/middleware/show_exceptions.rb  | 110 ++++++---------------
 actionpack/test/abstract_unit.rb                   |  22 +++--
 actionpack/test/controller/show_exceptions_test.rb |   1 +
 actionpack/test/dispatch/show_exceptions_test.rb   |   4 +-
 7 files changed, 123 insertions(+), 93 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/debug_exceptions.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 1f403b5e1a..89f515ee3d 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -51,6 +51,7 @@ module ActionDispatch
     autoload :BestStandardsSupport
     autoload :Callbacks
     autoload :Cookies
+    autoload :DebugExceptions
     autoload :ExceptionWrapper
     autoload :Flash
     autoload :Head
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
new file mode 100644
index 0000000000..5da21ddd3d
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -0,0 +1,77 @@
+require 'action_dispatch/http/request'
+require 'action_dispatch/middleware/exception_wrapper'
+
+module ActionDispatch
+  # This middleware is responsible for logging exceptions and
+  # showing a debugging page in case the request is local.
+  class DebugExceptions
+    RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      begin
+        response = @app.call(env)
+
+        if response[1]['X-Cascade'] == 'pass'
+          raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
+        end
+      rescue Exception => exception
+        raise exception if env['action_dispatch.show_exceptions'] == false
+      end
+
+      response ? response : render_exception(env, exception)
+    end
+
+    private
+
+    def render_exception(env, exception)
+      wrapper = ExceptionWrapper.new(env, exception)
+      log_error(env, wrapper)
+
+      if env['action_dispatch.show_detailed_exceptions']
+        template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
+          :request => Request.new(env),
+          :exception => wrapper.exception,
+          :application_trace => wrapper.application_trace,
+          :framework_trace => wrapper.framework_trace,
+          :full_trace => wrapper.full_trace
+        )
+
+        file = "rescues/#{wrapper.rescue_template}"
+        body = template.render(:template => file, :layout => 'rescues/layout')
+        render(wrapper.status_code, body)
+      else
+        raise exception
+      end
+    end
+
+    def render(status, body)
+      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    end
+
+    def log_error(env, wrapper)
+      logger = logger(env)
+      return unless logger
+
+      exception = wrapper.exception
+
+      ActiveSupport::Deprecation.silence do
+        message = "\n#{exception.class} (#{exception.message}):\n"
+        message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
+        message << "  " << wrapper.application_trace.join("\n  ")
+        logger.fatal("#{message}\n\n")
+      end
+    end
+
+    def logger(env)
+      env['action_dispatch.logger'] || stderr_logger
+    end
+
+    def stderr_logger
+      @stderr_logger ||= Logger.new($stderr)
+    end
+  end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index 96598b529d..c0532c80c4 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -1,3 +1,4 @@
+require 'action_controller/metal/exceptions'
 require 'active_support/core_ext/exception'
 
 module ActionDispatch
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index aa7a5e4d64..346770acb7 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -1,4 +1,3 @@
-require 'action_controller/metal/exceptions'
 require 'action_dispatch/http/request'
 require 'action_dispatch/middleware/exception_wrapper'
 require 'active_support/deprecation'
@@ -36,100 +35,47 @@ module ActionDispatch
 
     def call(env)
       begin
-        status, headers, body = @app.call(env)
-        exception = nil
-
-        # Only this middleware cares about RoutingError. So, let's just raise
-        # it here.
-        if headers['X-Cascade'] == 'pass'
-           raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
-        end
+        response  = @app.call(env)
       rescue Exception => exception
         raise exception if env['action_dispatch.show_exceptions'] == false
       end
 
-      exception ? render_exception(env, exception) : [status, headers, body]
+      response ? response : render_exception(env, exception)
     end
 
     private
-      def render_exception(env, exception)
-        wrapper = ExceptionWrapper.new(env, exception)
-        log_error(env, wrapper)
 
-        if env['action_dispatch.show_detailed_exceptions'] == true
-          rescue_action_diagnostics(wrapper)
-        else
-          rescue_action_error_page(wrapper)
-        end
-      rescue Exception => failsafe_error
-        $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
-        FAILSAFE_RESPONSE
-      end
+    def render_exception(env, exception)
+      wrapper = ExceptionWrapper.new(env, exception)
 
-      # Render detailed diagnostics for unhandled exceptions rescued from
-      # a controller action.
-      def rescue_action_diagnostics(wrapper)
-        template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
-          :request => Request.new(wrapper.env),
-          :exception => wrapper.exception,
-          :application_trace => wrapper.application_trace,
-          :framework_trace => wrapper.framework_trace,
-          :full_trace => wrapper.full_trace
-        )
-        file = "rescues/#{wrapper.rescue_template}"
-        body = template.render(:template => file, :layout => 'rescues/layout')
-        render(wrapper.status_code, body)
-      end
+      status      = wrapper.status_code
+      locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
+      path        = "#{public_path}/#{status}.html"
 
-      # Attempts to render a static error page based on the
-      # <tt>status_code</tt> thrown, or just return headers if no such file
-      # exists. At first, it will try to render a localized static page.
-      # For example, if a 500 error is being handled Rails and locale is :da,
-      # it will first attempt to render the file at <tt>public/500.da.html</tt>
-      # then attempt to render <tt>public/500.html</tt>. If none of them exist,
-      # the body of the response will be left empty.
-      def rescue_action_error_page(wrapper)
-        status = wrapper.status_code
-        locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
-        path = "#{public_path}/#{status}.html"
-
-        if locale_path && File.exist?(locale_path)
-          render(status, File.read(locale_path))
-        elsif File.exist?(path)
-          render(status, File.read(path))
-        else
-          render(status, '')
-        end
+      if locale_path && File.exist?(locale_path)
+        render(status, File.read(locale_path))
+      elsif File.exist?(path)
+        render(status, File.read(path))
+      else
+        render(status, '')
       end
+    rescue Exception => failsafe_error
+      render_failsafe(failsafe_error)
+    end
 
-      def render(status, body)
-        [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
-      end
-
-      def public_path
-        defined?(Rails.public_path) ? Rails.public_path : 'public_path'
-      end
-
-      def log_error(env, wrapper)
-        logger = logger(env)
-        return unless logger
-
-        exception = wrapper.exception
-
-        ActiveSupport::Deprecation.silence do
-          message = "\n#{exception.class} (#{exception.message}):\n"
-          message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
-          message << "  " << wrapper.application_trace.join("\n  ")
-          logger.fatal("#{message}\n\n")
-        end
-      end
+    def render_failsafe(failsafe_error)
+      $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
+      FAILSAFE_RESPONSE
+    end
 
-      def logger(env)
-        env['action_dispatch.logger'] || stderr_logger
-      end
+    def render(status, body)
+      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    end
 
-      def stderr_logger
-        @stderr_logger ||= Logger.new($stderr)
-      end
+    # TODO: Make this a middleware initialization parameter once
+    # we deprecated the second option
+    def public_path
+      defined?(Rails.public_path) ? Rails.public_path : 'public_path'
+    end
   end
 end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index d191a203dd..c95b8221a1 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -175,6 +175,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
       middleware.use "ActionDispatch::ShowExceptions"
+      middleware.use "ActionDispatch::DebugExceptions"
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
       middleware.use "ActionDispatch::Cookies"
@@ -338,16 +339,19 @@ end
 module ActionDispatch
   class ShowExceptions
     private
-      remove_method :public_path
-      def public_path
-        "#{FIXTURE_LOAD_PATH}/public"
-      end
+    remove_method :public_path
+    def public_path
+      "#{FIXTURE_LOAD_PATH}/public"
+    end
+  end
 
-      remove_method :stderr_logger
-      # Silence logger
-      def stderr_logger
-        nil
-      end
+  class DebugExceptions
+    private
+    remove_method :stderr_logger
+    # Silence logger
+    def stderr_logger
+      nil
+    end
   end
 end
 
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 74067cb895..5eff1eb09d 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -3,6 +3,7 @@ require 'abstract_unit'
 module ShowExceptions
   class ShowExceptionsController < ActionController::Base
     use ActionDispatch::ShowExceptions
+    use ActionDispatch::DebugExceptions
 
     def boom
       raise 'boom!'
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 90f13a3bb9..4f1140b5d3 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -29,8 +29,8 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new(false))
-  DevelopmentApp = ActionDispatch::ShowExceptions.new(Boomer.new(true))
+  ProductionApp  = ActionDispatch::ShowExceptions.new(ActionDispatch::DebugExceptions.new(Boomer.new(false)))
+  DevelopmentApp = ActionDispatch::ShowExceptions.new(ActionDispatch::DebugExceptions.new(Boomer.new(true)))
 
   test "rescue with error page when show_exceptions is false" do
     @app = ProductionApp
-- 
cgit v1.2.3


From f9edc079e030a5d2b0f21b80d6382caf10751057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 21:15:42 +0100
Subject: Split and improve show and debug exceptions middlewares.

---
 .../action_dispatch/middleware/show_exceptions.rb  |  22 ++--
 actionpack/test/dispatch/debug_exceptions_test.rb  | 116 +++++++++++++++++++++
 actionpack/test/dispatch/show_exceptions_test.rb   |  90 +++-------------
 3 files changed, 141 insertions(+), 87 deletions(-)
 create mode 100644 actionpack/test/dispatch/debug_exceptions_test.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 346770acb7..c801bcf2ef 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -3,8 +3,8 @@ require 'action_dispatch/middleware/exception_wrapper'
 require 'active_support/deprecation'
 
 module ActionDispatch
-  # This middleware rescues any exception returned by the application and renders
-  # nice exception pages if it's being rescued locally.
+  # This middleware rescues any exception returned by the application
+  # and wraps them in a format for the end user.
   class ShowExceptions
     RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
 
@@ -40,11 +40,18 @@ module ActionDispatch
         raise exception if env['action_dispatch.show_exceptions'] == false
       end
 
-      response ? response : render_exception(env, exception)
+      response ? response : render_exception_with_failsafe(env, exception)
     end
 
     private
 
+    def render_exception_with_failsafe(env, exception)
+      render_exception(env, exception)
+    rescue Exception => failsafe_error
+      $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
+      FAILSAFE_RESPONSE
+    end
+
     def render_exception(env, exception)
       wrapper = ExceptionWrapper.new(env, exception)
 
@@ -59,13 +66,6 @@ module ActionDispatch
       else
         render(status, '')
       end
-    rescue Exception => failsafe_error
-      render_failsafe(failsafe_error)
-    end
-
-    def render_failsafe(failsafe_error)
-      $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
-      FAILSAFE_RESPONSE
     end
 
     def render(status, body)
@@ -73,7 +73,7 @@ module ActionDispatch
     end
 
     # TODO: Make this a middleware initialization parameter once
-    # we deprecated the second option
+    # we removed the second option (which is deprecated)
     def public_path
       defined?(Rails.public_path) ? Rails.public_path : 'public_path'
     end
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
new file mode 100644
index 0000000000..e6c0a06878
--- /dev/null
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -0,0 +1,116 @@
+require 'abstract_unit'
+
+class DebugExceptionsTest < ActionDispatch::IntegrationTest
+
+  class Boomer
+    def initialize(detailed  = false)
+      @detailed = detailed
+    end
+
+    def call(env)
+      env['action_dispatch.show_detailed_exceptions'] = @detailed
+      req = ActionDispatch::Request.new(env)
+      case req.path
+      when "/not_found"
+        raise ActionController::UnknownAction
+      when "/runtime_error"
+        raise RuntimeError
+      when "/method_not_allowed"
+        raise ActionController::MethodNotAllowed
+      when "/not_implemented"
+        raise ActionController::NotImplemented
+      when "/unprocessable_entity"
+        raise ActionController::InvalidAuthenticityToken
+      when "/not_found_original_exception"
+        raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
+      else
+        raise "puke!"
+      end
+    end
+  end
+
+  ProductionApp  = ActionDispatch::DebugExceptions.new((Boomer.new(false)))
+  DevelopmentApp = ActionDispatch::DebugExceptions.new((Boomer.new(true)))
+
+  test 'skip diagnosis if not showing detailed exceptions' do
+    @app = ProductionApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => true}
+    end
+  end
+
+  test 'skip diagnosis if not showing exceptions' do
+    @app = DevelopmentApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => false}
+    end
+  end
+
+  test "rescue with diagnostics message" do
+    @app = DevelopmentApp
+
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 500
+    assert_match(/puke/, body)
+
+    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_match(/#{ActionController::UnknownAction.name}/, body)
+
+    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 405
+    assert_match(/ActionController::MethodNotAllowed/, body)
+  end
+
+  test "does not show filtered parameters" do
+    @app = DevelopmentApp
+
+    get "/", {"foo"=>"bar"}, {'action_dispatch.show_exceptions' => true,
+      'action_dispatch.parameter_filter' => [:foo]}
+    assert_response 500
+    assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
+  end
+
+  test "show registered original exception for wrapped exceptions" do
+    @app = DevelopmentApp
+
+    get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_match(/AbstractController::ActionNotFound/, body)
+  end
+
+  test "show the controller name in the diagnostics template when controller name is present" do
+    @app = DevelopmentApp
+    get("/runtime_error", {}, {
+      'action_dispatch.show_exceptions' => true,
+      'action_dispatch.request.parameters' => {
+        'action' => 'show',
+        'id' => 'unknown',
+        'controller' => 'featured_tile'
+      }
+    })
+    assert_response 500
+    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
+  end
+
+  test "sets the HTTP charset parameter" do
+    @app = DevelopmentApp
+
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
+  end
+
+  test 'uses logger from env' do
+    @app = DevelopmentApp
+    output = StringIO.new
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+    assert_match(/puke/, output.rewind && output.read)
+  end
+
+  test 'uses backtrace cleaner from env' do
+    @app = DevelopmentApp
+    cleaner = stub(:clean => ['passed backtrace cleaner'])
+    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
+    assert_match(/passed backtrace cleaner/, body)
+  end
+end
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 4f1140b5d3..a34f6f1888 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -13,14 +13,8 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
       case req.path
       when "/not_found"
         raise ActionController::UnknownAction
-      when "/runtime_error"
-        raise RuntimeError
       when "/method_not_allowed"
         raise ActionController::MethodNotAllowed
-      when "/not_implemented"
-        raise ActionController::NotImplemented
-      when "/unprocessable_entity"
-        raise ActionController::InvalidAuthenticityToken
       when "/not_found_original_exception"
         raise ActionView::Template::Error.new('template', {}, AbstractController::ActionNotFound.new)
       else
@@ -29,10 +23,16 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  ProductionApp  = ActionDispatch::ShowExceptions.new(ActionDispatch::DebugExceptions.new(Boomer.new(false)))
-  DevelopmentApp = ActionDispatch::ShowExceptions.new(ActionDispatch::DebugExceptions.new(Boomer.new(true)))
+  ProductionApp = ActionDispatch::ShowExceptions.new((Boomer.new(false)))
 
-  test "rescue with error page when show_exceptions is false" do
+  test 'skip diagnosis if not showing exceptions' do
+    @app = ProductionApp
+    assert_raise RuntimeError do
+      get "/", {}, {'action_dispatch.show_exceptions' => false}
+    end
+  end
+
+  test "rescue with error page" do
     @app = ProductionApp
 
     get "/", {}, {'action_dispatch.show_exceptions' => true}
@@ -48,24 +48,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_equal "", body
   end
 
-  test "rescue with diagnostics message when show_exceptions is true" do
-    @app = DevelopmentApp
-
-    get "/", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 500
-    assert_match(/puke/, body)
-
-    get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 404
-    assert_match(/#{ActionController::UnknownAction.name}/, body)
-
-    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 405
-    assert_match(/ActionController::MethodNotAllowed/, body)
-  end
-
   test "localize rescue error page" do
-    # Change locale
     old_locale, I18n.locale = I18n.locale, :da
 
     begin
@@ -83,63 +66,18 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "does not show filtered parameters" do
-    @app = DevelopmentApp
-
-    get "/", {"foo"=>"bar"}, {'action_dispatch.show_exceptions' => true,
-      'action_dispatch.parameter_filter' => [:foo]}
-    assert_response 500
-    assert_match("&quot;foo&quot;=&gt;&quot;[FILTERED]&quot;", body)
-  end
-
-  test "show registered original exception for wrapped exceptions when show_exceptions is false" do
-    @app = ProductionApp
-
-    get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 404
-    assert_match(/404 error/, body)
-  end
-
-  test "show registered original exception for wrapped exceptions when show_exceptions is true" do
-    @app = DevelopmentApp
-
-    get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 404
-    assert_match(/AbstractController::ActionNotFound/, body)
-  end
-
-  test "show the controller name in the diagnostics template when controller name is present" do
-    @app = DevelopmentApp
-    get("/runtime_error", {}, {
-      'action_dispatch.show_exceptions' => true,
-      'action_dispatch.request.parameters' => {
-        'action' => 'show',
-        'id' => 'unknown',
-        'controller' => 'featured_tile'
-      }
-    })
-    assert_response 500
-    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
-  end
-
   test "sets the HTTP charset parameter" do
-    @app = DevelopmentApp
+    @app = ProductionApp
 
     get "/", {}, {'action_dispatch.show_exceptions' => true}
     assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
   end
 
-  test 'uses logger from env' do
+  test "show registered original exception for wrapped exceptions" do
     @app = ProductionApp
-    output = StringIO.new
-    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
-    assert_match(/puke/, output.rewind && output.read)
-  end
 
-  test 'uses backtrace cleaner from env' do
-    @app = DevelopmentApp
-    cleaner = stub(:clean => ['passed backtrace cleaner'])
-    get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
-    assert_match(/passed backtrace cleaner/, body)
+    get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_match(/404 error/, body)
   end
 end
-- 
cgit v1.2.3


From 6a4606d3a64e60189ea4ba5243830dcd97e6de14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 1 Dec 2011 21:17:11 +0100
Subject: Remove unnecessary test setup.

---
 actionpack/test/dispatch/show_exceptions_test.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index a34f6f1888..020cc80f3f 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -3,12 +3,7 @@ require 'abstract_unit'
 class ShowExceptionsTest < ActionDispatch::IntegrationTest
 
   class Boomer
-    def initialize(detailed  = false)
-      @detailed = detailed
-    end
-
     def call(env)
-      env['action_dispatch.show_detailed_exceptions'] = @detailed
       req = ActionDispatch::Request.new(env)
       case req.path
       when "/not_found"
@@ -23,7 +18,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  ProductionApp = ActionDispatch::ShowExceptions.new((Boomer.new(false)))
+  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new)
 
   test 'skip diagnosis if not showing exceptions' do
     @app = ProductionApp
-- 
cgit v1.2.3


From 76a3ec7f6e348681e4bafa8b02ca660ab450b0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 2 Dec 2011 09:57:43 +0100
Subject: Try to play nice with plugins doing monkey patches.

---
 actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index c801bcf2ef..9efe90a670 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -45,6 +45,11 @@ module ActionDispatch
 
     private
 
+    # Define this method because some plugins were monkey patching it.
+    # Remove this after 3.2 is out with the other deprecations in this class.
+    def status_code(*)
+    end
+
     def render_exception_with_failsafe(env, exception)
       render_exception(env, exception)
     rescue Exception => failsafe_error
-- 
cgit v1.2.3


From 2ab2077235308aaa82dc430f1da8d6519fb7dac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 3 Dec 2011 11:38:25 +0100
Subject: Fix failing cascade exception.

---
 actionpack/lib/action_dispatch/middleware/debug_exceptions.rb | 3 ++-
 actionpack/lib/action_dispatch/middleware/show_exceptions.rb  | 2 +-
 actionpack/test/dispatch/debug_exceptions_test.rb             | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 5da21ddd3d..417701ea54 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -15,6 +15,7 @@ module ActionDispatch
       begin
         response = @app.call(env)
 
+        # TODO: Maybe this should be in the router itself
         if response[1]['X-Cascade'] == 'pass'
           raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
         end
@@ -22,7 +23,7 @@ module ActionDispatch
         raise exception if env['action_dispatch.show_exceptions'] == false
       end
 
-      response ? response : render_exception(env, exception)
+      exception ? render_exception(env, exception) : response
     end
 
     private
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 9efe90a670..0c95248611 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -40,7 +40,7 @@ module ActionDispatch
         raise exception if env['action_dispatch.show_exceptions'] == false
       end
 
-      response ? response : render_exception_with_failsafe(env, exception)
+      response || render_exception_with_failsafe(env, exception)
     end
 
     private
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index e6c0a06878..f7411c7729 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -11,6 +11,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       env['action_dispatch.show_detailed_exceptions'] = @detailed
       req = ActionDispatch::Request.new(env)
       case req.path
+      when "/pass"
+        [404, { "X-Cascade" => "pass" }, []]
       when "/not_found"
         raise ActionController::UnknownAction
       when "/runtime_error"
@@ -46,6 +48,13 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test 'raise an exception on cascade pass' do
+    @app = ProductionApp
+    assert_raise ActionController::RoutingError do
+      get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+    end
+  end
+
   test "rescue with diagnostics message" do
     @app = DevelopmentApp
 
-- 
cgit v1.2.3


From e29773f885fd500189ffd964550ae20061d745ba Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sun, 4 Dec 2011 22:12:24 +0300
Subject: form_for with +:as+ option uses "action_as" as css class and id

---
 actionpack/CHANGELOG.md                           | 12 ++++++++++++
 actionpack/lib/action_view/helpers/form_helper.rb |  4 ++--
 actionpack/test/template/form_helper_test.rb      | 22 +++++++++++-----------
 3 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 0545d36a0a..ebb8277220 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,17 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   form_for with +:as+ option uses "#{action}_#{as}" as css class and id:
+
+    Before:
+
+        form_for(@user, :as => 'client') # => "<form class="client_new">..."
+
+    Now:
+
+        form_for(@user, :as => 'client') # => "<form class="new_client">..."
+
+    *Vasiliy Ermolovich*
+
 *   Allow rescue responses to be configured through a railtie as in `config.action_dispatch.rescue_responses`. Please look at ActiveRecord::Railtie for an example *José Valim*
 
 *   Allow fresh_when/stale? to take a record instead of an options hash *DHH*
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index e674e12509..1a64b12aa6 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -387,8 +387,8 @@ module ActionView
         as = options[:as]
         action, method = object.respond_to?(:persisted?) && object.persisted? ? [:edit, :put] : [:new, :post]
         options[:html].reverse_merge!(
-          :class  => as ? "#{as}_#{action}" : dom_class(object, action),
-          :id     => as ? "#{as}_#{action}" : [options[:namespace], dom_id(object, action)].compact.join("_").presence,
+          :class  => as ? "#{action}_#{as}" : dom_class(object, action),
+          :id     => as ? "#{action}_#{as}" : [options[:namespace], dom_id(object, action)].compact.join("_").presence,
           :method => method
         )
 
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 3fee366804..41e925b000 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -769,7 +769,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit('Create post')
     end
 
-    expected =  whole_form("/posts/123", "create-post", "other_name_edit", :method => "put") do
+    expected =  whole_form("/posts/123", "create-post", "edit_other_name", :method => "put") do
       "<label for='other_name_title' class='post_title'>Title</label>" +
       "<input name='other_name[title]' size='30' id='other_name_title' value='Hello World' type='text' />" +
       "<textarea name='other_name[body]' id='other_name_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
@@ -906,7 +906,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'put') do
       "<label for='post_123_title'>Title</label>" +
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
@@ -924,7 +924,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'put') do
       "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
@@ -1066,7 +1066,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit
     end
 
-    expected = whole_form('/posts/123', 'another_post_edit', 'another_post_edit', :method => 'put') do
+    expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', :method => 'put') do
       "<input name='commit' type='submit' value='Update your Post' />"
     end
 
@@ -1098,7 +1098,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'put') do
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<input name='post[123][comment][][name]' size='30' type='text' id='post_123_comment__name' value='new comment' />"
     end
@@ -1157,7 +1157,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'put') do
       "<input name='post[123][comment][title]' size='30' type='text' id='post_123_comment_title' value='Hello World' />"
     end
 
@@ -1185,7 +1185,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'put') do
       "<input name='post[123][comment][123][title]' size='30' type='text' id='post_123_comment_123_title' value='Hello World' />"
     end
 
@@ -1205,9 +1205,9 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'post[]_edit', 'post[]_edit', 'put') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'put') do
       "<input name='post[123][comment][5][title]' size='30' type='text' id='post_123_comment_5_title' value='Hello World' />"
-    end + whole_form('/posts/123', 'post_edit', 'post_edit', 'put') do
+    end + whole_form('/posts/123', 'edit_post', 'edit_post', 'put') do
       "<input name='post[1][comment][123][title]' size='30' type='text' id='post_1_comment_123_title' value='Hello World' />"
     end
 
@@ -1860,7 +1860,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'create-post', 'post_edit', :method => 'put') do
+    expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'put') do
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
@@ -1880,7 +1880,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'create-post', 'post_edit', :method => 'put') do
+    expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'put') do
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />"
-- 
cgit v1.2.3


From e31c4ace97638d186aae389dd2cbe3b5786beb57 Mon Sep 17 00:00:00 2001
From: Overbryd <l.rieder@gmail.com>
Date: Mon, 5 Dec 2011 11:14:21 +0100
Subject: Fix for redirect_to to respect urls with a network path reference
 like "//asset.host.com/resources/1235" see issue #3856

---
 actionpack/lib/action_controller/metal/redirecting.rb |  4 ++--
 actionpack/test/controller/redirect_test.rb           | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index 0355c9f458..7d14b175cc 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/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>) - Is passed straight through as the target for redirection.
+    # * <tt>String</tt> starting with <tt>protocol://</tt> (like <tt>http://</tt>) or a protocol relative reference (like <tt>//</tt>) - Is passed straight through as the target for redirection.
     # * <tt>String</tt> not containing a protocol - The current protocol and host is prepended to the string.
     # * <tt>Proc</tt> - A block that will be executed in the controller's context. Should return any option accepted by +redirect_to+.
     # * <tt>:back</tt> - Back to the page that issued the request. Useful for forms that are triggered from multiple places.
@@ -81,7 +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 (":").
-        when %r{^\w[\w+.-]*:.*}
+        when %r{^(\w[\w+.-]*:|\/\/).*}
           options
         when String
           request.protocol + request.host_with_port + options
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index 79041055bd..5b739e49ac 100644
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -70,6 +70,10 @@ class RedirectController < ActionController::Base
     redirect_to "x-test+scheme.complex:redirect"
   end
 
+  def redirect_to_url_with_network_path_reference
+    redirect_to "//www.rubyonrails.org/"
+  end
+
   def redirect_to_back
     redirect_to :back
   end
@@ -216,6 +220,12 @@ class RedirectTest < ActionController::TestCase
     assert_equal "x-test+scheme.complex:redirect", redirect_to_url
   end
 
+  def test_redirect_to_url_with_network_path_reference
+    get :redirect_to_url_with_network_path_reference
+    assert_response :redirect
+    assert_equal "//www.rubyonrails.org/", redirect_to_url
+  end
+
   def test_redirect_to_back
     @request.env["HTTP_REFERER"] = "http://www.example.com/coming/from"
     get :redirect_to_back
-- 
cgit v1.2.3


From 9fb5ee8beb2f19aa09ae388096e66b634297dc77 Mon Sep 17 00:00:00 2001
From: Overbryd <l.rieder@gmail.com>
Date: Mon, 5 Dec 2011 11:48:05 +0100
Subject: Minor enhancement by not unnecessarely escaping forward slashing
 within a curly regexp and by mentoining the protocol relative scheme in the
 internal comment

---
 actionpack/lib/action_controller/metal/redirecting.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/redirecting.rb b/actionpack/lib/action_controller/metal/redirecting.rb
index 7d14b175cc..b07742e0e1 100644
--- a/actionpack/lib/action_controller/metal/redirecting.rb
+++ b/actionpack/lib/action_controller/metal/redirecting.rb
@@ -81,7 +81,8 @@ module ActionController
         # The scheme name consist of a letter followed by any combination of
         # letters, digits, and the plus ("+"), period ("."), or hyphen ("-")
         # characters; and is terminated by a colon (":").
-        when %r{^(\w[\w+.-]*:|\/\/).*}
+        # The protocol relative scheme starts with a double slash "//"
+        when %r{^(\w[\w+.-]*:|//).*}
           options
         when String
           request.protocol + request.host_with_port + options
-- 
cgit v1.2.3


From 71d769e3b58cb56b4b1d5143936c65be8b27c490 Mon Sep 17 00:00:00 2001
From: Andy Jeffries <andy@andyjeffries.co.uk>
Date: Mon, 5 Dec 2011 15:41:38 +0000
Subject: Named Routes shouldn't override existing ones (currently route
 recognition goes with the earliest match, named routes use the latest match)

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 actionpack/test/controller/routing_test.rb          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 2bcde16110..c64214431a 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -356,7 +356,7 @@ module ActionDispatch
         conditions = build_conditions(conditions, valid_conditions, path.names.map { |x| x.to_sym })
 
         route = @set.add_route(app, path, conditions, defaults, name)
-        named_routes[name] = route if name
+        named_routes[name] = route if name && !named_routes[name]
         route
       end
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 4a67380f59..062fc1f94e 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -713,12 +713,12 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal set.routes.first, set.named_routes[:hello]
   end
 
-  def test_later_named_routes_take_precedence
+  def test_earlier_named_routes_take_precedence
     set.draw do
       match '/hello/world' => 'a#b', :as => 'hello'
       match '/hello'       => 'a#b', :as => 'hello'
     end
-    assert_equal set.routes.last, set.named_routes[:hello]
+    assert_equal set.routes.first, set.named_routes[:hello]
   end
 
   def setup_named_route_test
-- 
cgit v1.2.3


From 1f0e21ce3037b03a125229810d584db77c0c6ed4 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Mon, 5 Dec 2011 19:05:03 +0300
Subject: use classify in ParamsWrapper to derive model name from controller
 name

---
 .../lib/action_controller/metal/params_wrapper.rb  |  2 +-
 actionpack/test/controller/params_wrapper_test.rb  | 35 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index e0d8e1c992..9dcea86253 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -141,7 +141,7 @@ module ActionController
       # try to find Foo::Bar::User, Foo::User and finally User.
       def _default_wrap_model #:nodoc:
         return nil if self.anonymous?
-        model_name = self.name.sub(/Controller$/, '').singularize
+        model_name = self.name.sub(/Controller$/, '').classify
 
         begin
           if model_klass = model_name.safe_constantize
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 7bef1e8d5d..0102f66dfe 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -285,3 +285,38 @@ class AnonymousControllerParamsWrapperTest < ActionController::TestCase
     end
   end
 end
+
+class IrregularInflectionParamsWrapperTest < ActionController::TestCase
+  include ParamsWrapperTestHelp
+
+  class ParamswrappernewsItem
+    def self.attribute_names
+      ['test_attr']
+    end
+  end
+
+  class ParamswrappernewsController < ActionController::Base
+    class << self
+      attr_accessor :last_parameters
+    end
+
+    def parse
+      self.class.last_parameters = request.params.except(:controller, :action)
+      head :ok
+    end
+  end
+
+  tests ParamswrappernewsController
+
+  def test_uses_model_attribute_names_with_irregular_inflection
+    ActiveSupport::Inflector.inflections do |inflect|
+      inflect.irregular 'paramswrappernews_item', 'paramswrappernews'
+    end
+
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'test_attr' => 'test_value' }
+      assert_parameters({ 'username' => 'sikachu', 'test_attr' => 'test_value', 'paramswrappernews_item' => { 'test_attr' => 'test_value' }})
+    end
+  end
+end
-- 
cgit v1.2.3


From 1c65962b9da73d5ee231d38794166a94c80e4a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Mon, 5 Dec 2011 20:37:08 +0200
Subject: .rhtml and .rxml was removed in Rails 3.

---
 actionpack/lib/action_view/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 36c49d9c91..dedd8f9b76 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -9,8 +9,8 @@ require 'active_support/core_ext/module/deprecation'
 module ActionView #:nodoc:
   # = Action View Base
   #
-  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> (or <tt>.rhtml</tt>) extension then it uses a mixture of ERb
-  # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> (or <tt>.rxml</tt>) extension then Jim Weirich's Builder::XmlMarkup library is used.
+  # Action View templates can be written in several ways. If the template file has a <tt>.erb</tt> extension then it uses a mixture of ERb
+  # (included in Ruby) and HTML. If the template file has a <tt>.builder</tt> extension then Jim Weirich's Builder::XmlMarkup library is used.
   #
   # == ERB
   #
-- 
cgit v1.2.3


From d645aed91f488ed00bd4b143e04c5e9b30e00c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Mon, 5 Dec 2011 23:11:20 +0200
Subject: Use do end for multiline block.

---
 actionpack/lib/action_view/base.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index dedd8f9b76..66a5d59857 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -94,10 +94,10 @@ module ActionView #:nodoc:
   #
   # Any method with a block will be treated as an XML markup tag with nested markup in the block. For example, the following:
   #
-  #   xml.div {
+  #   xml.div do
   #     xml.h1(@person.name)
   #     xml.p(@person.bio)
-  #   }
+  #   end
   #
   # would produce something like:
   #
-- 
cgit v1.2.3


From 25007ad3fb3eac28a5f7ad3f6cd26eb33e14b4e0 Mon Sep 17 00:00:00 2001
From: Adrian Pike <adrian@pikeapps.com>
Date: Mon, 24 Oct 2011 15:57:14 -0700
Subject: Let's do the same trick for asset_path that we do for
 [image,javascript,stylesheet]_path to avoid namespace conflicts on named
 routes. Closes #3427

---
 actionpack/lib/sprockets/helpers/rails_helper.rb   | 17 ++++---
 .../template/sprockets_helper_with_routes_test.rb  | 57 ++++++++++++++++++++++
 2 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 actionpack/test/template/sprockets_helper_with_routes_test.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 1ebe7f68f7..75ba1e66c2 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -26,10 +26,10 @@ module Sprockets
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'js')
             asset.to_a.map { |dep|
-              super(dep.to_s, { :src => asset_path(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
+              super(dep.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
             }
           else
-            super(source.to_s, { :src => asset_path(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
+            super(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
           end
         end.join("\n").html_safe
       end
@@ -43,10 +43,10 @@ module Sprockets
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'css')
             asset.to_a.map { |dep|
-              super(dep.to_s, { :href => asset_path(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
+              super(dep.to_s, { :href => path_to_asset(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
             }
           else
-            super(source.to_s, { :href => asset_path(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
+            super(source.to_s, { :href => path_to_asset(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
           end
         end.join("\n").html_safe
       end
@@ -56,19 +56,20 @@ module Sprockets
         path = asset_paths.compute_public_path(source, asset_prefix, options.merge(:body => true))
         options[:body] ? "#{path}?body=1" : path
       end
-
+      alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
+      
       def image_path(source)
-        asset_path(source)
+        path_to_asset(source)
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
       def javascript_path(source)
-        asset_path(source)
+        path_to_asset(source)
       end
       alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with an javascript_path named route
 
       def stylesheet_path(source)
-        asset_path(source)
+        path_to_asset(source)
       end
       alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
 
diff --git a/actionpack/test/template/sprockets_helper_with_routes_test.rb b/actionpack/test/template/sprockets_helper_with_routes_test.rb
new file mode 100644
index 0000000000..bcbd81a7dd
--- /dev/null
+++ b/actionpack/test/template/sprockets_helper_with_routes_test.rb
@@ -0,0 +1,57 @@
+require 'abstract_unit'
+require 'sprockets'
+require 'sprockets/helpers/rails_helper'
+require 'mocha'
+
+class SprocketsHelperWithRoutesTest < ActionView::TestCase
+  include Sprockets::Helpers::RailsHelper
+
+  # Let's bring in some named routes to test namespace conflicts with potential *_paths.
+  # We have to do this after we bring in the Sprockets RailsHelper so if there are conflicts,
+  # they'll fail in the way we expect in a real live Rails app.
+  routes = ActionDispatch::Routing::RouteSet.new
+  routes.draw do
+    resources :assets
+  end
+  include routes.url_helpers
+
+  def setup
+    super
+    @controller         = BasicController.new
+
+    @assets = Sprockets::Environment.new
+    @assets.append_path(FIXTURES.join("sprockets/app/javascripts"))
+    @assets.append_path(FIXTURES.join("sprockets/app/stylesheets"))
+    @assets.append_path(FIXTURES.join("sprockets/app/images"))
+
+    application = Struct.new(:config, :assets).new(config, @assets)
+    Rails.stubs(:application).returns(application)
+    @config = config
+    @config.perform_caching = true
+    @config.assets.digest = true
+    @config.assets.compile = true
+  end
+
+  test "namespace conflicts on a named route called asset_path" do
+    # Testing this for sanity - asset_path is now a named route!
+    assert_match asset_path('test_asset'), '/assets/test_asset'
+
+    assert_match %r{/assets/logo-[0-9a-f]+.png},
+      path_to_asset("logo.png")
+    assert_match %r{/assets/logo-[0-9a-f]+.png},
+      path_to_asset("logo.png", :digest => true)
+    assert_match %r{/assets/logo.png},
+      path_to_asset("logo.png", :digest => false)
+  end
+
+  test "javascript_include_tag with a named_route named asset_path" do
+    assert_match %r{<script src="/assets/application-[0-9a-f]+.js" type="text/javascript"></script>},
+      javascript_include_tag(:application)
+  end
+
+  test "stylesheet_link_tag with a named_route named asset_path" do
+    assert_match %r{<link href="/assets/application-[0-9a-f]+.css" media="screen" rel="stylesheet" type="text/css" />},
+      stylesheet_link_tag(:application)
+  end
+
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 0da31a1839d03e597f8ce0ae853b3a75519f325a Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <tvd@magiclabs.de>
Date: Tue, 6 Dec 2011 13:05:15 +0100
Subject: Allowing string as url argument for expire_action

---
 actionpack/lib/action_controller/caching/actions.rb |  5 ++---
 actionpack/test/controller/caching_test.rb          | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index f988de39dd..3b86a9a93a 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -116,9 +116,8 @@ module ActionController #:nodoc:
       def expire_action(options = {})
         return unless cache_configured?
 
-        actions = options[:action]
-        if actions.is_a?(Array)
-          actions.each {|action| expire_action(options.merge(:action => action)) }
+        if options.is_a?(Hash) && options[:action].is_a?(Array)
+          options[:action].each {|action| expire_action(options.merge(:action => action)) }
         else
           expire_fragment(ActionCachePath.new(self, options, false).path)
         end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 2364bbf3a3..015e6b9955 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -251,6 +251,11 @@ class ActionCachingTestController < CachingController
     expire_action :controller => 'action_caching_test', :action => 'index', :format => 'xml'
     render :nothing => true
   end
+
+  def expire_with_url_string
+    expire_action url_for(:controller => 'action_caching_test', :action => 'index')
+    render :nothing => true
+  end
 end
 
 class MockTime < Time
@@ -445,6 +450,21 @@ class ActionCacheTest < ActionController::TestCase
     assert_not_equal cached_time, @response.body
   end
 
+  def test_cache_expiration_with_url_string
+    get :index
+    cached_time = content_to_cache
+    reset!
+
+    @request.request_uri = "/action_caching_test/expire_with_url_string"
+    get :expire_with_url_string
+    assert_response :success
+    reset!
+
+    get :index
+    assert_response :success
+    assert_not_equal cached_time, @response.body
+  end
+
   def test_cache_is_scoped_by_subdomain
     @request.host = 'jamis.hostname.com'
     get :index
-- 
cgit v1.2.3


From 9be2353fac89729b839df3d0538b607f3fc1aa87 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 6 Dec 2011 11:28:05 -0200
Subject: Sync AP CHANGELOG with 3-1-stable

---
 actionpack/CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index ebb8277220..6d62d5eeec 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -96,6 +96,14 @@
     persistent between requests so if you need to manipulate the environment
     for your test you need to do it before the cookie jar is created.
 
+## Rails 3.1.4 (unreleased) ##
+
+*   Allow to use asset_path on named_routes aliasing RailsHelper's
+    asset_path to path_to_asset *Adrian Pike*
+
+*   Assets should use the request protocol by default or default to
+    relative if no request is available *Jonathan del Strother*
+
 ## Rails 3.1.3 (unreleased) ##
 
 *   Fix using `tranlate` helper with a html translation which uses the `:count` option for
-- 
cgit v1.2.3


From 0460b3a46920ccf7d70d6699a3da06ca9663c1f6 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Fri, 2 Dec 2011 13:13:36 -0500
Subject: Fix bug in assert_template when using only `:layout` option

Currently if you're do this:

    assert_template :layout => "foo"

Regardless of what layout you were using, the test will always pass. This was broken since the introduction of :layout option in [d9375f3f].

We have a lot of test cases in actionpack/test/controller/layout_test.rb that use this feature. This will make sure that those test cases are not true negative.
---
 actionpack/lib/action_controller/test_case.rb      | 28 ++++++++++++----------
 .../test/controller/action_pack_assertions_test.rb | 16 +++++++++++++
 actionpack/test/controller/layout_test.rb          |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 6913c1ef4a..1731388bf3 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -86,6 +86,21 @@ module ActionController
           end
         end
       when Hash
+        if expected_layout = options[:layout]
+          msg = build_message(message,
+                  "expecting layout <?> but action rendered <?>",
+                  expected_layout, @layouts.keys)
+
+          case expected_layout
+          when String
+            assert(@layouts.keys.include?(expected_layout), msg)
+          when Regexp
+            assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
+          when nil
+            assert(@layouts.empty?, msg)
+          end
+        end
+
         if expected_partial = options[:partial]
           if expected_locals = options[:locals]
             actual_locals = @locals[expected_partial.to_s.sub(/^_/,'')]
@@ -98,19 +113,6 @@ 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 <?>",
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index a714e8bbcc..b414327d08 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -71,6 +71,10 @@ class ActionPackAssertionsController < ActionController::Base
     render :text => "Hello!", :content_type => Mime::RSS
   end
 
+  def render_with_layout
+    render "test/hello_world", :layout => "layouts/standard"
+  end
+
   def session_stuffing
     session['xmas'] = 'turkey'
     render :text => "ho ho ho"
@@ -471,6 +475,18 @@ class AssertTemplateTest < ActionController::TestCase
     end
   end
 
+  def test_fails_with_wrong_layout
+    get :render_with_layout
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template :layout => "application"
+    end
+  end
+
+  def test_passes_with_correct_layout
+    get :render_with_layout
+    assert_template :layout => "layouts/standard"
+  end
+
   def test_assert_template_reset_between_requests
     get :hello_world
     assert_template 'test/hello_world'
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 25299eb8b8..bc171e201b 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -167,7 +167,7 @@ class LayoutSetInResponseTest < ActionController::TestCase
   def test_layout_is_picked_from_the_controller_instances_view_path
     @controller = PrependsViewPathController.new
     get :hello
-    assert_template :layout => /layouts\/alt\.\w+/
+    assert_template :layout => /layouts\/alt/
   end
 
   def test_absolute_pathed_layout
-- 
cgit v1.2.3


From 18ceed201b37d91ad6598d0f8b3c010e6cc48b15 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Tue, 6 Dec 2011 21:05:56 -0500
Subject: Allow layout fallback when using `layout` method

Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail.

For example, consider this snippet:

    class CarsController
      layout 'single_car', :only => :show
    end

Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
---
 actionpack/CHANGELOG.md                       | 10 +++++
 actionpack/lib/abstract_controller/layouts.rb | 59 +++++++++++++++------------
 actionpack/test/abstract/layouts_test.rb      | 50 ++++++++++++++++++++++-
 3 files changed, 93 insertions(+), 26 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 6d62d5eeec..8844d6e6f6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. *Prem Sichanugrist*
+
+    For example, consider this snippet:
+
+        class CarsController
+          layout 'single_car', :only => :show
+        end
+
+    Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
+
 *   form_for with +:as+ option uses "#{action}_#{as}" as css class and id:
 
     Before:
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index bbf5efe565..79edd5418e 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -244,42 +244,51 @@ module AbstractController
       def _write_layout_method
         remove_possible_method(:_layout)
 
-        case defined?(@_layout) ? @_layout : nil
-        when String
-          self.class_eval %{def _layout; #{@_layout.inspect} end}, __FILE__, __LINE__
-        when Symbol
-          self.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-            def _layout
+        prefixes = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
+        layout_definition = case defined?(@_layout) ? @_layout : nil
+          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
               end
-            end
-          ruby_eval
-        when Proc
-          define_method :_layout_from_proc, &@_layout
-          self.class_eval %{def _layout; _layout_from_proc(self) end}, __FILE__, __LINE__
-        when false
-          self.class_eval %{def _layout; end}, __FILE__, __LINE__
-        when true
-          raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
-        when nil
-          if name
-            _prefixes = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
-
-            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def _layout
-                if template_exists?("#{_implied_layout_name}", #{_prefixes.inspect})
+            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
+            if name
+              <<-RUBY
+                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 action_has_layout?
+              #{layout_definition}
+            elsif self.class.name
+              if template_exists?("#{_implied_layout_name}", #{prefixes.inspect})
+                  "#{_implied_layout_name}"
+              else
+                super
               end
-            RUBY
+            end
           end
-        end
+        RUBY
         self.class_eval { private :_layout }
       end
     end
@@ -337,7 +346,7 @@ module AbstractController
     # * <tt>template</tt> - The template object for the default layout (or nil)
     def _default_layout(require_layout = false)
       begin
-        layout_name = _layout if action_has_layout?
+        layout_name = _layout
       rescue NameError => e
         raise e, "Could not render layout: #{e.message}"
       end
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 86208899f8..a5382a730d 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -141,6 +141,30 @@ module AbstractControllerTests
       end
     end
 
+    class WithOnlyConditional < WithStringImpliedChild
+      layout "overwrite", :only => :show
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello index!")
+      end
+
+      def show
+        render :template => ActionView::Template::Text.new("Hello show!")
+      end
+    end
+
+    class WithExceptConditional < WithStringImpliedChild
+      layout "overwrite", :except => :show
+
+      def index
+        render :template => ActionView::Template::Text.new("Hello index!")
+      end
+
+      def show
+        render :template => ActionView::Template::Text.new("Hello show!")
+      end
+    end
+
     class TestBase < ActiveSupport::TestCase
       test "when no layout is specified, and no default is available, render without a layout" do
         controller = Blank.new
@@ -260,6 +284,30 @@ module AbstractControllerTests
           end
         end
       end
+
+      test "when specify an :only option which match current action name" do
+        controller = WithOnlyConditional.new
+        controller.process(:show)
+        assert_equal "Overwrite Hello show!", controller.response_body
+      end
+
+      test "when specify an :only option which does not match current action name" do
+        controller = WithOnlyConditional.new
+        controller.process(:index)
+        assert_equal "With Implied Hello index!", controller.response_body
+      end
+
+      test "when specify an :except option which match current action name" do
+        controller = WithExceptConditional.new
+        controller.process(:show)
+        assert_equal "With Implied Hello show!", controller.response_body
+      end
+
+      test "when specify an :except option which does not match current action name" do
+        controller = WithExceptConditional.new
+        controller.process(:index)
+        assert_equal "Overwrite Hello index!", controller.response_body
+      end
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From a1986e7d55bed6895cab3d8b490f769d7abe727b Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Wed, 7 Dec 2011 01:46:41 +0900
Subject: Use default charset when we read content type without charset.

---
 actionpack/lib/action_dispatch/http/response.rb |  2 +-
 actionpack/test/dispatch/response_test.rb       | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index f1e85559a3..a1ece87d21 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -69,7 +69,7 @@ module ActionDispatch # :nodoc:
       if content_type = self["Content-Type"]
         type, charset = content_type.split(/;\s*charset=/)
         @content_type = Mime::Type.lookup(type)
-        @charset = charset || "UTF-8"
+        @charset = charset || self.class.default_charset
       end
 
       prepare_cache_control!
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 5abbaf74fe..337ece6b88 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -130,6 +130,17 @@ class ResponseTest < ActiveSupport::TestCase
 
     assert_equal('application/xml; charset=utf-16', resp.headers['Content-Type'])
   end
+
+  test "read content type without charset" do
+    original = ActionDispatch::Response.default_charset
+    begin
+      ActionDispatch::Response.default_charset = 'utf-16'
+      resp = ActionDispatch::Response.new(200, { "Content-Type" => "text/xml" })
+      assert_equal('utf-16', resp.charset)
+    ensure
+      ActionDispatch::Response.default_charset = original
+    end
+  end
 end
 
 class ResponseIntegrationTest < ActionDispatch::IntegrationTest
-- 
cgit v1.2.3


From 199353c658007727a428949ac11663175fb2c531 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Wed, 7 Dec 2011 21:11:08 +0900
Subject: Assign config.encoding to AD::Response.default_charset at the
 initialization time.

---
 actionpack/lib/action_dispatch/railtie.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 2ba3198ebd..a4f4825f92 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -21,6 +21,7 @@ module ActionDispatch
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
       ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
+      ActionDispatch::Response.default_charset = app.config.encoding
 
       ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
       ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)
-- 
cgit v1.2.3


From 0a958d84689e28467f599e4ca37be03218b03db0 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Thu, 8 Dec 2011 01:51:23 +0900
Subject: Use freezed string constant. Some string literals is used repeatedly.

---
 actionpack/lib/action_dispatch/http/cache.rb       | 42 ++++++++++++++--------
 .../lib/action_dispatch/http/parameter_filter.rb   |  4 ++-
 actionpack/lib/action_dispatch/http/response.rb    | 18 +++++-----
 3 files changed, 40 insertions(+), 24 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index aaed0d750f..bea62b94d2 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -4,14 +4,18 @@ module ActionDispatch
   module Http
     module Cache
       module Request
+
+        HTTP_IF_MODIFIED_SINCE = 'HTTP_IF_MODIFIED_SINCE'.freeze
+        HTTP_IF_NONE_MATCH     = 'HTTP_IF_NONE_MATCH'.freeze
+
         def if_modified_since
-          if since = env['HTTP_IF_MODIFIED_SINCE']
+          if since = env[HTTP_IF_MODIFIED_SINCE]
             Time.rfc2822(since) rescue nil
           end
         end
 
         def if_none_match
-          env['HTTP_IF_NONE_MATCH']
+          env[HTTP_IF_NONE_MATCH]
         end
 
         def not_modified?(modified_at)
@@ -43,31 +47,35 @@ 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
@@ -81,28 +89,32 @@ module ActionDispatch
           end
         end
 
-        DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate"
+        DEFAULT_CACHE_CONTROL = "max-age=0, private, must-revalidate".freeze
+        NO_CACHE              = "no-cache".freeze
+        PUBLIC                = "public".freeze
+        PRIVATE               = "private".freeze
+        MUST_REVALIDATE       = "must-revalidate".freeze
 
         def set_conditional_cache_control!
-          return if self["Cache-Control"].present?
+          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
diff --git a/actionpack/lib/action_dispatch/http/parameter_filter.rb b/actionpack/lib/action_dispatch/http/parameter_filter.rb
index 1480e8f77c..490b46c990 100644
--- a/actionpack/lib/action_dispatch/http/parameter_filter.rb
+++ b/actionpack/lib/action_dispatch/http/parameter_filter.rb
@@ -20,6 +20,8 @@ module ActionDispatch
         @filters.present?
       end
 
+      FILTERED = '[FILTERED]'.freeze
+
       def compiled_filter
         @compiled_filter ||= begin
           regexps, blocks = compile_filter
@@ -29,7 +31,7 @@ module ActionDispatch
 
             original_params.each do |key, value|
               if regexps.find { |r| key =~ r }
-                value = '[FILTERED]'
+                value = FILTERED
               elsif value.is_a?(Hash)
                 value = filter(value)
               elsif value.is_a?(Array)
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index a1ece87d21..fc840668d5 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -53,8 +53,10 @@ module ActionDispatch # :nodoc:
     # information.
     attr_accessor :charset, :content_type
 
-    CONTENT_TYPE = "Content-Type"
-
+    CONTENT_TYPE = "Content-Type".freeze
+    SET_COOKIE   = "Set-Cookie".freeze
+    LOCATION     = "Location".freeze
+ 
     cattr_accessor(:default_charset) { "utf-8" }
 
     include Rack::Response::Helpers
@@ -66,7 +68,7 @@ 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
@@ -142,12 +144,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
@@ -158,10 +160,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]
@@ -175,7 +177,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
-- 
cgit v1.2.3


From 30f0d7bac8240ba734ad37f42448f84e5eaf7023 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 7 Dec 2011 19:16:14 +0100
Subject: Remove #:nodoc: from partial renderer.

---
 actionpack/lib/action_view/renderer/partial_renderer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 54a0ba96ff..f7af7a8a0a 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -205,7 +205,7 @@ module ActionView
   #       Deadline: <%= user.deadline %>
   #     <%- end -%>
   #   <% end %>
-  class PartialRenderer < AbstractRenderer #:nodoc:
+  class PartialRenderer < AbstractRenderer
     PARTIAL_NAMES = Hash.new { |h,k| h[k] = {} }
 
     def initialize(*)
-- 
cgit v1.2.3


From d5526218e43072a3b9b4a55568f4b29b3a2c0445 Mon Sep 17 00:00:00 2001
From: Jean-Francois Turcot <jfturcot@calypsoconcept.com>
Date: Wed, 7 Dec 2011 22:50:01 -0500
Subject: ParamsWrapper only wrap the accessible attributes when they were set

---
 .../lib/action_controller/metal/params_wrapper.rb  |  9 ++++++-
 actionpack/test/controller/params_wrapper_test.rb  | 29 +++++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 9dcea86253..5c28a8074f 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -43,6 +43,11 @@ 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
@@ -162,7 +167,9 @@ module ActionController
 
         unless options[:include] || options[:exclude]
           model ||= _default_wrap_model
-          if model.respond_to?(:attribute_names) && model.attribute_names.present?
+          if model.respond_to?(:accessible_attributes) && model.accessible_attributes.present?
+            options[:include] = model.accessible_attributes.to_a
+          elsif model.respond_to?(:attribute_names) && model.attribute_names.present?
             options[:include] = model.attribute_names
           end
         end
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 0102f66dfe..a4c6c08abb 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -26,7 +26,7 @@ class ParamsWrapperTest < ActionController::TestCase
       self.class.last_parameters = request.params.except(:controller, :action)
       head :ok
     end
-  end
+end
 
   class User; end
   class Person; end
@@ -147,6 +147,7 @@ class ParamsWrapperTest < ActionController::TestCase
   end
 
   def test_derived_wrapped_keys_from_matching_model
+    User.expects(:respond_to?).with(:accessible_attributes).returns(false)
     User.expects(:respond_to?).with(:attribute_names).returns(true)
     User.expects(:attribute_names).twice.returns(["username"])
 
@@ -159,6 +160,7 @@ class ParamsWrapperTest < ActionController::TestCase
 
   def test_derived_wrapped_keys_from_specified_model
     with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:accessible_attributes).returns(false)
       Person.expects(:respond_to?).with(:attribute_names).returns(true)
       Person.expects(:attribute_names).twice.returns(["username"])
 
@@ -169,8 +171,33 @@ class ParamsWrapperTest < ActionController::TestCase
       assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
     end
   end
+  
+  def test_accessible_wrapped_keys_from_matching_model
+    User.expects(:respond_to?).with(:accessible_attributes).returns(true)
+    User.expects(:accessible_attributes).twice.returns(["username"])
+    
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+    end
+  end
+  
+  def test_accessible_wrapped_keys_from_specified_model
+    with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:accessible_attributes).returns(true)
+      Person.expects(:accessible_attributes).twice.returns(["username"])
+
+      UsersController.wrap_parameters Person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
+    end
+  end
 
   def test_not_wrapping_abstract_model
+    User.expects(:respond_to?).with(:accessible_attributes).returns(false)
     User.expects(:respond_to?).with(:attribute_names).returns(true)
     User.expects(:attribute_names).returns([])
 
-- 
cgit v1.2.3


From e2e9eabc58bf3fa26deef75bd90892c0db9d6ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 09:20:59 +0100
Subject: Remove dead broken code from AD::Request

---
 actionpack/lib/action_dispatch/http/request.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index e86dfd64d2..c5c48ec489 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -35,14 +35,6 @@ 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
-- 
cgit v1.2.3


From 677f968b771c837ae9bf4d9117372717e1bb6c11 Mon Sep 17 00:00:00 2001
From: Jean-Francois Turcot <jfturcot@calypsoconcept.com>
Date: Thu, 8 Dec 2011 04:03:55 -0500
Subject: Add information to the changelog about the changes to
 ActionController::ParamsWrapper

---
 actionpack/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 8844d6e6f6..473115dc6d 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -106,6 +106,11 @@
     persistent between requests so if you need to manipulate the environment
     for your test you need to do it before the cookie jar is created.
 
+*   ActionController::ParamsWrapper on ActiveRecord models now only wrap
+    attr_accessible attributes if they were set, if not, only the attributes
+    returned by the class method attribute_names will be wrapped. This fixes
+    the wrapping of nested attributes by adding them to attr_accessible.
+
 ## Rails 3.1.4 (unreleased) ##
 
 *   Allow to use asset_path on named_routes aliasing RailsHelper's
-- 
cgit v1.2.3


From 3ade2f8e8950d9e7edf451627ca52ab96d630077 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Thu, 8 Dec 2011 23:09:09 +0900
Subject: Fix warning for params_wrapper_test.

---
 actionpack/test/controller/params_wrapper_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index a4c6c08abb..c4d2614200 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -26,7 +26,7 @@ class ParamsWrapperTest < ActionController::TestCase
       self.class.last_parameters = request.params.except(:controller, :action)
       head :ok
     end
-end
+  end
 
   class User; end
   class Person; end
-- 
cgit v1.2.3


From 06ac7d3ee0371c3ba20174a5f9fe3830a9d3f6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 14:05:18 +0100
Subject: Add performance scripts from wycats/rails-simple-benches to
 actionpack.

---
 actionpack/examples/performance.rb               | 182 +++++++++++++++++++++++
 actionpack/examples/views/_collection.erb        |   3 +
 actionpack/examples/views/_hello.erb             |   1 +
 actionpack/examples/views/_hundred_partials.erb  |   3 +
 actionpack/examples/views/_partial.erb           |  10 ++
 actionpack/examples/views/_ten_partials.erb      |  10 ++
 actionpack/examples/views/hashes/_hash.erb       |   3 +
 actionpack/examples/views/my_hashes/_my_hash.erb |   3 +
 actionpack/examples/views/template.html.erb      |   1 +
 9 files changed, 216 insertions(+)
 create mode 100644 actionpack/examples/performance.rb
 create mode 100644 actionpack/examples/views/_collection.erb
 create mode 100644 actionpack/examples/views/_hello.erb
 create mode 100644 actionpack/examples/views/_hundred_partials.erb
 create mode 100644 actionpack/examples/views/_partial.erb
 create mode 100644 actionpack/examples/views/_ten_partials.erb
 create mode 100644 actionpack/examples/views/hashes/_hash.erb
 create mode 100644 actionpack/examples/views/my_hashes/_my_hash.erb
 create mode 100644 actionpack/examples/views/template.html.erb

(limited to 'actionpack')

diff --git a/actionpack/examples/performance.rb b/actionpack/examples/performance.rb
new file mode 100644
index 0000000000..398191154c
--- /dev/null
+++ b/actionpack/examples/performance.rb
@@ -0,0 +1,182 @@
+ENV['RAILS_ENV'] ||= 'production'
+ENV['NO_RELOAD'] ||= '1'
+
+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
+
+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
\ No newline at end of file
diff --git a/actionpack/examples/views/_collection.erb b/actionpack/examples/views/_collection.erb
new file mode 100644
index 0000000000..cee3fe64c0
--- /dev/null
+++ b/actionpack/examples/views/_collection.erb
@@ -0,0 +1,3 @@
+<%= collection[:name] %>
+<%= collection[:address] %>
+<%= omg %>
\ No newline at end of file
diff --git a/actionpack/examples/views/_hello.erb b/actionpack/examples/views/_hello.erb
new file mode 100644
index 0000000000..5ab2f8a432
--- /dev/null
+++ b/actionpack/examples/views/_hello.erb
@@ -0,0 +1 @@
+Hello
\ No newline at end of file
diff --git a/actionpack/examples/views/_hundred_partials.erb b/actionpack/examples/views/_hundred_partials.erb
new file mode 100644
index 0000000000..35c2a6c9d3
--- /dev/null
+++ b/actionpack/examples/views/_hundred_partials.erb
@@ -0,0 +1,3 @@
+<% 100.times do %>
+  <%= render :partial => "/collection", :object => $OBJECT %>
+<% end %>
\ No newline at end of file
diff --git a/actionpack/examples/views/_partial.erb b/actionpack/examples/views/_partial.erb
new file mode 100644
index 0000000000..3ca8e80b52
--- /dev/null
+++ b/actionpack/examples/views/_partial.erb
@@ -0,0 +1,10 @@
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
+<%= "Hello" %>
diff --git a/actionpack/examples/views/_ten_partials.erb b/actionpack/examples/views/_ten_partials.erb
new file mode 100644
index 0000000000..fd02991e22
--- /dev/null
+++ b/actionpack/examples/views/_ten_partials.erb
@@ -0,0 +1,10 @@
+<%= 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 %>
\ No newline at end of file
diff --git a/actionpack/examples/views/hashes/_hash.erb b/actionpack/examples/views/hashes/_hash.erb
new file mode 100644
index 0000000000..c100a290bd
--- /dev/null
+++ b/actionpack/examples/views/hashes/_hash.erb
@@ -0,0 +1,3 @@
+<%= hash[:name] %>
+<%= hash[:address] %>
+<%= omg %>
\ No newline at end of file
diff --git a/actionpack/examples/views/my_hashes/_my_hash.erb b/actionpack/examples/views/my_hashes/_my_hash.erb
new file mode 100644
index 0000000000..e25d84101a
--- /dev/null
+++ b/actionpack/examples/views/my_hashes/_my_hash.erb
@@ -0,0 +1,3 @@
+<%= my_hash[:name] %>
+<%= my_hash[:address] %>
+<%= omg %>
\ No newline at end of file
diff --git a/actionpack/examples/views/template.html.erb b/actionpack/examples/views/template.html.erb
new file mode 100644
index 0000000000..5ab2f8a432
--- /dev/null
+++ b/actionpack/examples/views/template.html.erb
@@ -0,0 +1 @@
+Hello
\ No newline at end of file
-- 
cgit v1.2.3


From efc28a7f701e518eb747c57712f6c1d8e7027aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 15:23:23 +0100
Subject: Some small optimizations and improvements to benchmark code.

---
 actionpack/examples/performance.rb              |  5 ++++-
 actionpack/lib/abstract_controller/rendering.rb |  7 +------
 actionpack/lib/action_view/lookup_context.rb    | 18 +++++++++---------
 actionpack/lib/action_view/template/resolver.rb |  2 +-
 4 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/examples/performance.rb b/actionpack/examples/performance.rb
index 398191154c..994e745bb0 100644
--- a/actionpack/examples/performance.rb
+++ b/actionpack/examples/performance.rb
@@ -1,5 +1,4 @@
 ENV['RAILS_ENV'] ||= 'production'
-ENV['NO_RELOAD'] ||= '1'
 
 require File.expand_path('../../../load_paths', __FILE__)
 require 'action_pack'
@@ -77,6 +76,10 @@ class Runner
   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"
 
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 41fdc11196..d95770c049 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -66,12 +66,7 @@ module AbstractController
     end
 
     def view_context_class
-      @_view_context_class || self.class.view_context_class
-    end
-
-    def initialize(*)
-      @_view_context_class = nil
-      super
+      @_view_context_class ||= self.class.view_context_class
     end
 
     # An instance of a view class. The default view class is ActionView::Base
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index fa4bf70f77..d26158cefe 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -20,7 +20,7 @@ module ActionView
 
     def self.register_detail(name, options = {}, &block)
       self.registered_details << name
-      initialize = registered_details.map { |n| "self.#{n} = details[:#{n}]" }
+      initialize = registered_details.map { |n| "@details[:#{n}] = details[:#{n}] || default_#{n}" }
 
       Accessors.send :define_method, :"default_#{name}", &block
       Accessors.module_eval <<-METHOD, __FILE__, __LINE__ + 1
@@ -29,7 +29,7 @@ module ActionView
         end
 
         def #{name}=(value)
-          value = Array.wrap(value.presence || default_#{name})
+          value = value.present? ? Array.wrap(value) : default_#{name}
           _set_detail(:#{name}, value) if value != @details[:#{name}]
         end
 
@@ -153,14 +153,14 @@ module ActionView
           ""
         end
 
-        parts = name.split('/')
-        name  = parts.pop
+        prefixes = nil if prefixes.blank?
+        parts    = name.split('/')
+        name     = parts.pop
 
-        prefixes = if prefixes.blank?
-          [parts.join('/')]
-        else
-          prefixes.map { |prefix| [prefix, *parts].compact.join('/') }
-        end
+        return name, prefixes || [""] if parts.empty?
+
+        parts    = parts.join('/')
+        prefixes = prefixes ? prefixes.map { |p| "#{p}/#{parts}" } : [parts]
 
         return name, prefixes
       end
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index f855ea257c..eb80a865b5 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -24,7 +24,7 @@ module ActionView
       end
     end
 
-    cattr_accessor :caching
+    class_attribute :caching
     self.caching = true
 
     class << self
-- 
cgit v1.2.3


From 239262fee03096d1e52acf8fe69de736726d87e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 16:37:56 +0100
Subject: Optimize layout lookup to avoid double calls.

---
 actionpack/lib/abstract_controller/layouts.rb      | 50 +++++++++++-----------
 actionpack/lib/abstract_controller/view_paths.rb   |  2 +-
 actionpack/lib/action_view/lookup_context.rb       |  1 -
 .../lib/action_view/renderer/template_renderer.rb  | 21 ++++++---
 4 files changed, 41 insertions(+), 33 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 79edd5418e..6b6b38c64f 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -168,11 +168,12 @@ 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
@@ -188,7 +189,7 @@ module AbstractController
         #
         # ==== Returns
         # * <tt> Boolean</tt> - True if the action has a layout, false otherwise.
-        def action_has_layout?
+        def conditional_layout?
           return unless super
 
           conditions = _layout_conditions
@@ -244,7 +245,13 @@ module AbstractController
       def _write_layout_method
         remove_possible_method(:_layout)
 
-        prefixes = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
+        prefixes    = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
+        name_clause = if name
+          <<-RUBY
+            lookup_context.find_all("#{_implied_layout_name}", #{prefixes.inspect}).first || super
+          RUBY
+        end
+
         layout_definition = case defined?(@_layout) ? @_layout : nil
           when String
             @_layout.inspect
@@ -265,27 +272,15 @@ module AbstractController
           when true
             raise ArgumentError, "Layouts must be specified as a String, Symbol, false, or nil"
           when nil
-            if name
-              <<-RUBY
-                if template_exists?("#{_implied_layout_name}", #{prefixes.inspect})
-                  "#{_implied_layout_name}"
-                else
-                  super
-                end
-              RUBY
-            end
+            name_clause
           end
 
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def _layout
-            if action_has_layout?
+            if conditional_layout?
               #{layout_definition}
-            elsif self.class.name
-              if template_exists?("#{_implied_layout_name}", #{prefixes.inspect})
-                  "#{_implied_layout_name}"
-              else
-                super
-              end
+            else
+              #{name_clause}
             end
           end
         RUBY
@@ -298,8 +293,7 @@ module AbstractController
 
       if _include_layout?(options)
         layout = options.key?(:layout) ? options.delete(:layout) : :default
-        value = _layout_for_option(layout)
-        options[:layout] = (value =~ /\blayouts/ ? value : "layouts/#{value}") if value
+        options[:layout] = Proc.new { _normalize_layout(_layout_for_option(layout)) }
       end
     end
 
@@ -314,6 +308,10 @@ module AbstractController
       @_action_has_layout
     end
 
+    def conditional_layout?
+      true
+    end
+
   private
 
     # This will be overwritten by _write_layout_method
@@ -335,6 +333,10 @@ 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.
     #
@@ -346,17 +348,17 @@ module AbstractController
     # * <tt>template</tt> - The template object for the default layout (or nil)
     def _default_layout(require_layout = false)
       begin
-        layout_name = _layout
+        value = _layout if action_has_layout?
       rescue NameError => e
         raise e, "Could not render layout: #{e.message}"
       end
 
-      if require_layout && action_has_layout? && !layout_name
+      if require_layout && action_has_layout? && !value
         raise ArgumentError,
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
 
-      layout_name
+      value
     end
 
     def _include_layout?(options)
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index e8394447a7..96118b940f 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -10,7 +10,7 @@ module AbstractController
       self._view_paths.freeze
     end
 
-    delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
+    delegate :template_exists?, :view_paths, :formats, :formats=,
              :locale, :locale=, :to => :lookup_context
 
     module ClassMethods
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index d26158cefe..f586708d54 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -227,7 +227,6 @@ module ActionView
     end
 
     # A method which only uses the first format in the formats array for layout lookup.
-    # This method plays straight with instance variables for performance reasons.
     def with_layout_format
       if formats.size == 1
         yield
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index ac91d333ba..6bf91de05a 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -58,14 +58,21 @@ module ActionView
     # context object. If no layout is found, it checks if at least a layout with
     # the given name exists across all details before raising the error.
     def find_layout(layout, keys)
-      begin
-        with_layout_format do
-          layout =~ /^\// ?
-            with_fallbacks { find_template(layout, nil, false, keys, @details) } : find_template(layout, nil, false, keys, @details)
+      with_layout_format { resolve_layout(layout, keys) }
+    end
+
+    def resolve_layout(layout, keys)
+      case layout
+      when String
+        if layout =~ /^\//
+          with_fallbacks { find_template(layout, nil, false, keys, @details) }
+        else
+          find_template(layout, nil, false, keys, @details)
         end
-      rescue ActionView::MissingTemplate
-        all_details = @details.merge(:formats => @lookup_context.default_formats)
-        raise unless template_exists?(layout, nil, false, keys, all_details)
+      when Proc
+        resolve_layout(layout.call, keys)
+      else
+        layout
       end
     end
   end
-- 
cgit v1.2.3


From 67cc07e0c4bd071dd3d2f4098e5a4c31ba590684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 16:51:47 +0100
Subject: Just use the proc if there is a chance of layout lookup.

---
 actionpack/lib/abstract_controller/layouts.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 6b6b38c64f..8356d822da 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -293,7 +293,7 @@ module AbstractController
 
       if _include_layout?(options)
         layout = options.key?(:layout) ? options.delete(:layout) : :default
-        options[:layout] = Proc.new { _normalize_layout(_layout_for_option(layout)) }
+        options[:layout] = _layout_for_option(layout)
       end
     end
 
@@ -323,9 +323,10 @@ module AbstractController
     # * <tt>name</tt> - The name of the template
     def _layout_for_option(name)
       case name
-      when String     then name
-      when true       then _default_layout(true)
-      when :default   then _default_layout(false)
+      when String     then _normalize_layout(name)
+      when Proc       then name
+      when true       then Proc.new { _default_layout(true)  }
+      when :default   then Proc.new { _default_layout(false) }
       when false, nil then nil
       else
         raise ArgumentError,
@@ -358,7 +359,7 @@ module AbstractController
           "There was no default layout for #{self.class} in #{view_paths.inspect}"
       end
 
-      value
+      _normalize_layout(value)
     end
 
     def _include_layout?(options)
-- 
cgit v1.2.3


From 859a4556dd3374f893e0a756434dc41f0574fedf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 18:54:56 +0100
Subject: Revert accidental change from cattr_accessor to class_attribute.

---
 actionpack/lib/action_view/template/resolver.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index eb80a865b5..f855ea257c 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -24,7 +24,7 @@ module ActionView
       end
     end
 
-    class_attribute :caching
+    cattr_accessor :caching
     self.caching = true
 
     class << self
-- 
cgit v1.2.3


From 7280787a53436046e992305a235e66e4fb458e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 19:52:26 +0100
Subject: Improve cache on route_key lookup.

---
 actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
index e989a38d8b..013cf93dbc 100644
--- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
+++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -165,7 +165,7 @@ module ActionDispatch
               if parent.is_a?(Symbol) || parent.is_a?(String)
                 parent
               else
-                ActiveModel::Naming.route_key(parent).singularize
+                ActiveModel::Naming.singular_route_key(parent)
               end
             end
           else
@@ -176,9 +176,11 @@ module ActionDispatch
           if record.is_a?(Symbol) || record.is_a?(String)
             route << record
           elsif record
-            route << ActiveModel::Naming.route_key(record)
-            route = [route.join("_").singularize] if inflection == :singular
-            route << "index" if ActiveModel::Naming.uncountable?(record) && inflection == :plural
+            if inflection == :singular
+              route << ActiveModel::Naming.singular_route_key(record)
+            else
+              route << ActiveModel::Naming.route_key(record)
+            end
           else
             raise ArgumentError, "Nil location provided. Can't build URI."
           end
-- 
cgit v1.2.3


From ebd71fd0e39abf495bdf64e3e6d278340c17e5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 20:59:43 +0100
Subject: Fix a regression and also fix broken test.

---
 actionpack/lib/action_view/renderer/template_renderer.rb  | 13 +++++++++----
 actionpack/test/controller/new_base/render_layout_test.rb | 10 +++++-----
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 6bf91de05a..1771fb0063 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -64,10 +64,15 @@ module ActionView
     def resolve_layout(layout, keys)
       case layout
       when String
-        if layout =~ /^\//
-          with_fallbacks { find_template(layout, nil, false, keys, @details) }
-        else
-          find_template(layout, nil, false, keys, @details)
+        begin
+          if layout =~ /^\//
+            with_fallbacks { find_template(layout, nil, false, keys, @details) }
+          else
+            find_template(layout, nil, false, keys, @details)
+          end
+        rescue ActionView::MissingTemplate
+          all_details = @details.merge(:formats => @lookup_context.default_formats)
+          raise unless template_exists?(layout, nil, false, keys, all_details)
         end
       when Proc
         resolve_layout(layout.call, keys)
diff --git a/actionpack/test/controller/new_base/render_layout_test.rb b/actionpack/test/controller/new_base/render_layout_test.rb
index d3dcb5cad6..73c2d8244a 100644
--- a/actionpack/test/controller/new_base/render_layout_test.rb
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -71,7 +71,8 @@ module ControllerLayouts
     self.view_paths = [ActionView::FixtureResolver.new(
       "layouts/application.html.erb" => "<html><%= yield %></html>",
       "controller_layouts/mismatch_format/index.xml.builder" => "xml.instruct!",
-      "controller_layouts/mismatch_format/implicit.builder" => "xml.instruct!"
+      "controller_layouts/mismatch_format/implicit.builder" => "xml.instruct!",
+      "controller_layouts/mismatch_format/explicit.js.erb" => "alert('foo');"
     )]
 
     def explicit
@@ -94,10 +95,9 @@ module ControllerLayouts
       assert_response XML_INSTRUCT
     end
 
-    test "if an HTML template is explicitly provides for a JS template, an error is raised" do
-      assert_raises ActionView::MissingTemplate do
-        get :explicit, {}, "action_dispatch.show_exceptions" => false
-      end
+    test "a layout for JS is ignored even if explicitly provided for HTML" do
+      get :explicit, { :format => "js" }
+      assert_response "alert('foo');"
     end
   end
 end
-- 
cgit v1.2.3


From c41f08cefe6fa3747ee79001d9c88dc988e8064d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 21:16:12 +0100
Subject: Move symbolize keys to the inner options as we can assume url_options
 will be properly symbolized.

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 2 +-
 actionpack/lib/action_dispatch/routing/url_for.rb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c64214431a..6d6de36a08 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -557,7 +557,7 @@ module ActionDispatch
         path_addition, params = generate(path_options, path_segments || {})
         path << path_addition
 
-        ActionDispatch::Http::URL.url_for(options.merge({
+        ActionDispatch::Http::URL.url_for(options.merge!({
           :path => path,
           :params => params,
           :user => user,
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 39ba83fb9a..22e41c9c16 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -145,7 +145,7 @@ module ActionDispatch
         when String
           options
         when nil, Hash
-          _routes.url_for((options || {}).reverse_merge(url_options).symbolize_keys)
+          _routes.url_for((options || {}).symbolize_keys.reverse_merge!(url_options))
         else
           polymorphic_url(options)
         end
-- 
cgit v1.2.3


From d4d99bbc87021fad1df516cb24912973d186279d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 8 Dec 2011 22:56:50 +0100
Subject: Fix another regression related to the layout optimization.

---
 .../lib/action_view/renderer/template_renderer.rb  |  2 ++
 .../test/controller/new_base/render_layout_test.rb | 26 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 1771fb0063..e131afa279 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -76,6 +76,8 @@ module ActionView
         end
       when Proc
         resolve_layout(layout.call, keys)
+      when FalseClass
+        nil
       else
         layout
       end
diff --git a/actionpack/test/controller/new_base/render_layout_test.rb b/actionpack/test/controller/new_base/render_layout_test.rb
index 73c2d8244a..4ac40ca405 100644
--- a/actionpack/test/controller/new_base/render_layout_test.rb
+++ b/actionpack/test/controller/new_base/render_layout_test.rb
@@ -82,7 +82,7 @@ module ControllerLayouts
 
   class MismatchFormatTest < Rack::TestCase
     testing ControllerLayouts::MismatchFormatController
-    
+
     XML_INSTRUCT = %Q(<?xml version="1.0" encoding="UTF-8"?>\n)
 
     test "if XML is selected, an HTML template is not also selected" do
@@ -100,4 +100,28 @@ module ControllerLayouts
       assert_response "alert('foo');"
     end
   end
+
+  class FalseLayoutMethodController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "controller_layouts/false_layout_method/index.js.erb" => "alert('foo');"
+    )]
+
+    layout :which_layout?
+
+    def which_layout?
+      false
+    end
+
+    def index
+    end
+  end
+
+  class FalseLayoutMethodTest < Rack::TestCase
+    testing ControllerLayouts::FalseLayoutMethodController
+
+    test "access false layout returned by a method/proc" do
+      get :index, :format => "js"
+      assert_response "alert('foo');"
+    end
+  end
 end
-- 
cgit v1.2.3


From 2c471b3ac805b00ac1423f7ae2be1554aca0db9f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 8 Dec 2011 15:11:23 -0800
Subject: load the encoding converter to work around [ruby-core:41556] when
 switching encodings

---
 .../lib/action_view/data/encoding_conversions.txt  | 88 ----------------------
 actionpack/lib/action_view/template.rb             | 27 -------
 actionpack/test/template/template_test.rb          |  1 +
 3 files changed, 1 insertion(+), 115 deletions(-)
 delete mode 100644 actionpack/lib/action_view/data/encoding_conversions.txt

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/data/encoding_conversions.txt b/actionpack/lib/action_view/data/encoding_conversions.txt
deleted file mode 100644
index fdfbe28803..0000000000
--- a/actionpack/lib/action_view/data/encoding_conversions.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-ASCII-8BIT:UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-8:ASCII-8BIT,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-US-ASCII:ASCII-8BIT,UTF-8,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Big5:ASCII-8BIT,UTF-8,US-ASCII,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Big5-HKSCS:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Big5-UAO:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP949:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-EUC-JP:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-EUC-KR:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-GB18030:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-GBK:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-1:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-2:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-3:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-4:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-5:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-6:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-7:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-8:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-9:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-10:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-11:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-13:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-14:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-8859-15:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-KOI8-R:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-KOI8-U:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Shift_JIS:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-16BE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-16LE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-32BE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-32LE:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1251:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM437:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM737:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM775:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP850:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM852:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP852:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM855:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP855:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM857:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM860:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM861:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM862:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM863:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM865:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM866:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-IBM869:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macCroatian:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macCyrillic:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macGreek:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macIceland:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macRoman:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macRomania:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macTurkish:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-macUkraine:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP950:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP951:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-stateless-ISO-2022-JP:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-eucJP-ms:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP51932:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-GB2312:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-GB12345:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-2022-JP:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP50220:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-CP50221:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1252:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1250:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1256:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1253:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1255:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1254:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-TIS-620:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-874:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-1257:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-Windows-31J:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF8-MAC:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-16:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF-32:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF8-DoCoMo:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-SJIS-DoCoMo:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF8-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-SJIS-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-ISO-2022-JP-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-stateless-ISO-2022-JP-KDDI:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,UTF8-SoftBank,SJIS-SoftBank
-UTF8-SoftBank:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,SJIS-SoftBank
-SJIS-SoftBank:ASCII-8BIT,UTF-8,US-ASCII,Big5,Big5-HKSCS,Big5-UAO,CP949,EUC-JP,EUC-KR,GB18030,GBK,ISO-8859-1,ISO-8859-2,ISO-8859-3,ISO-8859-4,ISO-8859-5,ISO-8859-6,ISO-8859-7,ISO-8859-8,ISO-8859-9,ISO-8859-10,ISO-8859-11,ISO-8859-13,ISO-8859-14,ISO-8859-15,KOI8-R,KOI8-U,Shift_JIS,UTF-16BE,UTF-16LE,UTF-32BE,UTF-32LE,Windows-1251,IBM437,IBM737,IBM775,CP850,IBM852,CP852,IBM855,CP855,IBM857,IBM860,IBM861,IBM862,IBM863,IBM865,IBM866,IBM869,macCroatian,macCyrillic,macGreek,macIceland,macRoman,macRomania,macTurkish,macUkraine,CP950,CP951,stateless-ISO-2022-JP,eucJP-ms,CP51932,GB2312,GB12345,ISO-2022-JP,CP50220,CP50221,Windows-1252,Windows-1250,Windows-1256,Windows-1253,Windows-1255,Windows-1254,TIS-620,Windows-874,Windows-1257,Windows-31J,UTF8-MAC,UTF-16,UTF-32,UTF8-DoCoMo,SJIS-DoCoMo,UTF8-KDDI,SJIS-KDDI,ISO-2022-JP-KDDI,stateless-ISO-2022-JP-KDDI,UTF8-SoftBank
\ No newline at end of file
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 8d69880308..10797c010f 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -3,33 +3,6 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/kernel/singleton_class'
 
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '1.9.3' && RUBY_PATCHLEVEL == 0
-  # This is a hack to work around a bug in Ruby 1.9.3p0:
-  # http://redmine.ruby-lang.org/issues/5564
-  #
-  # Basically, at runtime we may need to perform some encoding conversions on the templates,
-  # but if the converter hasn't been loaded by Ruby beforehand (i.e. now), then it won't be
-  # able to find it (due to a  bug).
-  #
-  # However, we don't know what conversions we may need to do a runtime. So we load up a
-  # text file which contains a pre-generated list of all the possible conversions,
-  # and we load all of them.
-  #
-  # In my testing this increased the process size by about 3.9 MB (after the conversions array
-  # is GC'd) and took around 170ms to run, which seems acceptable for a workaround.
-  #
-  # The script to dump the conversions is: https://gist.github.com/1371499
-
-  filename    = File.join(File.dirname(__FILE__), 'data', 'encoding_conversions.txt')
-  conversions = File.read(filename)
-  conversions.split("\n").map do |line|
-    from, to_array = line.split(':')
-    to_array.split(',').each do |to|
-      Encoding::Converter.new(from, to)
-    end
-  end
-end
-
 module ActionView
   # = Action View Template
   class Template
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 70ca876c67..fe82504d3b 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -170,6 +170,7 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def with_external_encoding(encoding)
       old = Encoding.default_external
+      Encoding::Converter.new old, encoding
       silence_warnings { Encoding.default_external = encoding }
       yield
     ensure
-- 
cgit v1.2.3


From 2995134cba898c95d62bb9756742959a0839cbf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 9 Dec 2011 06:25:10 +0100
Subject: Simplify path traversal logic

---
 actionpack/lib/action_view/renderer/partial_renderer.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index f7af7a8a0a..d052c26381 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -375,23 +375,23 @@ module ActionView
         end
       end
 
-      @partial_names[path] ||= path.dup.tap do |object_path|
-        merge_prefix_into_object_path(@context_prefix, object_path)
-      end
+      @partial_names[path] ||= merge_prefix_into_object_path(@context_prefix, path.dup)
     end
 
     def merge_prefix_into_object_path(prefix, object_path)
       if prefix.include?(?/) && object_path.include?(?/)
-        overlap = []
+        prefixes = []
         prefix_array = File.dirname(prefix).split('/')
         object_path_array = object_path.split('/')[0..-3] # skip model dir & partial
 
         prefix_array.each_with_index do |dir, index|
-          overlap << dir if dir == object_path_array[index]
+          break if dir == object_path_array[index]
+          prefixes << dir
         end
 
-        object_path.gsub!(/^#{overlap.join('/')}\//,'')
-        object_path.insert(0, "#{File.dirname(prefix)}/")
+        (prefixes << object_path).join("/")
+      else
+        object_path
       end
     end
 
-- 
cgit v1.2.3


From 5ad52152117ecda1166359c499bcd03ae6be3365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 9 Dec 2011 07:20:55 +0100
Subject: Deprecate implicit layout lookup in favor of inheriting the _layout
 config.

---
 actionpack/CHANGELOG.md                       |  13 +++
 actionpack/lib/abstract_controller/layouts.rb | 118 +++++++++++++++++++-------
 actionpack/test/abstract/layouts_test.rb      |   4 +-
 3 files changed, 101 insertions(+), 34 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 473115dc6d..e00b4a64f1 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,18 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
+
+        class ApplicationController
+          layout "application"
+        end
+
+        class PostsController < ApplicationController
+        end
+
+    In the example above, Posts controller will no longer automatically look up for a posts layout.
+
+    If you need this functionality you could either remove `layout "application"` from ApplicationController or explicitly set it to nil in PostsController. *José Valim*
+
 *   Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail. *Prem Sichanugrist*
 
     For example, consider this snippet:
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 8356d822da..8b6136d6ba 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -66,27 +66,40 @@ module AbstractController
   # == Inheritance Examples
   #
   #   class BankController < ActionController::Base
-  #     layout "bank_standard"
+  #     # bank.html.erb exists
+  #
+  #   class ExchangeController < BankController
+  #     # exchange.html.erb exists
+  #
+  #   class CurrencyController < BankController
   #
   #   class InformationController < BankController
+  #     layout "information"
   #
-  #   class TellerController < BankController
+  #   class TellerController < InformationController
   #     # teller.html.erb exists
   #
-  #   class TillController < TellerController
+  #   class EmployeeController < InformationController
+  #     # employee.html.erb exists
+  #     layout nil
   #
   #   class VaultController < BankController
   #     layout :access_level_layout
   #
-  #   class EmployeeController < BankController
-  #     layout nil
+  #   class TillController < BankController
+  #     layout false
+  #
+  # In these examples, 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.
   #
-  # 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.
+  # However, when a layout is explicitly set, the explicitly set layout wins:
+  # * The InformationController uses the "information" layout, explicitly set.
+  # * The TellerController also uses the "information" layout, because the parent explicitly set it.
+  # * The EmployeeController uses the "employee" layout, because it set the layout to nil, resetting the parent configuration.
   # * The VaultController chooses a layout dynamically by calling the <tt>access_level_layout</tt> method.
-  # * The EmployeeController does not use a layout at all.
+  # * The TillController does not use a layout at all.
   #
   # == Types of layouts
   #
@@ -126,6 +139,22 @@ 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
@@ -252,28 +281,53 @@ module AbstractController
           RUBY
         end
 
-        layout_definition = case defined?(@_layout) ? @_layout : nil
-          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"
+        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
                 end
-              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
+              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
+        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_variable_get(:@_layout)
+          @_layout = nil
+          inspect  = parent.is_a?(Proc) ? parent.inspect : parent
+
+          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
+                else
+                  super
+                end
+              RUBY
+            end
+        end
 
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def _layout
@@ -283,8 +337,8 @@ module AbstractController
               #{name_clause}
             end
           end
+          private :_layout
         RUBY
-        self.class_eval { private :_layout }
       end
     end
 
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index a5382a730d..de6f42d826 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -258,7 +258,7 @@ module AbstractControllerTests
 
       test "when a child controller has an implied layout, use that layout and not the parent controller layout" do
         controller = WithStringImpliedChild.new
-        controller.process(:index)
+        assert_deprecated { controller.process(:index) }
         assert_equal "With Implied Hello string!", controller.response_body
       end
 
@@ -271,7 +271,7 @@ module AbstractControllerTests
       test "when a grandchild has no layout specified, the child has an implied layout, and the " \
         "parent has specified a layout, use the child controller layout" do
           controller = WithChildOfImplied.new
-          controller.process(:index)
+          assert_deprecated { controller.process(:index) }
           assert_equal "With Implied Hello string!", controller.response_body
       end
 
-- 
cgit v1.2.3


From 22a6079a20ae13dcb0ad6ddb3ee39a849e5e0928 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 9 Dec 2011 18:15:28 +0100
Subject: Make ActiveSupport::Benchmarkable a default module for
 ActionController::Base, so the #benchmark method is once again available in
 the controller context like it used to be *DHH*

---
 actionpack/CHANGELOG.md                  | 2 ++
 actionpack/lib/action_controller/base.rb | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index e00b4a64f1..761da8cb87 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
+
 *   Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
 
         class ApplicationController
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 98bfe72fef..335b4e8cb8 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -208,6 +208,8 @@ module ActionController
       HttpAuthentication::Digest::ControllerMethods,
       HttpAuthentication::Token::ControllerMethods,
 
+      ActiveSupport::Benchmarkable,
+
       # Before callbacks should also be executed the earliest as possible, so
       # also include them at the bottom.
       AbstractController::Callbacks,
-- 
cgit v1.2.3


From c212a34e1d1e2a4bfb546a664958aba168892c49 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 9 Dec 2011 09:33:36 -0800
Subject: only load converter if the encodings are different

---
 actionpack/test/template/template_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index fe82504d3b..13d30a93ce 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -170,7 +170,7 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def with_external_encoding(encoding)
       old = Encoding.default_external
-      Encoding::Converter.new old, encoding
+      Encoding::Converter.new old, encoding if old != encoding
       silence_warnings { Encoding.default_external = encoding }
       yield
     ensure
-- 
cgit v1.2.3


From ab30570b69e6118bbfbd8dfaa7577668b34e5eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 9 Dec 2011 20:47:33 +0100
Subject: Fix extend -> include.

---
 actionpack/lib/abstract_controller/logger.rb | 2 +-
 actionpack/lib/action_controller/base.rb     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index 0b196119f4..8b36230397 100644
--- a/actionpack/lib/abstract_controller/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
@@ -7,7 +7,7 @@ module AbstractController
 
     included do
       config_accessor :logger
-      extend ActiveSupport::Benchmarkable
+      include ActiveSupport::Benchmarkable
     end
   end
 end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 335b4e8cb8..98bfe72fef 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -208,8 +208,6 @@ module ActionController
       HttpAuthentication::Digest::ControllerMethods,
       HttpAuthentication::Token::ControllerMethods,
 
-      ActiveSupport::Benchmarkable,
-
       # Before callbacks should also be executed the earliest as possible, so
       # also include them at the bottom.
       AbstractController::Callbacks,
-- 
cgit v1.2.3


From efed2d56e22069fc142016f398625588684ce008 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 10 Dec 2011 01:30:06 +0100
Subject: Update partials documentation, partial_path is no longer generated
 using RecordIdentifier

---
 .../lib/action_view/renderer/partial_renderer.rb   | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index d052c26381..374bdb62f5 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -82,16 +82,18 @@ module ActionView
   #
   # This will render the partial "advertisement/_ad.html.erb" regardless of which controller this is being called from.
   #
-  # == Rendering objects with the RecordIdentifier
+  # == Rendering objects that respond to `to_partial_path`
   #
-  # Instead of explicitly naming the location of a partial, you can also let the RecordIdentifier do the work if
-  # you're following its conventions for RecordIdentifier#partial_path. Examples:
+  # Instead of explicitly naming the location of a partial, you can also let PartialRenderer do the work
+  # and pick the proper path by checking `to_proper_path` method. If the object passed to render is a collection,
+  # all objects must return the same path.
   #
-  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # @account.to_partial_path returns 'accounts/account', so it can be used to replace:
   #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
   #  <%= render :partial => @account %>
   #
-  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # @posts is an array of Post instances, so every post record returns 'posts/post' on `to_partial_path`,
+  #  # that's why we can replace:
   #  # <%= render :partial => "posts/post", :collection => @posts %>
   #  <%= render :partial => @posts %>
   #
@@ -106,13 +108,14 @@ module ActionView
   #  # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
   #  <%= render "account", :account => @buyer %>
   #
-  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
-  #  <%= render(@account) %>
+  #  # @account.to_partial_path returns 'accounts/account', so it can be used to replace:
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
+  #  <%= render @account %>
   #
-  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # @posts is an array of Post instances, so every post record returns 'posts/post' on `to_partial_path`,
+  #  # that's why we can replace:
   #  # <%= render :partial => "posts/post", :collection => @posts %>
-  #  <%= render(@posts) %>
+  #  <%= render @posts %>
   #
   # == Rendering partials with layouts
   #
-- 
cgit v1.2.3


From 7a7e87d5aa39e9820ea9e509a3f1477c9dbf369c Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 10 Dec 2011 18:07:13 -0500
Subject: Use ProcessedAsset#pathname in Sprockets helpers when debugging is
 on. Closes #3333 #3348 #3361.

Is wrong use ProcessedAsset#to_s since it returns the content of the file.
---
 actionpack/lib/sprockets/helpers/rails_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 75ba1e66c2..1bd9d5ca26 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -26,7 +26,7 @@ module Sprockets
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'js')
             asset.to_a.map { |dep|
-              super(dep.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
+              super(dep.pathname.to_s, { :src => path_to_asset(dep, :ext => 'js', :body => true, :digest => digest) }.merge!(options))
             }
           else
             super(source.to_s, { :src => path_to_asset(source, :ext => 'js', :body => body, :digest => digest) }.merge!(options))
@@ -43,7 +43,7 @@ module Sprockets
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'css')
             asset.to_a.map { |dep|
-              super(dep.to_s, { :href => path_to_asset(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
+              super(dep.pathname.to_s, { :href => path_to_asset(dep, :ext => 'css', :body => true, :protocol => :request, :digest => digest) }.merge!(options))
             }
           else
             super(source.to_s, { :href => path_to_asset(source, :ext => 'css', :body => body, :protocol => :request, :digest => digest) }.merge!(options))
@@ -57,7 +57,7 @@ module Sprockets
         options[:body] ? "#{path}?body=1" : path
       end
       alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
-      
+
       def image_path(source)
         path_to_asset(source)
       end
-- 
cgit v1.2.3


From 3f65e7f7be92adfb2d89ec23ef28a96d2bfae294 Mon Sep 17 00:00:00 2001
From: Will Farrington <wcfarrington@gmail.com>
Date: Sat, 10 Dec 2011 23:53:39 -0500
Subject: Add button_tag support to ActionView::Helpers::FormBuilder.

This support is near-identical to the existing submit_tag support.

Example:

    <%= form_for @post do |f| %>
      <%= f.button %>
    <% end %>
---
 actionpack/CHANGELOG.md                           | 10 +++++++
 actionpack/lib/action_view/helpers/form_helper.rb | 33 +++++++++++++++++++++++
 actionpack/lib/action_view/locale/en.yml          |  6 +++++
 actionpack/test/template/form_helper_test.rb      |  4 ++-
 4 files changed, 52 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 761da8cb87..29b93da50b 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Add `button_tag` support to ActionView::Helpers::FormBuilder.
+
+    This support mimics the default behavior of `submit_tag`.
+
+    Example:
+
+        <%= form_for @post do |f| %>
+          <%= f.button %>
+        <% end %>
+
 *   Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
 
 *   Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 1a64b12aa6..ccb2275329 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1364,6 +1364,39 @@ module ActionView
         @template.submit_tag(value, options)
       end
 
+      # Add the submit button for the given form. When no value is given, it checks
+      # if the object is a new resource or not to create the proper label:
+      #
+      #   <%= form_for @post do |f| %>
+      #     <%= f.button %>
+      #   <% end %>
+      #
+      # In the example above, if @post is a new record, it will use "Create Post" as
+      # submit button label, otherwise, it uses "Update Post".
+      #
+      # Those labels can be customized using I18n, under the helpers.submit key and accept
+      # the %{model} as translation interpolation:
+      #
+      #   en:
+      #     helpers:
+      #       button:
+      #         create: "Create a %{model}"
+      #         update: "Confirm changes to %{model}"
+      #
+      # It also searches for a key specific for the given object:
+      #
+      #   en:
+      #     helpers:
+      #       button:
+      #         post:
+      #           create: "Add %{model}"
+      #
+      def button(value=nil, options={})
+        value, options = nil, value if value.is_a?(Hash)
+        value ||= submit_default_value
+        @template.button_tag(value, options)
+      end
+
       def emitted_hidden_id?
         @emitted_hidden_id ||= nil
       end
diff --git a/actionpack/lib/action_view/locale/en.yml b/actionpack/lib/action_view/locale/en.yml
index eb816b9446..f2a83b92a9 100644
--- a/actionpack/lib/action_view/locale/en.yml
+++ b/actionpack/lib/action_view/locale/en.yml
@@ -152,3 +152,9 @@
       update: 'Update %{model}'
       submit: 'Save %{model}'
 
+    # Default translation keys for button FormHelper
+    button:
+      create: 'Create %{model}'
+      update: 'Update %{model}'
+      submit: 'Save %{model}'
+
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 41e925b000..73b936b16e 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -689,6 +689,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.text_area(:body)
       concat f.check_box(:secret)
       concat f.submit('Create post')
+      concat f.button('Create post')
     end
 
     expected = whole_form("/posts/123", "create-post" , "edit_post", :method => "put") do
@@ -697,7 +698,8 @@ class FormHelperTest < ActionView::TestCase
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
       "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "<input name='commit' type='submit' value='Create post' />"
+      "<input name='commit' type='submit' value='Create post' />" +
+      "<button name='button' type='submit'>Create post</button>"
     end
 
     assert_dom_equal expected, output_buffer
-- 
cgit v1.2.3


From dc43e402a10d10f72f3051c1f33bdc335a54d995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lennart=20Fride=CC=81n?= <lennart@devl.se>
Date: Sun, 11 Dec 2011 22:19:11 +0100
Subject: =?UTF-8?q?Added=20:use=5Ftwo=5Fdigit=5Fnumbers=20option=20[Lennar?=
 =?UTF-8?q?t=20Frid=C3=A9n=20&=20Kim=20Persson]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added use_two_digit_numbers select_tag option for displaying months and days with leading zeros without affecting the values (useful for e.g. ISO-style dates, 2011-08-01).

Signed-off-by: José Valim <jose.valim@gmail.com>

Conflicts:

	actionpack/CHANGELOG.md
---
 actionpack/CHANGELOG.md                           |  3 +++
 actionpack/lib/action_view/helpers/date_helper.rb |  9 ++++++---
 actionpack/test/template/date_helper_test.rb      | 19 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 29b93da50b..b354f05960 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -10,6 +10,9 @@
           <%= f.button %>
         <% end %>
 
+*   Date helpers accept a new option, `:use_two_digit_numbers = true`, that renders select boxes for months and days with a leading zero without changing the respective values. 
+    For example, this is useful for displaying ISO8601-style dates such as '2011-08-01'. *Lennart Fridén and Kim Persson*
+
 *   Make ActiveSupport::Benchmarkable a default module for ActionController::Base, so the #benchmark method is once again available in the controller context like it used to be *DHH*
 
 *   Deprecated implied layout lookup in controllers whose parent had a explicit layout set:
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 4deb87180c..38cf922ef4 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -736,7 +736,7 @@ module ActionView
         if @options[:use_hidden] || @options[:discard_day]
           build_hidden(:day, day)
         else
-          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false)
+          build_options_and_select(:day, day, :start => 1, :end => 31, :leading_zeros => false, :use_two_digit_numbers => @options[:use_two_digit_numbers])
         end
       end
 
@@ -822,6 +822,8 @@ module ActionView
         def month_name(number)
           if @options[:use_month_numbers]
             number
+          elsif @options[:use_two_digit_numbers]
+            sprintf "%02d", number
           elsif @options[:add_month_numbers]
             "#{number} - #{month_names[number]}"
           else
@@ -857,7 +859,7 @@ module ActionView
           start         = options.delete(:start) || 0
           stop          = options.delete(:end) || 59
           step          = options.delete(:step) || 1
-          options.reverse_merge!({:leading_zeros => true, :ampm => false})
+          options.reverse_merge!({:leading_zeros => true, :ampm => false, :use_two_digit_numbers => false})
           leading_zeros = options.delete(:leading_zeros)
 
           select_options = []
@@ -865,7 +867,8 @@ module ActionView
             value = leading_zeros ? sprintf("%02d", i) : i
             tag_options = { :value => value }
             tag_options[:selected] = "selected" if selected == i
-            text = options[:ampm] ? AMPM_TRANSLATION[i] : value
+            text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
+            text = options[:ampm] ? AMPM_TRANSLATION[i] : text            
             select_options << content_tag(:option, text, tag_options)
           end
           (select_options.join("\n") + "\n").html_safe
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index af30ec9892..57a5895cec 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -164,6 +164,15 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_day(nil, :include_blank => true)
   end
 
+  def test_select_day_with_two_digit_numbers
+    expected = %(<select id="date_day" name="date[day]">\n)
+    expected << %(<option value="1">01</option>\n<option selected="selected" value="2">02</option>\n<option value="3">03</option>\n<option value="4">04</option>\n<option value="5">05</option>\n<option value="6">06</option>\n<option value="7">07</option>\n<option value="8">08</option>\n<option value="9">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_day(Time.mktime(2011, 8, 2), :use_two_digit_numbers => true)
+    assert_dom_equal expected, select_day(2, :use_two_digit_numbers => true)
+  end
+
   def test_select_day_with_html_options
     expected = %(<select id="date_day" name="date[day]" class="selector">\n)
     expected << %(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
@@ -198,6 +207,15 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_month(8)
   end
 
+  def test_select_month_with_two_digit_numbers
+    expected = %(<select id="date_month" name="date[month]">\n)
+    expected << %(<option value="1">01</option>\n<option value="2">02</option>\n<option value="3">03</option>\n<option value="4">04</option>\n<option value="5">05</option>\n<option value="6">06</option>\n<option value="7">07</option>\n<option value="8" selected="selected">08</option>\n<option value="9">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_month(Time.mktime(2011, 8, 16), :use_two_digit_numbers => true)
+    assert_dom_equal expected, select_month(8, :use_two_digit_numbers => true)
+  end
+
   def test_select_month_with_disabled
     expected = %(<select id="date_month" name="date[month]" disabled="disabled">\n)
     expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
@@ -986,7 +1004,6 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :ampm => true)
   end
 
-
   def test_select_datetime_with_separators
     expected =  %(<select id="date_first_year" name="date[first][year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
-- 
cgit v1.2.3


From 5266eb9f611a114663c48eec0680b7050181d3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotrek=20Oko=C5=84ski?= <piotrek@okonski.org>
Date: Mon, 12 Dec 2011 16:52:56 +0100
Subject: Default relative_url_root to ENV["RAILS_RELATIVE_URL_ROOT"]. Fixes
 #3365

---
 actionpack/lib/abstract_controller/asset_paths.rb | 2 +-
 actionpack/lib/action_controller/railtie.rb       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb
index c2a6809f58..dd5f9a1942 100644
--- a/actionpack/lib/abstract_controller/asset_paths.rb
+++ b/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
+        :stylesheets_dir, :default_asset_host_protocol, :relative_url_root
     end
   end
 end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index de7b837ecc..cb2e2b17aa 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -31,6 +31,7 @@ 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
-- 
cgit v1.2.3


From ede647a505fbba459d4e8529646b1f5cb59c1d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Dec 2011 19:23:13 +0100
Subject: Allow reloader to be configured.

---
 .../lib/action_dispatch/middleware/reloader.rb     | 52 ++++++++++++++++------
 actionpack/test/dispatch/reloader_test.rb          | 13 ++++++
 2 files changed, 51 insertions(+), 14 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb
index 29289a76b4..4f48f1c974 100644
--- a/actionpack/lib/action_dispatch/middleware/reloader.rb
+++ b/actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -43,34 +43,58 @@ module ActionDispatch
 
     # Execute all prepare callbacks.
     def self.prepare!
-      new(nil).run_callbacks :prepare
+      new(nil).prepare!
     end
 
     # Execute all cleanup callbacks.
     def self.cleanup!
-      new(nil).run_callbacks :cleanup
+      new(nil).cleanup!
     end
 
-    def initialize(app)
+    def initialize(app, condition=nil)
       @app = app
-    end
-
-    module CleanupOnClose
-      def close
-        super if defined?(super)
-      ensure
-        ActionDispatch::Reloader.cleanup!
-      end
+      @condition = condition || lambda { true }
+      @validated = true
     end
 
     def call(env)
-      run_callbacks :prepare
+      @validated = @condition.call
+      prepare!
       response = @app.call(env)
-      response[2].extend(CleanupOnClose)
+      response[2].extend(module_hook)
       response
     rescue Exception
-      run_callbacks :cleanup
+      cleanup!
       raise
     end
+
+    def prepare! #:nodoc:
+      run_callbacks :prepare if validated?
+    end
+
+    def cleanup! #:nodoc:
+      run_callbacks :cleanup if validated?
+    ensure
+      @validated = true
+    end
+
+    private
+
+    def validated? #:nodoc:
+      @validated
+    end
+
+    def module_hook #:nodoc:
+      middleware = self
+      Module.new do
+        define_method :close do
+          begin
+            super() if defined?(super)
+          ensure
+            middleware.cleanup!
+          end
+        end
+      end
+    end
   end
 end
diff --git a/actionpack/test/dispatch/reloader_test.rb b/actionpack/test/dispatch/reloader_test.rb
index eaabc1feb3..bd24256427 100644
--- a/actionpack/test/dispatch/reloader_test.rb
+++ b/actionpack/test/dispatch/reloader_test.rb
@@ -43,6 +43,19 @@ class ReloaderTest < Test::Unit::TestCase
     assert_respond_to body, :close
   end
 
+  def test_condition_specifies_when_to_reload
+    i, j = 0, 0, 0, 0
+    Reloader.to_prepare { |*args| i += 1 }
+    Reloader.to_cleanup { |*args| j += 1 }
+    app = Reloader.new(lambda { |env| [200, {}, []] }, lambda { i < 3 })
+    5.times do
+      resp = app.call({})
+      resp[2].close
+    end
+    assert_equal 3, i
+    assert_equal 3, j
+  end
+
   def test_returned_body_object_behaves_like_underlying_object
     body = call_and_return_body do
       b = MyBody.new
-- 
cgit v1.2.3


From fa1d9a884c0d5b70c97442e3360ac98ca5fa4340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Dec 2011 22:51:33 +0100
Subject: Speed up development by only reloading classes if dependencies files
 changed.

This can be turned off by setting `config.reload_classes_only_on_change` to false.

Extensions like Active Record should add their respective files like db/schema.rb and db/structure.sql to `config.watchable_files` if they want their changes to affect classes reloading.

Thanks to https://github.com/paneq/active_reload and Pastorino for the inspiration. <3
---
 actionpack/test/dispatch/reloader_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/reloader_test.rb b/actionpack/test/dispatch/reloader_test.rb
index bd24256427..3411bd14ea 100644
--- a/actionpack/test/dispatch/reloader_test.rb
+++ b/actionpack/test/dispatch/reloader_test.rb
@@ -129,6 +129,15 @@ class ReloaderTest < Test::Unit::TestCase
     assert cleaned
   end
 
+  def test_prepend_prepare_callback
+    i = 10
+    Reloader.to_prepare { i += 1 }
+    Reloader.to_prepare(:prepend => true) { i = 0 }
+
+    Reloader.prepare!
+    assert_equal 1, i
+  end
+
   def test_cleanup_callbacks_are_called_on_exceptions
     cleaned = false
     Reloader.to_cleanup { cleaned  = true }
-- 
cgit v1.2.3


From 196407c54f0736c275d2ad4e6f8b0ac55360ad95 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 12 Dec 2011 14:05:25 -0800
Subject: Include TagHelper but don't explicitly require it

Allow autoloading to work as intended and avoid multiple requires.
---
 actionpack/lib/action_view/helpers/sanitize_helper.rb | 1 -
 actionpack/lib/action_view/helpers/text_helper.rb     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index bcc8f6fbcb..7768c8c151 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/object/try'
 require 'action_controller/vendor/html-scanner'
-require 'action_view/helpers/tag_helper'
 
 module ActionView
   # = Action View Sanitize Helpers
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index bc8572fe69..209360ee82 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/filters'
-require 'action_view/helpers/tag_helper'
 
 module ActionView
   # = Action View Text Helpers
@@ -31,6 +30,7 @@ module ActionView
       extend ActiveSupport::Concern
 
       include SanitizeHelper
+      include TagHelper
       # The preferred method of outputting text in your views is to use the
       # <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
       # do not operate as expected in an eRuby code block. If you absolutely must
-- 
cgit v1.2.3


From 676092f7619e6b42b69b57ed38a04e5e47907617 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 12 Dec 2011 16:02:59 -0800
Subject: logger adds a newline for us

---
 actionpack/lib/action_controller/log_subscriber.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index de250053d3..4c76f4c43b 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -24,7 +24,6 @@ module ActionController
       end
       message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration
       message << " (#{additions.join(" | ")})" unless additions.blank?
-      message << "\n"
 
       info(message)
     end
-- 
cgit v1.2.3


From 810837dda890a5bc5d0b4d65b973ca0ccc9465bd Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 12 Dec 2011 19:45:16 -0800
Subject: use Array#join so that file encoding doesn't impact returned string.
 Fixes #3957

---
 actionpack/lib/action_dispatch/http/response.rb | 6 +++---
 actionpack/test/dispatch/response_test.rb       | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index fc840668d5..5797c63924 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -111,9 +111,9 @@ module ActionDispatch # :nodoc:
     end
 
     def body
-      str = ''
-      each { |part| str << part.to_s }
-      str
+      strings = []
+      each { |part| strings << part.to_s }
+      strings.join
     end
 
     EMPTY = " "
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 337ece6b88..9bdd5ecbc6 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -5,6 +5,15 @@ class ResponseTest < ActiveSupport::TestCase
     @response = ActionDispatch::Response.new
   end
 
+  def test_response_body_encoding
+    # FIXME: remove this conditional on Rails 4.0
+    return unless "<3".encoding_aware?
+
+    body = ["hello".encode('utf-8')]
+    response = ActionDispatch::Response.new 200, {}, body
+    assert_equal Encoding::UTF_8, response.body.encoding
+  end
+
   test "simple output" do
     @response.body = "Hello, World!"
 
-- 
cgit v1.2.3


From 0f4da5b39394fe1096e93a7f2600f4d90330d1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 13 Dec 2011 15:39:58 +0100
Subject: Fix failing AP tests.

---
 actionpack/test/dispatch/routing_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 19eee379fd..bc4e2e31c8 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2296,7 +2296,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   def test_named_routes_collision_is_avoided_unless_explicitly_given_as
     assert_equal "/c/1", routes_collision_path(1)
-    assert_equal "/forced_collision", routes_forced_collision_path
+    assert_equal "/fc", routes_forced_collision_path
   end
 
   def test_redirect_argument_error
-- 
cgit v1.2.3


From 8b85e4a4a1668805f645d75bbed27ecb43491bff Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 13 Dec 2011 11:13:03 -0800
Subject: stop freezing hash value

---
 actionpack/lib/action_view/lookup_context.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index f586708d54..c1686848dd 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -87,7 +87,7 @@ module ActionView
       def _set_detail(key, value)
         @details_key = nil
         @details = @details.dup if @details.frozen?
-        @details[key] = value.freeze
+        @details[key] = value
       end
     end
 
-- 
cgit v1.2.3


From 9d87a67590c05114d88eccd6a856d2f054860cdb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 13 Dec 2011 11:25:03 -0800
Subject: stop freezing the details hash

---
 actionpack/lib/action_view/lookup_context.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index c1686848dd..089d3b1e57 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -56,7 +56,7 @@ module ActionView
       @details_keys = Hash.new
 
       def self.get(details)
-        @details_keys[details.freeze] ||= new
+        @details_keys[details] ||= new
       end
 
       def initialize
@@ -86,7 +86,6 @@ module ActionView
 
       def _set_detail(key, value)
         @details_key = nil
-        @details = @details.dup if @details.frozen?
         @details[key] = value
       end
     end
-- 
cgit v1.2.3


From ab802e72dc08a44e1a9fe767635dfd184274caad Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 13 Dec 2011 11:28:30 -0800
Subject: locale and default_locale may be the same, so uniq the array

---
 actionpack/lib/action_view/lookup_context.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 089d3b1e57..95478b9af6 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -44,7 +44,7 @@ module ActionView
     module Accessors #:nodoc:
     end
 
-    register_detail(:locale)  { [I18n.locale, I18n.default_locale] }
+    register_detail(:locale)  { [I18n.locale, I18n.default_locale].uniq }
     register_detail(:formats) { Mime::SET.symbols }
     register_detail(:handlers){ Template::Handlers.extensions }
 
-- 
cgit v1.2.3


From 081431fdf180ec7395c769793b2270d244566ca2 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Tue, 13 Dec 2011 22:32:39 +0300
Subject: log exception backtrace when all backtrace lines silenced

---
 .../lib/action_dispatch/middleware/debug_exceptions.rb      |  5 ++++-
 actionpack/test/dispatch/debug_exceptions_test.rb           | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 417701ea54..cd4af82c6e 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -59,10 +59,13 @@ module ActionDispatch
 
       exception = wrapper.exception
 
+      trace = wrapper.application_trace
+      trace = wrapper.framework_trace if trace.empty?
+
       ActiveSupport::Deprecation.silence do
         message = "\n#{exception.class} (#{exception.message}):\n"
         message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
-        message << "  " << wrapper.application_trace.join("\n  ")
+        message << "  " << trace.join("\n  ")
         logger.fatal("#{message}\n\n")
       end
     end
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index f7411c7729..6133bfe338 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -122,4 +122,17 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     get "/", {}, {'action_dispatch.show_exceptions' => true, 'action_dispatch.backtrace_cleaner' => cleaner}
     assert_match(/passed backtrace cleaner/, body)
   end
+
+  test 'logs exception backtrace when all lines silenced' do
+    output = StringIO.new
+    backtrace_cleaner = ActiveSupport::BacktraceCleaner.new
+    backtrace_cleaner.add_silencer { true }
+
+    env = {'action_dispatch.show_exceptions' => true,
+           'action_dispatch.logger' => Logger.new(output),
+           'action_dispatch.backtrace_cleaner' => backtrace_cleaner}
+
+    get "/", {}, env
+    assert_operator (output.rewind && output.read).lines.count, :>, 10
+  end
 end
-- 
cgit v1.2.3


From c7552d988e5dec76d6c515a86f73701b647aa784 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 13 Dec 2011 15:26:29 -0800
Subject: dup the details hash if a key has already been set for this object

---
 actionpack/lib/action_view/lookup_context.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 95478b9af6..9bf4289f42 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -85,6 +85,7 @@ module ActionView
     protected
 
       def _set_detail(key, value)
+        @details = @details.dup if @details_key
         @details_key = nil
         @details[key] = value
       end
-- 
cgit v1.2.3


From f3531a8fc9f661f96759f0a851540745876e5d6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 14 Dec 2011 09:23:34 +0100
Subject: Clean up details keys before some tests to expire the cache.

---
 actionpack/lib/action_view/lookup_context.rb        | 4 ++++
 actionpack/test/template/compiled_templates_test.rb | 4 ++++
 actionpack/test/template/lookup_context_test.rb     | 8 +-------
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 9bf4289f42..3bb2b98e48 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -59,6 +59,10 @@ module ActionView
         @details_keys[details] ||= new
       end
 
+      def self.clear
+        @details_keys.clear
+      end
+
       def initialize
         @hash = object_hash
       end
diff --git a/actionpack/test/template/compiled_templates_test.rb b/actionpack/test/template/compiled_templates_test.rb
index 8fc78283d8..30d798d693 100644
--- a/actionpack/test/template/compiled_templates_test.rb
+++ b/actionpack/test/template/compiled_templates_test.rb
@@ -3,6 +3,10 @@ require 'controller/fake_models'
 
 class CompiledTemplatesTest < Test::Unit::TestCase
   def setup
+    # Clean up any details key cached to expose failures
+    # that otherwise would appear just on isolated tests
+    ActionView::LookupContext::DetailsKey.clear
+
     @compiled_templates = ActionView::CompiledTemplates
     @compiled_templates.instance_methods.each do |m|
       @compiled_templates.send(:remove_method, m) if m =~ /^_render_template_/
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index bac2530e3d..c65f707da0 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -1,20 +1,14 @@
 require "abstract_unit"
 require "abstract_controller/rendering"
 
-ActionView::LookupContext::DetailsKey.class_eval do
-  def self.details_keys
-    @details_keys
-  end
-end
-
 class LookupContextTest < ActiveSupport::TestCase
   def setup
     @lookup_context = ActionView::LookupContext.new(FIXTURE_LOAD_PATH, {})
+    ActionView::LookupContext::DetailsKey.clear
   end
 
   def teardown
     I18n.locale = :en
-    ActionView::LookupContext::DetailsKey.details_keys.clear
   end
 
   test "process view paths on initialization" do
-- 
cgit v1.2.3


From 5f67cfeda116f2b932ef72781420aa37e62437ca Mon Sep 17 00:00:00 2001
From: choonkeat <choonkeat@gmail.com>
Date: Wed, 14 Dec 2011 22:43:42 +0800
Subject: Fix url_for options[:subdomain] to allow objects as values * e.g.
 blog_url(subdomain: current_user) instead of blog_url(subdomain:
 current_user.to_param)

---
 actionpack/lib/action_dispatch/http/url.rb | 2 +-
 actionpack/test/controller/url_for_test.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 129a8b1031..64459836b5 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -70,7 +70,7 @@ module ActionDispatch
 
           host = ""
           unless options[:subdomain] == false
-            host << (options[:subdomain] || extract_subdomain(options[:host], tld_length))
+            host << (options[:subdomain] || extract_subdomain(options[:host], tld_length)).to_param
             host << "."
           end
           host << (options[:domain] || extract_domain(options[:host], tld_length))
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index dc07e07cb9..288efbf7c3 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -71,6 +71,14 @@ module AbstractController
         )
       end
 
+      def test_subdomain_may_be_object
+        model = mock(:to_param => 'api')
+        add_host!
+        assert_equal('http://api.basecamphq.com/c/a/i',
+          W.new.url_for(:subdomain => model, :controller => 'c', :action => 'a', :id => 'i')
+        )
+      end
+
       def test_subdomain_may_be_removed
         add_host!
         assert_equal('http://basecamphq.com/c/a/i',
-- 
cgit v1.2.3


From e3a4eb4b4067ee7d906babd029e60565001f7808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 14 Dec 2011 17:03:35 +0100
Subject: Close the response body on cascade pass, closes #3975.

---
 .../action_dispatch/middleware/debug_exceptions.rb |  2 ++
 actionpack/test/dispatch/debug_exceptions_test.rb  | 25 +++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index cd4af82c6e..3904183823 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -17,6 +17,8 @@ module ActionDispatch
 
         # TODO: Maybe this should be in the router itself
         if response[1]['X-Cascade'] == 'pass'
+          body = response[2]
+          body.close if body.respond_to?(:close)
           raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
         end
       rescue Exception => exception
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index 6133bfe338..29fc248acc 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -3,8 +3,18 @@ require 'abstract_unit'
 class DebugExceptionsTest < ActionDispatch::IntegrationTest
 
   class Boomer
+    attr_accessor :closed
+
     def initialize(detailed  = false)
       @detailed = detailed
+      @closed = false
+    end
+
+    def each
+    end
+
+    def close
+      @closed = true
     end
 
     def call(env)
@@ -12,7 +22,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
       req = ActionDispatch::Request.new(env)
       case req.path
       when "/pass"
-        [404, { "X-Cascade" => "pass" }, []]
+        [404, { "X-Cascade" => "pass" }, self]
       when "/not_found"
         raise ActionController::UnknownAction
       when "/runtime_error"
@@ -31,8 +41,8 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  ProductionApp  = ActionDispatch::DebugExceptions.new((Boomer.new(false)))
-  DevelopmentApp = ActionDispatch::DebugExceptions.new((Boomer.new(true)))
+  ProductionApp  = ActionDispatch::DebugExceptions.new(Boomer.new(false))
+  DevelopmentApp = ActionDispatch::DebugExceptions.new(Boomer.new(true))
 
   test 'skip diagnosis if not showing detailed exceptions' do
     @app = ProductionApp
@@ -55,6 +65,15 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test 'closes the response body on cascade pass' do
+    boomer = Boomer.new(false)
+    @app = ActionDispatch::DebugExceptions.new(boomer)
+    assert_raise ActionController::RoutingError do
+      get "/pass", {}, {'action_dispatch.show_exceptions' => true}
+    end
+    assert boomer.closed, "Expected to close the response body"
+  end
+
   test "rescue with diagnostics message" do
     @app = DevelopmentApp
 
-- 
cgit v1.2.3


From caa1c1978733b6271309db5af488c39aacff6c5a Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Wed, 14 Dec 2011 23:20:23 +0300
Subject: fix separator insertion in date_select helper

---
 actionpack/lib/action_view/helpers/date_helper.rb |  3 ++-
 actionpack/test/template/date_helper_test.rb      | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 38cf922ef4..dd2b59cb0a 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -947,8 +947,9 @@ module ActionView
         # and join them with their appropriate separators.
         def build_selects_from_types(order)
           select = ''
+          first_visible = order.find { |type| !@options[:"discard_#{type}"] }
           order.reverse.each do |type|
-            separator = separator(type) unless type == order.first # don't add on last field
+            separator = separator(type) unless type == first_visible # don't add before first visible field
             select.insert(0, separator.to_s + send("select_#{type}").to_s)
           end
           select.html_safe
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 57a5895cec..fadfb59572 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1396,6 +1396,25 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :order => [ :month, :year ])
   end
 
+  def test_date_select_without_day_with_separator
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = "<input type=\"hidden\" id=\"post_written_on_3i\" name=\"post[written_on(3i)]\" value=\"1\" />\n"
+
+    expected <<  %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << "/"
+
+    expected << %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :date_separator => '/', :order => [ :month, :year ])
+  end
+
   def test_date_select_without_day_and_with_disabled_html_option
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
-- 
cgit v1.2.3


From b6105b0b59073efe7d8c5fad0b2246d0534030e1 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 14 Dec 2011 13:26:41 -0800
Subject: updating arel and journey dependencies

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index d6e9519915..1aa346929e 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n',          '~> 0.6')
   s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
-  s.add_dependency('journey',       '~> 1.0.0')
+  s.add_dependency('journey',       '~> 1.0.0.rc1')
   s.add_dependency('sprockets',     '~> 2.1.2')
   s.add_dependency('erubis',        '~> 2.7.0')
 
-- 
cgit v1.2.3


From dcd59f2d9f23257def7baee432929da037183ea9 Mon Sep 17 00:00:00 2001
From: Nick Howard <ndh@baroquebobcat.com>
Date: Wed, 14 Dec 2011 15:38:15 -0700
Subject: escape assigns[:person], assigns[person] etc in actioncontroller
 testcase

---
 actionpack/lib/action_controller/test_case.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 1731388bf3..7470897659 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -298,11 +298,11 @@ module ActionController
   #   assert_equal "Dave", cookies[:name] # makes sure that a cookie called :name was set as "Dave"
   #   assert flash.empty? # makes sure that there's nothing in the flash
   #
-  # For historic reasons, the assigns hash uses string-based keys. So assigns[:person] won't work, but assigns["person"] will. To
+  # For historic reasons, the assigns hash uses string-based keys. So <tt>assigns[:person]</tt> won't work, but <tt>assigns["person"]</tt> will. To
   # appease our yearning for symbols, though, an alternative accessor has been devised using a method call instead of index referencing.
-  # So assigns(:person) will work just like assigns["person"], but again, assigns[:person] will not work.
+  # So <tt>assigns(:person)</tt> will work just like <tt>assigns["person"]</tt>, but again, <tt>assigns[:person]</tt> will not work.
   #
-  # On top of the collections, you have the complete url that a given action redirected to available in redirect_to_url.
+  # On top of the collections, you have the complete url that a given action redirected to available in <tt>redirect_to_url</tt>.
   #
   # For redirects within the same controller, you can even call follow_redirect and the redirect will be followed, triggering another
   # action call which can then be asserted against.
-- 
cgit v1.2.3


From 8d827325d08e2e080be3d1ed4a827eaa97d20bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Thu, 15 Dec 2011 06:52:05 +0200
Subject: Remove autoload for non-existent file.

---
 actionpack/lib/action_dispatch/routing.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing.rb b/actionpack/lib/action_dispatch/routing.rb
index 1dcd83ceb5..fa300b4a16 100644
--- a/actionpack/lib/action_dispatch/routing.rb
+++ b/actionpack/lib/action_dispatch/routing.rb
@@ -277,7 +277,6 @@ module ActionDispatch
   #
   module Routing
     autoload :Mapper, 'action_dispatch/routing/mapper'
-    autoload :Route, 'action_dispatch/routing/route'
     autoload :RouteSet, 'action_dispatch/routing/route_set'
     autoload :RoutesProxy, 'action_dispatch/routing/routes_proxy'
     autoload :UrlFor, 'action_dispatch/routing/url_for'
-- 
cgit v1.2.3


From 26e7400cc5415dbce5e2c5d13da96ad8c25749e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 15 Dec 2011 19:43:49 +0100
Subject: Fix diagnostics page for routing errors.

---
 actionpack/CHANGELOG.md                            |  4 ++--
 actionpack/lib/action_controller/metal/rescue.rb   |  9 ++-------
 actionpack/lib/action_controller/railtie.rb        |  2 --
 actionpack/test/controller/show_exceptions_test.rb | 13 ++++++++++---
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b354f05960..da18060202 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -68,9 +68,9 @@
           <%= f.text_field :version %>
         <% end %>
 
-*   Refactor ActionDispatch::ShowExceptions. Controller is responsible for choice to show exceptions. *Sergey Nartimov*
+*   Refactor ActionDispatch::ShowExceptions. Controller is responsible for choosing to show exceptions when `consider_all_requests_local` is false. *Sergey Nartimov*
 
-    It's possible to override +show_detailed_exceptions?+ in controllers to specify which requests should provide debugging information on errors.
+    It's possible to override `show_detailed_exceptions?` in controllers to specify which requests should provide debugging information on errors.
 
 *   Responders now return 204 No Content for API requests without a response body (as in the new scaffold) *José Valim*
 
diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb
index 736ff5b31c..c4b056ebc0 100644
--- a/actionpack/lib/action_controller/metal/rescue.rb
+++ b/actionpack/lib/action_controller/metal/rescue.rb
@@ -3,11 +3,6 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
 
-    included do
-      config_accessor :consider_all_requests_local
-      self.consider_all_requests_local = false if consider_all_requests_local.nil?
-    end
-
     def rescue_with_handler(exception)
       if (exception.respond_to?(:original_exception) &&
           (orig_exception = exception.original_exception) &&
@@ -18,14 +13,14 @@ module ActionController #:nodoc:
     end
 
     def show_detailed_exceptions?
-      consider_all_requests_local || request.local?
+      request.local?
     end
 
     private
       def process_action(*args)
         super
       rescue Exception => exception
-        request.env['action_dispatch.show_detailed_exceptions'] = show_detailed_exceptions?
+        request.env['action_dispatch.show_detailed_exceptions'] ||= show_detailed_exceptions?
         rescue_with_handler(exception) || raise(exception)
       end
   end
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index cb2e2b17aa..7af256fd99 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -21,8 +21,6 @@ module ActionController
       paths   = app.config.paths
       options = app.config.action_controller
 
-      options.consider_all_requests_local ||= app.config.consider_all_requests_local
-
       options.assets_dir           ||= paths["public"].first
       options.javascripts_dir      ||= paths["public/javascripts"].first
       options.stylesheets_dir      ||= paths["public/stylesheets"].first
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 5eff1eb09d..2f5c268330 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -5,9 +5,17 @@ module ShowExceptions
     use ActionDispatch::ShowExceptions
     use ActionDispatch::DebugExceptions
 
+    before_filter :only => :another_boom do
+      request.env["action_dispatch.show_detailed_exceptions"] = true
+    end
+
     def boom
       raise 'boom!'
     end
+
+    def another_boom
+      raise 'boom!'
+    end
   end
 
   class ShowExceptionsTest < ActionDispatch::IntegrationTest
@@ -27,9 +35,8 @@ module ShowExceptions
       end
     end
 
-    test 'show diagnostics from a remote ip when consider_all_requests_local is true' do
-      ShowExceptionsController.any_instance.stubs(:consider_all_requests_local).returns(true)
-      @app = ShowExceptionsController.action(:boom)
+    test 'show diagnostics from a remote ip when env is already set' do
+      @app = ShowExceptionsController.action(:another_boom)
       self.remote_addr = '208.77.188.166'
       get '/'
       assert_match(/boom/, body)
-- 
cgit v1.2.3


From 5e0dec5e1042e67fb50adc8c073216195ed23ceb Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 15 Dec 2011 12:56:00 -0800
Subject: it's -> its

---
 actionpack/test/controller/default_url_options_with_filter_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/default_url_options_with_filter_test.rb b/actionpack/test/controller/default_url_options_with_filter_test.rb
index 3bbb981040..ef028e8cdb 100644
--- a/actionpack/test/controller/default_url_options_with_filter_test.rb
+++ b/actionpack/test/controller/default_url_options_with_filter_test.rb
@@ -21,7 +21,7 @@ end
 
 class ControllerWithBeforeFilterAndDefaultUrlOptionsTest < ActionController::TestCase
 
-  # This test has it´s roots in issue #1872
+  # This test has its roots in issue #1872
   test "should redirect with correct locale :de" do
     get :redirect, :locale => "de"
     assert_redirected_to "/controller_with_before_filter_and_default_url_options/target?locale=de"
-- 
cgit v1.2.3


From aa39149b2f20963d883130f24679292c3ed39bd0 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 16 Dec 2011 10:30:20 +0530
Subject: Warning removed "warning: (...) interpreted as grouped expression"

---
 actionpack/test/dispatch/debug_exceptions_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index 29fc248acc..f3dc160d7d 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -152,6 +152,6 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
            'action_dispatch.backtrace_cleaner' => backtrace_cleaner}
 
     get "/", {}, env
-    assert_operator (output.rewind && output.read).lines.count, :>, 10
+    assert_operator((output.rewind && output.read).lines.count, :>, 10)
   end
 end
-- 
cgit v1.2.3


From d1425725673b0172d6561adebaed017b51db9333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 09:06:30 +0100
Subject: Get rid of the close checks since we cannot reliably close the
 session anyway.

---
 actionpack/lib/action_dispatch.rb                  |  1 -
 .../lib/action_dispatch/middleware/closed_error.rb |  7 --
 .../lib/action_dispatch/middleware/cookies.rb      | 10 ---
 actionpack/lib/action_dispatch/middleware/flash.rb |  6 --
 .../middleware/session/abstract_store.rb           |  4 -
 actionpack/test/controller/flash_test.rb           | 40 ---------
 actionpack/test/dispatch/cookies_test.rb           | 98 +---------------------
 7 files changed, 1 insertion(+), 165 deletions(-)
 delete mode 100644 actionpack/lib/action_dispatch/middleware/closed_error.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 89f515ee3d..38c361c100 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -63,7 +63,6 @@ module ActionDispatch
     autoload :Static
   end
 
-  autoload :ClosedError, 'action_dispatch/middleware/closed_error'
   autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
   autoload :Routing
 
diff --git a/actionpack/lib/action_dispatch/middleware/closed_error.rb b/actionpack/lib/action_dispatch/middleware/closed_error.rb
deleted file mode 100644
index 0a4db47f4b..0000000000
--- a/actionpack/lib/action_dispatch/middleware/closed_error.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module ActionDispatch
-  class ClosedError < StandardError #:nodoc:
-    def initialize(kind)
-      super "Cannot modify #{kind} because it was closed. This means it was already streamed back to the client or converted to HTTP headers."
-    end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index 51cec41a34..39ff58a447 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -121,10 +121,6 @@ module ActionDispatch
         @cookies = {}
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
-
       def each(&block)
         @cookies.each(&block)
       end
@@ -165,7 +161,6 @@ module ActionDispatch
       # Sets the cookie named +name+. The second argument may be the very cookie
       # value, or a hash of options as documented above.
       def []=(key, options)
-        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
           value = options[:value]
@@ -259,7 +254,6 @@ module ActionDispatch
       end
 
       def []=(key, options)
-        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
         else
@@ -298,7 +292,6 @@ module ActionDispatch
       end
 
       def []=(key, options)
-        raise ClosedError, :cookies if closed?
         if options.is_a?(Hash)
           options.symbolize_keys!
           options[:value] = @verifier.generate(options[:value])
@@ -352,9 +345,6 @@ module ActionDispatch
       end
 
       [status, headers, body]
-    ensure
-      cookie_jar = ActionDispatch::Request.new(env).cookie_jar unless cookie_jar
-      cookie_jar.close!
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index e59404ef68..bc5b163931 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -93,7 +93,6 @@ module ActionDispatch
       end
 
       def []=(k, v) #:nodoc:
-        raise ClosedError, :flash if closed?
         keep(k)
         @flashes[k] = v
       end
@@ -159,10 +158,6 @@ module ActionDispatch
         @now ||= FlashNow.new(self)
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true; end
-
       # Keeps either the entire current flash or a specific flash entry available for the next action:
       #
       #    flash.keep            # keeps the entire flash
@@ -258,7 +253,6 @@ module ActionDispatch
         end
 
         env[KEY] = new_hash
-        new_hash.close!
       end
 
       if session.key?('flash') && session['flash'].empty?
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 6bcf099d2c..f75b4d4d04 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -74,10 +74,6 @@ module ActionDispatch
     class AbstractStore < Rack::Session::Abstract::ID
       include Compatibility
       include StaleSessionCheck
-
-      def destroy_session(env, sid, options)
-        raise '#destroy_session needs to be implemented.'
-      end
     end
   end
 end
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index e19612eace..d497913dc4 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -254,16 +254,6 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_setting_flash_raises_after_stream_back_to_client
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/set_flash', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash['alert'] = 'alert'
-      }
-    end
-  end
-
   def test_setting_flash_does_not_raise_in_following_requests
     with_test_route_set do
       env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
@@ -280,36 +270,6 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_setting_flash_raises_after_stream_back_to_client_even_with_an_empty_flash
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/dont_set_flash', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_flash_now_raises_after_stream_back_to_client
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/set_flash_now', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash.now['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_flash_now_raises_after_stream_back_to_client_even_with_an_empty_flash
-    with_test_route_set do
-      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-      get '/dont_set_flash', nil, env
-      assert_raise(ActionDispatch::ClosedError) {
-        @request.flash.now['alert'] = 'alert'
-      }
-    end
-  end
-
   private
 
     # Overwrite get to send SessionSecret in env hash
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 3765b7eb44..6ebd02e85c 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -564,100 +564,4 @@ class CookiesTest < ActionController::TestCase
         assert_not_equal expected.split("\n"), header
       end
     end
-end
-
-class CookiesIntegrationTest < ActionDispatch::IntegrationTest
-  SessionKey = '_myapp_session'
-  SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
-
-  class TestController < ActionController::Base
-    def dont_set_cookies
-      head :ok
-    end
-
-    def set_cookies
-      cookies["that"] = "hello"
-      head :ok
-    end
-  end
-
-  def test_setting_cookies_raises_after_stream_back_to_client
-    with_test_route_set do
-      get '/set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar['alert'] = 'alert'
-        cookies['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_cookies_raises_after_stream_back_to_client_even_without_cookies
-    with_test_route_set do
-      get '/dont_set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_permanent_cookies_raises_after_stream_back_to_client
-    with_test_route_set do
-      get '/set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.permanent['alert'] = 'alert'
-        cookies['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_permanent_cookies_raises_after_stream_back_to_client_even_without_cookies
-    with_test_route_set do
-      get '/dont_set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.permanent['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_signed_cookies_raises_after_stream_back_to_client
-    with_test_route_set do
-      get '/set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.signed['alert'] = 'alert'
-        cookies['alert'] = 'alert'
-      }
-    end
-  end
-
-  def test_setting_signed_cookies_raises_after_stream_back_to_client_even_without_cookies
-    with_test_route_set do
-      get '/dont_set_cookies'
-      assert_raise(ActionDispatch::ClosedError) {
-        request.cookie_jar.signed['alert'] = 'alert'
-      }
-    end
-  end
-
-  private
-
-  # Overwrite get to send SessionSecret in env hash
-  def get(path, parameters = nil, env = {})
-    env["action_dispatch.secret_token"] ||= SessionSecret
-    super
-  end
-
-  def with_test_route_set
-    with_routing do |set|
-      set.draw do
-        match ':action', :to => CookiesIntegrationTest::TestController
-      end
-
-      @app = self.class.build_app(set) do |middleware|
-        middleware.use ActionDispatch::Cookies
-        middleware.delete "ActionDispatch::ShowExceptions"
-      end
-
-      yield
-    end
-  end
-end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From deef8dd68241cdb9826a2293bced5e2257ccea90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 09:29:37 +0100
Subject: Extract the rendering of public exceptions pages into a Rack app.

---
 actionpack/lib/action_dispatch.rb                  |  1 +
 .../middleware/public_exceptions.rb                | 30 +++++++++++++
 .../action_dispatch/middleware/show_exceptions.rb  | 51 ++++++++--------------
 actionpack/test/abstract_unit.rb                   | 10 +----
 actionpack/test/controller/show_exceptions_test.rb |  2 +-
 actionpack/test/dispatch/show_exceptions_test.rb   |  2 +-
 6 files changed, 52 insertions(+), 44 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/public_exceptions.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 38c361c100..4b821037dc 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -56,6 +56,7 @@ module ActionDispatch
     autoload :Flash
     autoload :Head
     autoload :ParamsParser
+    autoload :PublicExceptions
     autoload :Reloader
     autoload :RemoteIp
     autoload :Rescue
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
new file mode 100644
index 0000000000..6600d6232e
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
@@ -0,0 +1,30 @@
+module ActionDispatch
+  # A simple Rack application that renders exceptions in the given public path.
+  class PublicExceptions
+    attr_accessor :public_path
+
+    def initialize(public_path)
+      @public_path = public_path
+    end
+
+    def call(env)
+      status      = env["PATH_INFO"][1..-1]
+      locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
+      path        = "#{public_path}/#{status}.html"
+
+      if locale_path && File.exist?(locale_path)
+        render(status, File.read(locale_path))
+      elsif File.exist?(path)
+        render(status, File.read(path))
+      else
+        render(status, '')
+      end
+    end
+
+    private
+
+    def render(status, body)
+      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 0c95248611..4cfcb0a7db 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -6,8 +6,6 @@ module ActionDispatch
   # This middleware rescues any exception returned by the application
   # and wraps them in a format for the end user.
   class ShowExceptions
-    RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
-
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
       ["<html><body><h1>500 Internal Server Error</h1>" <<
        "If you are the administrator of this website, then please read this web " <<
@@ -28,9 +26,19 @@ module ActionDispatch
       end
     end
 
-    def initialize(app, consider_all_requests_local = nil)
-      ActiveSupport::Deprecation.warn "Passing consider_all_requests_local option to ActionDispatch::ShowExceptions middleware no longer works" unless consider_all_requests_local.nil?
+    def initialize(app, exceptions_app = nil)
+      if [true, false].include?(exceptions_app)
+        ActiveSupport::Deprecation.warn "Passing consider_all_requests_local option to ActionDispatch::ShowExceptions middleware no longer works"
+        exceptions_app = nil
+      end
+
+      if exceptions_app.nil?
+        raise ArgumentError, "You need to pass an exceptions_app when initializing ActionDispatch::ShowExceptions. " \
+          "In case you want to render pages from a public path, you can use ActionDispatch::PublicExceptions.new('path/to/public')"
+      end
+
       @app = app
+      @exceptions_app = exceptions_app
     end
 
     def call(env)
@@ -40,7 +48,7 @@ module ActionDispatch
         raise exception if env['action_dispatch.show_exceptions'] == false
       end
 
-      response || render_exception_with_failsafe(env, exception)
+      response || render_exception(env, exception)
     end
 
     private
@@ -50,37 +58,14 @@ module ActionDispatch
     def status_code(*)
     end
 
-    def render_exception_with_failsafe(env, exception)
-      render_exception(env, exception)
+    def render_exception(env, exception)
+      wrapper = ExceptionWrapper.new(env, exception)
+      env["action_dispatch.exception"] = wrapper.exception
+      env["PATH_INFO"] = "/#{wrapper.status_code}"
+      @exceptions_app.call(env)
     rescue Exception => failsafe_error
       $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
       FAILSAFE_RESPONSE
     end
-
-    def render_exception(env, exception)
-      wrapper = ExceptionWrapper.new(env, exception)
-
-      status      = wrapper.status_code
-      locale_path = "#{public_path}/#{status}.#{I18n.locale}.html" if I18n.locale
-      path        = "#{public_path}/#{status}.html"
-
-      if locale_path && File.exist?(locale_path)
-        render(status, File.read(locale_path))
-      elsif File.exist?(path)
-        render(status, File.read(path))
-      else
-        render(status, '')
-      end
-    end
-
-    def render(status, body)
-      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
-    end
-
-    # TODO: Make this a middleware initialization parameter once
-    # we removed the second option (which is deprecated)
-    def public_path
-      defined?(Rails.public_path) ? Rails.public_path : 'public_path'
-    end
   end
 end
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index c95b8221a1..40ca23a39d 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -174,7 +174,7 @@ class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
 
   def self.build_app(routes = nil)
     RoutedRackApp.new(routes || ActionDispatch::Routing::RouteSet.new) do |middleware|
-      middleware.use "ActionDispatch::ShowExceptions"
+      middleware.use "ActionDispatch::ShowExceptions", ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
       middleware.use "ActionDispatch::DebugExceptions"
       middleware.use "ActionDispatch::Callbacks"
       middleware.use "ActionDispatch::ParamsParser"
@@ -337,14 +337,6 @@ class Workshop
 end
 
 module ActionDispatch
-  class ShowExceptions
-    private
-    remove_method :public_path
-    def public_path
-      "#{FIXTURE_LOAD_PATH}/public"
-    end
-  end
-
   class DebugExceptions
     private
     remove_method :stderr_logger
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 2f5c268330..ba78559f31 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -2,7 +2,7 @@ require 'abstract_unit'
 
 module ShowExceptions
   class ShowExceptionsController < ActionController::Base
-    use ActionDispatch::ShowExceptions
+    use ActionDispatch::ShowExceptions, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public")
     use ActionDispatch::DebugExceptions
 
     before_filter :only => :another_boom do
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 020cc80f3f..d3c99e4f31 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -18,7 +18,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     end
   end
 
-  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new)
+  ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public"))
 
   test 'skip diagnosis if not showing exceptions' do
     @app = ProductionApp
-- 
cgit v1.2.3


From 7dd1c751f90858cbdfaebeafed5fdf1ef400ae8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 09:45:14 +0100
Subject: Improve the specs on exceptions app.

---
 .../lib/action_dispatch/middleware/show_exceptions.rb     |  7 ++++++-
 actionpack/test/dispatch/show_exceptions_test.rb          | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 4cfcb0a7db..5323048d90 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -4,7 +4,12 @@ require 'active_support/deprecation'
 
 module ActionDispatch
   # This middleware rescues any exception returned by the application
-  # and wraps them in a format for the end user.
+  # and calls a rack application that will wrap it in a format for the end user.
+  #
+  # The rack application should be passed as parameter on initialization
+  # of ShowExceptions. Everytime there is an exception, ShowExceptions will
+  # store the exception in env["action_dispatch.exception"], rewrite the
+  # PATH_INFO to the exception status code and call the rack app.
   class ShowExceptions
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
       ["<html><body><h1>500 Internal Server Error</h1>" <<
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index d3c99e4f31..0ebe281ada 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -20,7 +20,7 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
 
   ProductionApp = ActionDispatch::ShowExceptions.new(Boomer.new, ActionDispatch::PublicExceptions.new("#{FIXTURE_LOAD_PATH}/public"))
 
-  test 'skip diagnosis if not showing exceptions' do
+  test "skip exceptions app if not showing exceptions" do
     @app = ProductionApp
     assert_raise RuntimeError do
       get "/", {}, {'action_dispatch.show_exceptions' => false}
@@ -75,4 +75,17 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_response 404
     assert_match(/404 error/, body)
   end
+
+  test "calls custom exceptions app" do
+    exceptions_app = lambda do |env|
+      assert_kind_of AbstractController::ActionNotFound, env["action_dispatch.exception"]
+      assert_equal "/404", env["PATH_INFO"]
+      [404, { "Content-Type" => "text/plain" }, ["YOU FAILED BRO"]]
+    end
+
+    @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
+    get "/not_found_original_exception", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 404
+    assert_equal "YOU FAILED BRO", body
+  end
 end
-- 
cgit v1.2.3


From 5359262695b491422b18c565567e16ad50f6155e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 09:59:36 +0100
Subject: ShowExceptions should understand X-Cascade responses from exceptions
 app.

---
 .../action_dispatch/middleware/debug_exceptions.rb    |  1 -
 .../action_dispatch/middleware/public_exceptions.rb   |  2 +-
 .../lib/action_dispatch/middleware/show_exceptions.rb | 19 +++++++++++++++----
 actionpack/test/dispatch/show_exceptions_test.rb      | 11 +++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 3904183823..dabbabb1e6 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -15,7 +15,6 @@ module ActionDispatch
       begin
         response = @app.call(env)
 
-        # TODO: Maybe this should be in the router itself
         if response[1]['X-Cascade'] == 'pass'
           body = response[2]
           body.close if body.respond_to?(:close)
diff --git a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
index 6600d6232e..85b8d178bf 100644
--- a/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/public_exceptions.rb
@@ -17,7 +17,7 @@ module ActionDispatch
       elsif File.exist?(path)
         render(status, File.read(path))
       else
-        render(status, '')
+        [404, { "X-Cascade" => "pass" }, []]
       end
     end
 
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 5323048d90..5eceeece1f 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -4,12 +4,17 @@ require 'active_support/deprecation'
 
 module ActionDispatch
   # This middleware rescues any exception returned by the application
-  # and calls a rack application that will wrap it in a format for the end user.
+  # and calls an exceptions app that will wrap it in a format for the end user.
   #
-  # The rack application should be passed as parameter on initialization
+  # The exceptions app should be passed as parameter on initialization
   # of ShowExceptions. Everytime there is an exception, ShowExceptions will
   # store the exception in env["action_dispatch.exception"], rewrite the
   # PATH_INFO to the exception status code and call the rack app.
+  # 
+  # If the application returns a "X-Cascade" pass response, this middleware
+  # will send an empty response as result with the correct status code.
+  # If any exception happens inside the exceptions app, this middleware
+  # catches the exceptions and returns a FAILSAFE_RESPONSE.
   class ShowExceptions
     FAILSAFE_RESPONSE = [500, {'Content-Type' => 'text/html'},
       ["<html><body><h1>500 Internal Server Error</h1>" <<
@@ -65,12 +70,18 @@ module ActionDispatch
 
     def render_exception(env, exception)
       wrapper = ExceptionWrapper.new(env, exception)
+      status  = wrapper.status_code
       env["action_dispatch.exception"] = wrapper.exception
-      env["PATH_INFO"] = "/#{wrapper.status_code}"
-      @exceptions_app.call(env)
+      env["PATH_INFO"] = "/#{status}"
+      response = @exceptions_app.call(env)
+      response[1]['X-Cascade'] == 'pass' ? pass_response(status) : response
     rescue Exception => failsafe_error
       $stderr.puts "Error during failsafe response: #{failsafe_error}\n  #{failsafe_error.backtrace * "\n  "}"
       FAILSAFE_RESPONSE
     end
+
+    def pass_response(status)
+      [status, {"Content-Type" => "text/html; charset=#{Response.default_charset}", "Content-Length" => "0"}, []]
+    end
   end
 end
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index 0ebe281ada..e9504f3524 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -88,4 +88,15 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_response 404
     assert_equal "YOU FAILED BRO", body
   end
+
+  test "returns an empty response if custom exceptions app returns X-Cascade pass" do
+    exceptions_app = lambda do |env|
+      [404, { "X-Cascade" => "pass" }, []]
+    end
+
+    @app = ActionDispatch::ShowExceptions.new(Boomer.new, exceptions_app)
+    get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
+    assert_response 405
+    assert_equal "", body
+  end
 end
-- 
cgit v1.2.3


From 192e55c38ed9b48672b9e216c9805b782b835d78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 10:29:45 +0100
Subject: Do not raise an exception if an invalid route was generated
 automatically.

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 14 +++++++++++---
 actionpack/test/dispatch/routing_test.rb         |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 88e422c05d..4d83c6dee1 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1286,7 +1286,7 @@ module ActionDispatch
             action = nil
           end
 
-          if !options.fetch(:as) { true }
+          if !options.fetch(:as, true)
             options.delete(:as)
           else
             options[:as] = name_for_action(options[:as], action)
@@ -1472,8 +1472,16 @@ module ActionDispatch
               [name_prefix, member_name, prefix]
             end
 
-            candidate = name.select(&:present?).join("_").presence
-            candidate unless as.nil? && @set.routes.find { |r| r.name == candidate }
+            if candidate = name.select(&:present?).join("_").presence
+              # If a name was not explicitly given, we check if it is valid
+              # and return nil in case it isn't. Otherwise, we pass the invalid name
+              # forward so the underlying router engine treats it and raises an exception.
+              if as.nil?
+                candidate unless @set.routes.find { |r| r.name == candidate } || candidate !~ /\A[_a-z]/i
+              else
+                candidate
+              end
+            end
           end
       end
 
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index bc4e2e31c8..5325f81364 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -91,6 +91,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       match "/local/:action", :controller => "local"
 
       match "/projects/status(.:format)"
+      match "/404", :to => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["NOT FOUND"]] }
 
       constraints(:ip => /192\.168\.1\.\d\d\d/) do
         get 'admin' => "queenbee#index"
-- 
cgit v1.2.3


From 654df86b7b022085785a64c431c45d8450d5e987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 10:38:17 +0100
Subject: Show detailed exceptions no longer returns true if the request is
 local in production.

---
 actionpack/CHANGELOG.md                                     |  4 ++--
 actionpack/lib/action_controller/metal/rescue.rb            | 10 +++++++++-
 actionpack/test/controller/new_base/render_template_test.rb |  6 ++++++
 actionpack/test/controller/show_exceptions_test.rb          |  6 +++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index da18060202..c7cf9a8203 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -68,9 +68,9 @@
           <%= f.text_field :version %>
         <% end %>
 
-*   Refactor ActionDispatch::ShowExceptions. Controller is responsible for choosing to show exceptions when `consider_all_requests_local` is false. *Sergey Nartimov*
+*   Refactor ActionDispatch::ShowExceptions. The controller is responsible for choosing to show exceptions when `consider_all_requests_local` is false.
 
-    It's possible to override `show_detailed_exceptions?` in controllers to specify which requests should provide debugging information on errors.
+    It's possible to override `show_detailed_exceptions?` in controllers to specify which requests should provide debugging information on errors. The default value is now false, meaning local requests in production will no longer show the detailed exceptions page unless `show_detailed_exceptions?` is overridden and set to `request.local?`.
 
 *   Responders now return 204 No Content for API requests without a response body (as in the new scaffold) *José Valim*
 
diff --git a/actionpack/lib/action_controller/metal/rescue.rb b/actionpack/lib/action_controller/metal/rescue.rb
index c4b056ebc0..68cc9a9c9b 100644
--- a/actionpack/lib/action_controller/metal/rescue.rb
+++ b/actionpack/lib/action_controller/metal/rescue.rb
@@ -1,4 +1,7 @@
 module ActionController #:nodoc:
+  # This module is responsible to provide `rescue_from` helpers
+  # to controllers and configure when detailed exceptions must be
+  # shown.
   module Rescue
     extend ActiveSupport::Concern
     include ActiveSupport::Rescuable
@@ -12,8 +15,13 @@ 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?
-      request.local?
+      false
     end
 
     private
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index ba804421da..ade204c387 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -59,6 +59,12 @@ module RenderTemplate
     def with_error
       render :template => "test/with_error"
     end
+
+    private
+
+    def show_detailed_exceptions?
+      request.local?
+    end
   end
 
   class TestWithoutLayout < Rack::TestCase
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index ba78559f31..13ab19ed8f 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -16,6 +16,10 @@ module ShowExceptions
     def another_boom
       raise 'boom!'
     end
+
+    def show_detailed_exceptions?
+      request.local?
+    end
   end
 
   class ShowExceptionsTest < ActionDispatch::IntegrationTest
@@ -26,7 +30,7 @@ module ShowExceptions
       assert_equal "500 error fixture\n", body
     end
 
-    test 'show diagnostics from a local ip' do
+    test 'show diagnostics from a local ip if show_detailed_exceptions? is set to request.local?' do
       @app = ShowExceptionsController.action(:boom)
       ['127.0.0.1', '127.0.0.127', '::1', '0:0:0:0:0:0:0:1', '0:0:0:0:0:0:0:1%0'].each do |ip_address|
         self.remote_addr = ip_address
-- 
cgit v1.2.3


From 6481bc5f49ef26e8fde68ac964dc984d12f33189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 16 Dec 2011 10:45:25 +0100
Subject: Update CHANGELOGs and guides.

---
 actionpack/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index c7cf9a8203..b753addef4 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   The ShowExceptions middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in `env["action_dispatch.exception"]` and with the PATH_INFO rewritten to the status code. *José Valim*
+
 *   Add `button_tag` support to ActionView::Helpers::FormBuilder.
 
     This support mimics the default behavior of `submit_tag`.
-- 
cgit v1.2.3


From 23334be5b88a2607a35cfc970f3250ec7ae5ca9e Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 17 Dec 2011 12:00:28 +0530
Subject: warning removed "warning: instance variable @variable_for_layout not
 initialized"

---
 actionpack/test/controller/action_pack_assertions_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b414327d08..5252e43c25 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -72,6 +72,7 @@ class ActionPackAssertionsController < ActionController::Base
   end
 
   def render_with_layout
+    @variable_for_layout = nil
     render "test/hello_world", :layout => "layouts/standard"
   end
 
-- 
cgit v1.2.3


From 4d5266e2706195888c9f72fdc9ebde22f89a08df Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Sat, 17 Dec 2011 07:39:52 -0500
Subject: Allow symbols to be passed for extension aliases

---
 actionpack/lib/action_dispatch/http/mime_type.rb |  2 +-
 actionpack/test/dispatch/mime_type_test.rb       | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 8a9f9c4315..25affb9f50 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -103,7 +103,7 @@ module Mime
         SET << Mime.const_get(symbol.to_s.upcase)
 
         ([string] + mime_type_synonyms).each { |str| LOOKUP[str] = SET.last } unless skip_lookup
-        ([symbol.to_s] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext] = SET.last }
+        ([symbol] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext.to_s] = SET.last }
       end
 
       def parse(accept_header)
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 08fe2127b9..7a94b188ce 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -95,6 +95,17 @@ class MimeTypeTest < ActiveSupport::TestCase
     end
   end
 
+  test "custom type with extension aliases" do
+    begin
+      Mime::Type.register "text/foobar", :foobar, [], [:foo, "bar"]
+      %w[foobar foo bar].each do |extension|
+        assert_equal Mime::FOOBAR, Mime::EXTENSION_LOOKUP[extension]
+      end
+    ensure
+      Mime::Type.unregister(:FOOBAR)
+    end
+  end
+
   test "type should be equal to symbol" do
     assert_equal Mime::HTML, 'application/xhtml+xml'
     assert_equal Mime::HTML, :html
-- 
cgit v1.2.3


From a87690b02c0d1b4387974114625696e7e113080f Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Sat, 17 Dec 2011 07:40:54 -0500
Subject: Add test for type aliases

---
 actionpack/test/dispatch/mime_type_test.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 7a94b188ce..5415097e44 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -95,6 +95,17 @@ class MimeTypeTest < ActiveSupport::TestCase
     end
   end
 
+  test "custom type with type aliases" do
+    begin
+      Mime::Type.register "text/foobar", :foobar, ["text/foo", "text/bar"]
+      %w[text/foobar text/foo text/bar].each do |type|
+        assert_equal Mime::FOOBAR, type
+      end
+    ensure
+      Mime::Type.unregister(:FOOBAR)
+    end
+  end
+
   test "custom type with extension aliases" do
     begin
       Mime::Type.register "text/foobar", :foobar, [], [:foo, "bar"]
-- 
cgit v1.2.3


From 27f3619cd5d3700b2ff16f7c153c3549316b9410 Mon Sep 17 00:00:00 2001
From: Justin Campbell <justin@justincampbell.me>
Date: Sat, 17 Dec 2011 07:52:42 -0500
Subject: Add test for register_alias

---
 actionpack/test/dispatch/mime_type_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 5415097e44..db21080c42 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -117,6 +117,15 @@ class MimeTypeTest < ActiveSupport::TestCase
     end
   end
 
+  test "register alias" do
+    begin
+      Mime::Type.register_alias "application/xhtml+xml", :foobar
+      assert_equal Mime::HTML, Mime::EXTENSION_LOOKUP['foobar']
+    ensure
+      Mime::Type.unregister(:FOOBAR)
+    end
+  end
+
   test "type should be equal to symbol" do
     assert_equal Mime::HTML, 'application/xhtml+xml'
     assert_equal Mime::HTML, :html
-- 
cgit v1.2.3


From 921dcc2570b34e48a5f3eef9e0ef3044488f81d3 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Sat, 17 Dec 2011 14:23:40 -0600
Subject: add help text to routing error

When a newcomer hits the routing error page they
are often confused about how to trouble shoot the
next step. Adding a simple help text can gently
remind coders where to get more help.
---
 .../middleware/templates/rescues/routing_error.erb  | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
index ccfa858cce..f06c07daa5 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
@@ -1,10 +1,15 @@
 <h1>Routing Error</h1>
 <p><pre><%=h @exception.message %></pre></p>
-<% unless @exception.failures.empty? %><p>
-  <h2>Failure reasons:</h2>
-  <ol>
-  <% @exception.failures.each do |route, reason| %>
-    <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
-  <% end %>
-  </ol>
-</p><% end %>
+<% unless @exception.failures.empty? %>
+  <p>
+    <h2>Failure reasons:</h2>
+    <ol>
+    <% @exception.failures.each do |route, reason| %>
+      <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
+    <% end %>
+    </ol>
+  </p>
+<% end %>
+<p>
+  Try running <code>rake routes</code> for more information on available routes.
+</p>
\ No newline at end of file
-- 
cgit v1.2.3


From 024d3b9fcc684367b1a329c8b89c227b6470520e Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Mon, 19 Dec 2011 21:55:37 +0300
Subject: add failing tests for issue #3487

---
 .../test/template/active_model_helper_test.rb      | 25 +++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index 8530a72a82..52be0f1762 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -4,7 +4,7 @@ class ActiveModelHelperTest < ActionView::TestCase
   tests ActionView::Helpers::ActiveModelHelper
 
   silence_warnings do
-    class Post < Struct.new(:author_name, :body)
+    class Post < Struct.new(:author_name, :body, :updated_at)
       include ActiveModel::Conversion
       include ActiveModel::Validations
 
@@ -20,9 +20,11 @@ class ActiveModelHelperTest < ActionView::TestCase
     @post = Post.new
     @post.errors[:author_name] << "can't be empty"
     @post.errors[:body] << "foo"
+    @post.errors[:updated_at] << "bar"
 
     @post.author_name = ""
     @post.body        = "Back to the hill and over it again!"
+    @post.updated_at  = Date.new(2004, 6, 15)
   end
 
   def test_text_area_with_errors
@@ -39,6 +41,27 @@ class ActiveModelHelperTest < ActionView::TestCase
     )
   end
 
+  def test_date_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><select id="post_updated_at_1i" name="post[updated_at(1i)]">\n<option selected="selected" value="2004">2004</option>\n<option value="2005">2005</option>\n</select>\n<input id="post_updated_at_2i" name="post[updated_at(2i)]" type="hidden" value="6" />\n<input id="post_updated_at_3i" name="post[updated_at(3i)]" type="hidden" value="15" />\n</div>),
+      date_select("post", "updated_at", :discard_month => true, :discard_day => true, :start_year => 2004, :end_year => 2005)
+    )
+  end
+
+  def test_datetime_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><input id="post_updated_at_1i" name="post[updated_at(1i)]" type="hidden" value="2004" />\n<input id="post_updated_at_2i" name="post[updated_at(2i)]" type="hidden" value="6" />\n<input id="post_updated_at_3i" name="post[updated_at(3i)]" type="hidden" value="15" />\n<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n<option selected="selected" value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_updated_at_5i" name="post[updated_at(5i)]">\n<option selected="selected" value="00">00</option>\n</select>\n</div>),
+      datetime_select("post", "updated_at", :discard_year => true, :discard_month => true, :discard_day => true, :minute_step => 60)
+    )
+  end
+
+  def test_time_select_with_errors
+    assert_dom_equal(
+      %(<div class="field_with_errors"><input id="post_updated_at_1i" name="post[updated_at(1i)]" type="hidden" value="2004" />\n<input id="post_updated_at_2i" name="post[updated_at(2i)]" type="hidden" value="6" />\n<input id="post_updated_at_3i" name="post[updated_at(3i)]" type="hidden" value="15" />\n<select id="post_updated_at_4i" name="post[updated_at(4i)]">\n<option selected="selected" value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n</select>\n : <select id="post_updated_at_5i" name="post[updated_at(5i)]">\n<option selected="selected" value="00">00</option>\n</select>\n</div>),
+      time_select("post", "updated_at", :minute_step => 60)
+    )
+  end
+
   def test_hidden_field_does_not_render_errors
     assert_dom_equal(
       %(<input id="post_author_name" name="post[author_name]" type="hidden" value="" />),
-- 
cgit v1.2.3


From 9d0789c415111a3b3e85bdb5ed16d10f1f749d89 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 19 Dec 2011 13:34:54 -0800
Subject: adding tests for #4029

---
 actionpack/test/controller/routing_test.rb | 51 ++++++++++++++++++++++++++++++
 actionpack/test/dispatch/mount_test.rb     |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 062fc1f94e..f40d663ae8 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -85,6 +85,57 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     @rs.clear!
   end
 
+  def test_class_and_lambda_constraints
+    subdomain = Class.new {
+      def matches? request
+        request.subdomain.present? and request.subdomain != 'clients'
+      end
+    }
+
+    @rs.draw do
+      match '/', :constraints => subdomain.new,
+                 :to          => lambda { |env| [200, {}, 'default'] }
+      match '/', :constraints => { :subdomain => 'clients' },
+                 :to          => lambda { |env| [200, {}, 'clients'] }
+    end
+
+    body = @rs.call({'PATH_INFO'      => '/',
+                     'REQUEST_METHOD' => 'GET',
+                     'HTTP_HOST'      => 'www.example.org'})[2]
+
+    assert_equal 'default', body
+
+    body = @rs.call({'PATH_INFO'      => '/',
+                     'REQUEST_METHOD' => 'GET',
+                     'HTTP_HOST'      => 'clients.example.org'})[2]
+
+    assert_equal 'clients', body
+  end
+
+  def test_lambda_constraints
+    @rs.draw do
+      match '/', :constraints => lambda { |req|
+        req.subdomain.present? and req.subdomain != "clients" },
+                 :to          => lambda { |env| [200, {}, 'default'] }
+
+      match '/', :constraints => lambda { |req|
+        req.subdomain.present? && req.subdomain == "clients" },
+                 :to          => lambda { |env| [200, {}, 'clients'] }
+    end
+
+    body = @rs.call({'PATH_INFO'      => '/',
+                     'REQUEST_METHOD' => 'GET',
+                     'HTTP_HOST'      => 'www.example.org'})[2]
+
+    assert_equal 'default', body
+
+    body = @rs.call({'PATH_INFO'      => '/',
+                     'REQUEST_METHOD' => 'GET',
+                     'HTTP_HOST'      => 'clients.example.org'})[2]
+
+    assert_equal 'clients', body
+  end
+
   def test_draw_with_block_arity_one_raises
     assert_raise(RuntimeError) do
       @rs.draw { |map| map.match '/:controller(/:action(/:id))' }
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index 1a032539b9..f7a746120e 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -51,4 +51,4 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     get "/fakeengine"
     assert_equal "OK", response.body
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 9d6e52b55ec67d0573a0bb1900b13f38e18f7eba Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 19 Dec 2011 18:34:57 -0600
Subject: Party like its R-C-UNO!

---
 actionpack/lib/action_pack/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index add6b56425..d9bb41e80c 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,7 +3,7 @@ module ActionPack
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    PRE   = "beta"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From 572c3d517899524c2a7c4c84ad9646660168d4cd Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 19 Dec 2011 18:41:37 -0800
Subject: * BufferedLogger is deprecated.  Use ActiveSupport::Logger, or the
 logger   from Ruby stdlib.

---
 actionpack/lib/abstract_controller/logger.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index 8b36230397..a4e31cd2e5 100644
--- a/actionpack/lib/abstract_controller/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
@@ -1,4 +1,3 @@
-require "active_support/core_ext/logger"
 require "active_support/benchmarkable"
 
 module AbstractController
-- 
cgit v1.2.3


From 10304a228d2b31a52c3e2e0efd83190f4d1d5e28 Mon Sep 17 00:00:00 2001
From: Xu Pan <cqpanxu@gmail.com>
Date: Tue, 20 Dec 2011 12:33:34 +0800
Subject: don't encode an UTF-8 encoded template

---
 actionpack/lib/action_view/template/error.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index fe27e54037..ee74bb47d3 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -94,7 +94,7 @@ module ActionView
           "#{indent}#{line_counter}: #{line}\n"
         end
 
-        extract.encode! if extract.respond_to?(:encode!)
+        extract.force_encoding("UTF-8") if extract.respond_to?(:encode!)
 
         extract
       end
-- 
cgit v1.2.3


From 23f6cabff1c6af1815a02f0dfd15f0316cd7f4d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 08:51:56 +0100
Subject: Remove i18n dependencies from AP and AMo since they are in AS.

---
 actionpack/actionpack.gemspec | 1 -
 1 file changed, 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 1aa346929e..fe5bed70a9 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency('activemodel',   version)
   s.add_dependency('rack-cache',    '~> 1.1')
   s.add_dependency('builder',       '~> 3.0.0')
-  s.add_dependency('i18n',          '~> 0.6')
   s.add_dependency('rack',          '~> 1.3.5')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0.rc1')
-- 
cgit v1.2.3


From 19292a70fb553895693f496ef2bd09ade4ab7890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 11:06:37 +0100
Subject: Do not hard code encoding to UTF8

---
 actionpack/lib/action_view/template.rb       | 96 +++++++++++++++-------------
 actionpack/lib/action_view/template/error.rb |  6 +-
 2 files changed, 54 insertions(+), 48 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 10797c010f..c760726cdf 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -173,6 +173,52 @@ module ActionView
       @inspect ||= defined?(Rails.root) ? identifier.sub("#{Rails.root}/", '') : identifier
     end
 
+    # This method is responsible for properly setting he encoding of the
+    # source. Until this point, we assume that the source is BINARY data.
+    # If no additional information is supplied, we assume the encoding is
+    # the same as <tt>Encoding.default_external</tt>.
+    #
+    # The user can also specify the encoding via a comment on the first
+    # line of the template (# encoding: NAME-OF-ENCODING). This will work
+    # with any template engine, as we process out the encoding comment
+    # before passing the source on to the template engine, leaving a
+    # blank line in its stead.
+    def encode!
+      return unless source.encoding == Encoding::BINARY
+
+      if source.encoding_aware?
+        # Look for # encoding: *. If we find one, we'll encode the
+        # String in that encoding, otherwise, we'll use the
+        # default external encoding.
+        if source.sub!(/\A#{ENCODING_FLAG}/, '')
+          encoding = magic_encoding = $1
+        else
+          encoding = Encoding.default_external
+        end
+
+        # Tag the source with the default external encoding
+        # or the encoding specified in the file
+        source.force_encoding(encoding)
+
+        # If the user didn't specify an encoding, and the handler
+        # handles encodings, we simply pass the String as is to
+        # the handler (with the default_external tag)
+        if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
+          source
+        # Otherwise, if the String is valid in the encoding,
+        # encode immediately to default_internal. This means
+        # that if a handler doesn't handle encodings, it will
+        # always get Strings in the default_internal
+        elsif source.valid_encoding?
+          source.encode!
+        # Otherwise, since the String is invalid in the encoding
+        # specified, raise an exception
+        else
+          raise WrongEncodingError.new(source, encoding)
+        end
+      end
+    end
+
     protected
 
       # Compile a template. This method ensures a template is compiled
@@ -195,15 +241,7 @@ module ActionView
       end
 
       # Among other things, this method is responsible for properly setting
-      # the encoding of the source. Until this point, we assume that the
-      # source is BINARY data. If no additional information is supplied,
-      # we assume the encoding is the same as <tt>Encoding.default_external</tt>.
-      #
-      # The user can also specify the encoding via a comment on the first
-      # line of the template (# encoding: NAME-OF-ENCODING). This will work
-      # with any template engine, as we process out the encoding comment
-      # before passing the source on to the template engine, leaving a
-      # blank line in its stead.
+      # the encoding of the compiled template.
       #
       # If the template engine handles encodings, we send the encoded
       # String to the engine without further processing. This allows
@@ -215,40 +253,8 @@ module ActionView
       # In general, this means that templates will be UTF-8 inside of Rails,
       # regardless of the original source encoding.
       def compile(view, mod) #:nodoc:
+        encode!
         method_name = self.method_name
-
-        if source.encoding_aware?
-          # Look for # encoding: *. If we find one, we'll encode the
-          # String in that encoding, otherwise, we'll use the
-          # default external encoding.
-          if source.sub!(/\A#{ENCODING_FLAG}/, '')
-            encoding = magic_encoding = $1
-          else
-            encoding = Encoding.default_external
-          end
-
-          # Tag the source with the default external encoding
-          # or the encoding specified in the file
-          source.force_encoding(encoding)
-
-          # If the user didn't specify an encoding, and the handler
-          # handles encodings, we simply pass the String as is to
-          # the handler (with the default_external tag)
-          if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
-            source
-          # Otherwise, if the String is valid in the encoding,
-          # encode immediately to default_internal. This means
-          # that if a handler doesn't handle encodings, it will
-          # always get Strings in the default_internal
-          elsif source.valid_encoding?
-            source.encode!
-          # Otherwise, since the String is invalid in the encoding
-          # specified, raise an exception
-          else
-            raise WrongEncodingError.new(source, encoding)
-          end
-        end
-
         code = @handler.call(self)
 
         # Make sure that the resulting String to be evalled is in the
@@ -297,7 +303,11 @@ module ActionView
           raise e
         else
           assigns  = view.respond_to?(:assigns) ? view.assigns : {}
-          template = @virtual_path ? refresh(view) : self
+          template = self
+          unless template.source
+            template = refresh(view)
+            template.encode!
+          end
           raise Template::Error.new(template, assigns, e)
         end
       end
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index ee74bb47d3..587e37a84f 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -89,14 +89,10 @@ module ActionView
         line_counter = start_on_line
         return unless source_code = source_code[start_on_line..end_on_line]
 
-        extract = source_code.sum do |line|
+        source_code.sum do |line|
           line_counter += 1
           "#{indent}#{line_counter}: #{line}\n"
         end
-
-        extract.force_encoding("UTF-8") if extract.respond_to?(:encode!)
-
-        extract
       end
 
       def sub_template_of(template_path)
-- 
cgit v1.2.3


From 45e85c358d07b90fc52136c51a4511158e51849e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 12:39:28 +0100
Subject: Check if source is encoding aware.

---
 actionpack/lib/action_view/template.rb | 62 ++++++++++++++++------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index c760726cdf..eac6287b0b 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -173,7 +173,7 @@ module ActionView
       @inspect ||= defined?(Rails.root) ? identifier.sub("#{Rails.root}/", '') : identifier
     end
 
-    # This method is responsible for properly setting he encoding of the
+    # This method is responsible for properly setting the encoding of the
     # source. Until this point, we assume that the source is BINARY data.
     # If no additional information is supplied, we assume the encoding is
     # the same as <tt>Encoding.default_external</tt>.
@@ -184,38 +184,36 @@ module ActionView
     # before passing the source on to the template engine, leaving a
     # blank line in its stead.
     def encode!
-      return unless source.encoding == Encoding::BINARY
-
-      if source.encoding_aware?
-        # Look for # encoding: *. If we find one, we'll encode the
-        # String in that encoding, otherwise, we'll use the
-        # default external encoding.
-        if source.sub!(/\A#{ENCODING_FLAG}/, '')
-          encoding = magic_encoding = $1
-        else
-          encoding = Encoding.default_external
-        end
+      return unless source.encoding_aware? && source.encoding == Encoding::BINARY
+
+      # Look for # encoding: *. If we find one, we'll encode the
+      # String in that encoding, otherwise, we'll use the
+      # default external encoding.
+      if source.sub!(/\A#{ENCODING_FLAG}/, '')
+        encoding = magic_encoding = $1
+      else
+        encoding = Encoding.default_external
+      end
 
-        # Tag the source with the default external encoding
-        # or the encoding specified in the file
-        source.force_encoding(encoding)
-
-        # If the user didn't specify an encoding, and the handler
-        # handles encodings, we simply pass the String as is to
-        # the handler (with the default_external tag)
-        if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
-          source
-        # Otherwise, if the String is valid in the encoding,
-        # encode immediately to default_internal. This means
-        # that if a handler doesn't handle encodings, it will
-        # always get Strings in the default_internal
-        elsif source.valid_encoding?
-          source.encode!
-        # Otherwise, since the String is invalid in the encoding
-        # specified, raise an exception
-        else
-          raise WrongEncodingError.new(source, encoding)
-        end
+      # Tag the source with the default external encoding
+      # or the encoding specified in the file
+      source.force_encoding(encoding)
+
+      # If the user didn't specify an encoding, and the handler
+      # handles encodings, we simply pass the String as is to
+      # the handler (with the default_external tag)
+      if !magic_encoding && @handler.respond_to?(:handles_encoding?) && @handler.handles_encoding?
+        source
+      # Otherwise, if the String is valid in the encoding,
+      # encode immediately to default_internal. This means
+      # that if a handler doesn't handle encodings, it will
+      # always get Strings in the default_internal
+      elsif source.valid_encoding?
+        source.encode!
+      # Otherwise, since the String is invalid in the encoding
+      # specified, raise an exception
+      else
+        raise WrongEncodingError.new(source, encoding)
       end
     end
 
-- 
cgit v1.2.3


From c3c1ff40fcc4cbc31a5396a8b7737755ad4bc95b Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Tue, 20 Dec 2011 15:37:20 +0300
Subject: remove warnings about @variable_for_layout

---
 actionpack/test/controller/render_test.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 243bad8749..f42a04d670 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -25,6 +25,8 @@ end
 class TestController < ActionController::Base
   protect_from_forgery
 
+  before_filter :set_variable_for_layout
+
   class LabellingFormBuilder < ActionView::Helpers::FormBuilder
   end
 
@@ -364,17 +366,14 @@ class TestController < ActionController::Base
   end
 
   def layout_test_with_different_layout
-    @variable_for_layout = nil
     render :action => "hello_world", :layout => "standard"
   end
 
   def layout_test_with_different_layout_and_string_action
-    @variable_for_layout = nil
     render "hello_world", :layout => "standard"
   end
 
   def layout_test_with_different_layout_and_symbol_action
-    @variable_for_layout = nil
     render :hello_world, :layout => "standard"
   end
 
@@ -383,7 +382,6 @@ class TestController < ActionController::Base
   end
 
   def layout_overriding_layout
-    @variable_for_layout = nil
     render :action => "hello_world", :layout => "standard"
   end
 
@@ -666,8 +664,11 @@ class TestController < ActionController::Base
 
   private
 
+    def set_variable_for_layout
+      @variable_for_layout = nil
+    end
+
     def determine_layout
-      @variable_for_layout ||= nil
       case action_name
         when "hello_world", "layout_test", "rendering_without_layout",
              "rendering_nothing_on_layout", "render_text_hello_world",
-- 
cgit v1.2.3


From cae1768c6a0e3d1cd4a2c2d836ef213438689db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 14:44:48 +0100
Subject: Remove deprecated layout lookup.

---
 actionpack/lib/abstract_controller/layouts.rb | 72 +++++++++------------------
 actionpack/test/abstract/layouts_test.rb      | 15 ++----
 2 files changed, 27 insertions(+), 60 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index 8b6136d6ba..6a6387632c 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -195,8 +195,9 @@ module AbstractController
     include Rendering
 
     included do
-      class_attribute :_layout_conditions
-      remove_possible_method :_layout_conditions
+      class_attribute :_layout, :_layout_conditions,
+        :instance_reader => false, :instance_writer => false
+      self._layout = nil
       self._layout_conditions = {}
       _write_layout_method
     end
@@ -254,7 +255,7 @@ module AbstractController
         conditions.each {|k, v| conditions[k] = Array(v).map {|a| a.to_s} }
         self._layout_conditions = conditions
 
-        @_layout = layout || false # Converts nil to false
+        self._layout = layout
         _write_layout_method
       end
 
@@ -281,52 +282,27 @@ module AbstractController
           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
+        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
-              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
-        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_variable_get(:@_layout)
-          @_layout = nil
-          inspect  = parent.is_a?(Proc) ? parent.inspect : parent
-
-          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
-                else
-                  super
-                end
-              RUBY
-            end
+              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
 
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index de6f42d826..fc25718d9e 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -57,11 +57,8 @@ module AbstractControllerTests
       layout "hello_override"
     end
 
-    class WithNilChild < WithString
-      layout nil
-    end
-
     class WithStringImpliedChild < WithString
+      layout nil
     end
 
     class WithChildOfImplied < WithStringImpliedChild
@@ -258,20 +255,14 @@ module AbstractControllerTests
 
       test "when a child controller has an implied layout, use that layout and not the parent controller layout" do
         controller = WithStringImpliedChild.new
-        assert_deprecated { controller.process(:index) }
-        assert_equal "With Implied Hello string!", controller.response_body
-      end
-
-      test "when a child controller specifies layout nil, do not use the parent layout" do
-        controller = WithNilChild.new
         controller.process(:index)
-        assert_equal "Hello string!", controller.response_body
+        assert_equal "With Implied Hello string!", controller.response_body
       end
 
       test "when a grandchild has no layout specified, the child has an implied layout, and the " \
         "parent has specified a layout, use the child controller layout" do
           controller = WithChildOfImplied.new
-          assert_deprecated { controller.process(:index) }
+          controller.process(:index)
           assert_equal "With Implied Hello string!", controller.response_body
       end
 
-- 
cgit v1.2.3


From 6c57177f2c7f4f934716d588545902d5fc00fa99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 20 Dec 2011 15:12:38 +0100
Subject: Remove deprecation warnings from Action Pack.

---
 .../action_dispatch/middleware/show_exceptions.rb  | 26 +-----------------
 .../lib/action_dispatch/routing/redirection.rb     |  9 ------
 actionpack/lib/action_view/helpers/asset_paths.rb  |  7 -----
 actionpack/lib/action_view/lookup_context.rb       | 12 +-------
 .../lib/action_view/renderer/abstract_renderer.rb  | 12 --------
 .../lib/action_view/renderer/partial_renderer.rb   |  9 +-----
 .../lib/action_view/renderer/template_renderer.rb  |  1 -
 actionpack/test/controller/render_test.rb          |  6 ++--
 actionpack/test/template/render_test.rb            | 32 +---------------------
 9 files changed, 6 insertions(+), 108 deletions(-)
 delete mode 100644 actionpack/lib/action_view/helpers/asset_paths.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 5eceeece1f..3d06214bf1 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -22,31 +22,7 @@ module ActionDispatch
        "application's log file and/or the web server's log file to find out what " <<
        "went wrong.</body></html>"]]
 
-    class << self
-      def rescue_responses
-        ActiveSupport::Deprecation.warn "ActionDispatch::ShowExceptions.rescue_responses is deprecated. " \
-          "Please configure your exceptions using a railtie or in your application config instead."
-        ExceptionWrapper.rescue_responses
-      end
-
-      def rescue_templates
-        ActiveSupport::Deprecation.warn "ActionDispatch::ShowExceptions.rescue_templates is deprecated. " \
-          "Please configure your exceptions using a railtie or in your application config instead."
-        ExceptionWrapper.rescue_templates
-      end
-    end
-
-    def initialize(app, exceptions_app = nil)
-      if [true, false].include?(exceptions_app)
-        ActiveSupport::Deprecation.warn "Passing consider_all_requests_local option to ActionDispatch::ShowExceptions middleware no longer works"
-        exceptions_app = nil
-      end
-
-      if exceptions_app.nil?
-        raise ArgumentError, "You need to pass an exceptions_app when initializing ActionDispatch::ShowExceptions. " \
-          "In case you want to render pages from a public path, you can use ActionDispatch::PublicExceptions.new('path/to/public')"
-      end
-
+    def initialize(app, exceptions_app)
       @app = app
       @exceptions_app = exceptions_app
     end
diff --git a/actionpack/lib/action_dispatch/routing/redirection.rb b/actionpack/lib/action_dispatch/routing/redirection.rb
index 330400e139..617b24b46a 100644
--- a/actionpack/lib/action_dispatch/routing/redirection.rb
+++ b/actionpack/lib/action_dispatch/routing/redirection.rb
@@ -97,16 +97,7 @@ module ActionDispatch
         } if String === path
 
         block = path if path.respond_to? :call
-
-        # :FIXME: remove in Rails 4.0
-        if block && block.respond_to?(:arity) && block.arity < 2
-          msg = "redirect blocks with arity of #{block.arity} are deprecated. Your block must take 2 parameters: the environment, and a request object"
-          ActiveSupport::Deprecation.warn msg
-          block = lambda { |params, _| block.call(params) }
-        end
-
         raise ArgumentError, "redirection argument not supported" unless block
-
         Redirect.new status, block
       end
     end
diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
deleted file mode 100644
index fae2e4fc1c..0000000000
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-ActiveSupport::Deprecation.warn "ActionView::Helpers::AssetPaths is deprecated. Please use ActionView::AssetPaths instead."
-
-module ActionView
-  module Helpers
-    AssetPaths = ::ActionView::AssetPaths
-  end
-end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 3bb2b98e48..3f07314dda 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -151,14 +151,8 @@ module ActionView
       # as well as incorrectly putting part of the path in the template
       # name instead of the prefix.
       def normalize_name(name, prefixes) #:nodoc:
-        name  = name.to_s.sub(handlers_regexp) do |match|
-          ActiveSupport::Deprecation.warn "Passing a template handler in the template name is deprecated. " \
-            "You can simply remove the handler name or pass render :handlers => [:#{match[1..-1]}] instead.", caller
-          ""
-        end
-
         prefixes = nil if prefixes.blank?
-        parts    = name.split('/')
+        parts    = name.to_s.split('/')
         name     = parts.pop
 
         return name, prefixes || [""] if parts.empty?
@@ -168,10 +162,6 @@ module ActionView
 
         return name, prefixes
       end
-
-      def handlers_regexp #:nodoc:
-        @@handlers_regexp ||= /\.(?:#{default_handlers.join('|')})$/
-      end
     end
 
     include Accessors
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index c0936441ac..5a611e9f63 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -22,18 +22,6 @@ module ActionView
       details
     end
     
-    def extract_format(value, details)
-      if value.is_a?(String) && value.sub!(formats_regexp, "")
-        ActiveSupport::Deprecation.warn "Passing the format in the template name is deprecated. " \
-          "Please pass render with :formats => [:#{$1}] instead.", caller
-        details[:formats] ||= [$1.to_sym]
-      end
-    end
-
-    def formats_regexp
-      @@formats_regexp ||= /\.(#{Mime::SET.symbols.join('|')})$/
-    end
-
     def instrument(name, options={})
       ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
     end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 374bdb62f5..e231aade01 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -300,7 +300,6 @@ module ActionView
                                 "and is followed by any combinations of letters, numbers, or underscores.")
       end
 
-      extract_format(@path, @details)
       self
     end
 
@@ -369,13 +368,7 @@ module ActionView
       path = if object.respond_to?(:to_partial_path)
         object.to_partial_path
       else
-        klass = object.class
-        if klass.respond_to?(:model_name)
-          ActiveSupport::Deprecation.warn "ActiveModel-compatible objects whose classes return a #model_name that responds to #partial_path are deprecated. Please respond to #to_partial_path directly instead."
-          klass.model_name.partial_path
-        else
-          raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object that returns a valid partial path.")
-        end
+        raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object. It must implement :to_partial_path.")
       end
 
       @partial_names[path] ||= merge_prefix_into_object_path(@context_prefix, path.dup)
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index e131afa279..3e3a44b432 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -6,7 +6,6 @@ module ActionView
     def render(context, options)
       @view    = context
       @details = extract_details(options)
-      extract_format(options[:file] || options[:template], @details)
       template = determine_template(options)
       freeze_formats(template.formats, true)
       render_template(template, options[:layout], options[:locals])
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index f42a04d670..768cfb34ac 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -43,7 +43,7 @@ class TestController < ActionController::Base
   end
 
   def hello_world_file
-    render :file => File.expand_path("../../fixtures/hello.html", __FILE__)
+    render :file => File.expand_path("../../fixtures/hello", __FILE__), :formats => [:html]
   end
 
   def conditional_hello
@@ -810,9 +810,7 @@ class RenderTest < ActionController::TestCase
   end
 
   def test_render_file
-    assert_deprecated do
-      get :hello_world_file
-    end
+    get :hello_world_file
     assert_equal "Hello world!", @response.body
   end
 
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index c29519276d..2ba86306f4 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -146,7 +146,7 @@ module RenderTestCases
     @view.render(:partial => nil)
     flunk "Render did not raise ArgumentError"
   rescue ArgumentError => e
-    assert_equal "'#{nil.inspect}' is not an ActiveModel-compatible object that returns a valid partial path.", e.message
+    assert_equal "'#{nil.inspect}' is not an ActiveModel-compatible object. It must implement :to_partial_path.", e.message
   end
 
   def test_render_partial_with_errors
@@ -243,36 +243,6 @@ module RenderTestCases
       @controller_view.render(customers, :greeting => "Hello")
   end
 
-  class CustomerWithDeprecatedPartialPath
-    attr_reader :name
-
-    def self.model_name
-      Struct.new(:partial_path).new("customers/customer")
-    end
-
-    def initialize(name)
-      @name = name
-    end
-  end
-
-  def test_render_partial_using_object_with_deprecated_partial_path
-    assert_deprecated(/#model_name.*#partial_path.*#to_partial_path/) do
-      assert_equal "Hello: nertzy",
-        @controller_view.render(CustomerWithDeprecatedPartialPath.new("nertzy"), :greeting => "Hello")
-    end
-  end
-
-  def test_render_partial_using_collection_with_deprecated_partial_path
-    assert_deprecated(/#model_name.*#partial_path.*#to_partial_path/) do
-      customers = [
-        CustomerWithDeprecatedPartialPath.new("nertzy"),
-        CustomerWithDeprecatedPartialPath.new("peeja")
-      ]
-      assert_equal "Hello: nertzyHello: peeja",
-        @controller_view.render(customers, :greeting => "Hello")
-    end
-  end
-
   # TODO: The reason for this test is unclear, improve documentation
   def test_render_partial_and_fallback_to_layout
     assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
-- 
cgit v1.2.3


From 632fa15fa4ceec6dbb00bf26da249d3039749f50 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 20 Dec 2011 09:30:37 -0600
Subject: rails/master is now 4.0.0.beta and will only support Ruby 1.9.3+

---
 actionpack/lib/action_pack/version.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index d9bb41e80c..94cbc8e478 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,9 +1,9 @@
 module ActionPack
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 2
+    MAJOR = 4
+    MINOR = 0
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "beta"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3


From 53c1ae99f587d6d7f85a3910f97948906ebba877 Mon Sep 17 00:00:00 2001
From: Jarrod Carlson <jarrod.carlson@gmail.com>
Date: Wed, 5 Oct 2011 00:18:37 -0400
Subject: Added failing test to demonstrate digest authentication failure

---
 actionpack/test/controller/http_digest_authentication_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index b011536717..25fda58232 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -208,6 +208,16 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
     assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil}
   end
 
+  test "authentication request with request-uri ending in '?'" do
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please',
+                                                            :uri => '/http_digest_authentication_test/dummy_digest?')
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest?"
+    get :display
+
+    assert_response :success
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
   private
 
   def encode_credentials(options)
-- 
cgit v1.2.3


From 92088131ac15734f2227e9d85ea751e3f89b0116 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Tue, 20 Dec 2011 20:25:56 +0300
Subject: fix adding field_with_errors to date selects, closes #3487

---
 actionpack/lib/action_view/helpers/active_model_helper.rb |  5 -----
 actionpack/lib/action_view/helpers/date_helper.rb         | 14 +++++++++-----
 actionpack/lib/action_view/helpers/form_helper.rb         |  3 ++-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 96c3eec337..56f15604a6 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -1,4 +1,3 @@
-require 'action_view/helpers/form_helper'
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/object/blank'
@@ -47,9 +46,5 @@ module ActionView
         options['type'] != 'hidden'
       end
     end
-
-    class InstanceTag
-      include ActiveModelInstanceTag
-    end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index dd2b59cb0a..2806348337 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -422,7 +422,7 @@ module ActionView
       end
 
       # Returns a select tag with options for each of the seconds 0 through 59 with the current second selected.
-      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.      
+      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'second' by default.
       #
       # ==== Examples
@@ -448,7 +448,7 @@ module ActionView
 
       # Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
       # Also can return a select tag with options by <tt>minute_step</tt> from 0 through 59 with the 00 minute
-      # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer. 
+      # selected. The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'minute' by default.
       #
       # ==== Examples
@@ -473,7 +473,7 @@ module ActionView
       end
 
       # Returns a select tag with options for each of the hours 0 through 23 with the current hour selected.
-      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.      
+      # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer.
       # Override the field name using the <tt>:field_name</tt> option, 'hour' by default.
       #
       # ==== Examples
@@ -868,7 +868,7 @@ module ActionView
             tag_options = { :value => value }
             tag_options[:selected] = "selected" if selected == i
             text = options[:use_two_digit_numbers] ? sprintf("%02d", i) : value
-            text = options[:ampm] ? AMPM_TRANSLATION[i] : text            
+            text = options[:ampm] ? AMPM_TRANSLATION[i] : text
             select_options << content_tag(:option, text, tag_options)
           end
           (select_options.join("\n") + "\n").html_safe
@@ -974,7 +974,7 @@ module ActionView
         end
     end
 
-    class InstanceTag #:nodoc:
+    module DateHelperInstanceTag
       def to_date_select_tag(options = {}, html_options = {})
         datetime_selector(options, html_options).select_date.html_safe
       end
@@ -1030,6 +1030,10 @@ module ActionView
         end
     end
 
+    class InstanceTag #:nodoc:
+      include DateHelperInstanceTag
+    end
+
     class FormBuilder
       def date_select(method, options = {}, html_options = {})
         @template.date_select(@object_name, method, objectify_options(options), html_options)
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ccb2275329..ffb5a729ed 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -2,6 +2,7 @@ require 'cgi'
 require 'action_view/helpers/date_helper'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
+require 'action_view/helpers/active_model_helper'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/module/method_names'
@@ -963,7 +964,7 @@ module ActionView
     end
 
     class InstanceTag
-      include Helpers::TagHelper, Helpers::FormTagHelper
+      include Helpers::ActiveModelInstanceTag, Helpers::TagHelper, Helpers::FormTagHelper
 
       attr_reader :object, :method_name, :object_name
 
-- 
cgit v1.2.3


From 55334f52d49630bf73ce06e4f4ec4682a7fe566a Mon Sep 17 00:00:00 2001
From: Brian Rose <brian@heimidal.net>
Date: Tue, 20 Dec 2011 13:19:55 -0700
Subject: Ensure option for select helper responds to `#first` before
 comparison.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../lib/action_view/helpers/form_options_helper.rb     |  2 +-
 actionpack/test/template/form_options_helper_test.rb   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index f895cad058..a8690430e5 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -584,7 +584,7 @@ module ActionView
         #   [nil, []]
         #   { nil => [] }
         #
-        if !choices.empty? && Array === choices.first.last
+        if !choices.empty? && choices.first.respond_to?(:first) && Array === choices.first.last
           option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
         else
           option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 469718e1bd..4a889beadd 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -596,6 +596,24 @@ class FormOptionsHelperTest < ActionView::TestCase
     )
   end
 
+  def test_select_with_nil
+    @post = Post.new
+    @post.category = "othervalue"
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"othervalue\" selected=\"selected\">othervalue</option></select>",
+      select("post", "category", [nil, "othervalue"])
+    )
+  end
+
+  def test_select_with_fixnum
+    @post = Post.new
+    @post.category = ""
+    assert_dom_equal(
+      "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"1\">1</option></select>",
+      select("post", "category", [1], :prompt => true, :include_blank => true)
+    )
+  end
+
   def test_list_of_lists
     @post = Post.new
     @post.category = ""
-- 
cgit v1.2.3


From d2abe28ed342443f8c374a6e02977ccb0c3b3f95 Mon Sep 17 00:00:00 2001
From: Brian Rose <brian@heimidal.net>
Date: Tue, 20 Dec 2011 13:38:16 -0700
Subject: Check for response to `#last` instead of `#first`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/lib/action_view/helpers/form_options_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index a8690430e5..3ee0d8ebc5 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -584,7 +584,7 @@ module ActionView
         #   [nil, []]
         #   { nil => [] }
         #
-        if !choices.empty? && choices.first.respond_to?(:first) && Array === choices.first.last
+        if !choices.empty? && choices.first.respond_to?(:last) && Array === choices.first.last
           option_tags = grouped_options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
         else
           option_tags = options_for_select(choices, :selected => selected_value, :disabled => options[:disabled])
-- 
cgit v1.2.3


From 80ab9e2a7434a445eaacb097832fbad24ed01960 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 20 Dec 2011 20:34:04 +0100
Subject: Add original_fullpath and original_url methods to Request

---
 actionpack/lib/action_dispatch/http/request.rb |  8 ++++++++
 actionpack/test/dispatch/request_test.rb       | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index c5c48ec489..820921252d 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -122,10 +122,18 @@ module ActionDispatch
       Http::Headers.new(@env)
     end
 
+    def original_fullpath
+      @original_fullpath ||= (env["ORIGINAL_FULLPATH"] || fullpath)
+    end
+
     def fullpath
       @fullpath ||= super
     end
 
+    def original_url
+      base_url + original_fullpath
+    end
+
     def media_type
       content_mime_type.to_s
     end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 4d805464c2..5b3d38c48c 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -618,6 +618,30 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal "/authenticate?secret", path
   end
 
+  test "original_fullpath returns ORIGINAL_FULLPATH" do
+    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar")
+
+    path = request.original_fullpath
+    assert_equal "/foo?bar", path
+  end
+
+  test "original_url returns url built using ORIGINAL_FULLPATH" do
+    request = stub_request('ORIGINAL_FULLPATH' => "/foo?bar",
+                           'HTTP_HOST'         => "example.org",
+                           'rack.url_scheme'   => "http")
+
+    url = request.original_url
+    assert_equal "http://example.org/foo?bar", url
+  end
+
+  test "original_fullpath returns fullpath if ORIGINAL_FULLPATH is not present" do
+    request = stub_request('PATH_INFO'    => "/foo",
+                           'QUERY_STRING' => "bar")
+
+    path = request.original_fullpath
+    assert_equal "/foo?bar", path
+  end
+
 protected
 
   def stub_request(env = {})
-- 
cgit v1.2.3


From 3131a9379766a735a80220fd2e94cb07791bed9c Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 20 Dec 2011 21:01:47 +0100
Subject: Fix http digest authentication with trailing '/' or '?' (fixes #4038
 and #3228)

---
 .../action_controller/metal/http_authentication.rb | 13 ++++---
 .../controller/http_digest_authentication_test.rb  | 41 +++++++++++++++++++---
 2 files changed, 44 insertions(+), 10 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 264806cd36..56335a22cb 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -192,12 +192,15 @@ module ActionController
           return false unless password
 
           method = request.env['rack.methodoverride.original_method'] || request.env['REQUEST_METHOD']
-          uri    = credentials[:uri][0,1] == '/' ? request.fullpath : request.url
+          uri    = credentials[:uri][0,1] == '/' ? request.original_fullpath : request.original_url
 
-         [true, false].any? do |password_is_ha1|
-           expected = expected_response(method, uri, credentials, password, password_is_ha1)
-           expected == credentials[:response]
-         end
+          [true, false].any? do |trailing_question_mark|
+            [true, false].any? do |password_is_ha1|
+              _uri = trailing_question_mark ? uri + "?" : uri
+              expected = expected_response(method, _uri, credentials, password, password_is_ha1)
+              expected == credentials[:response]
+            end
+          end
         end
       end
 
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 25fda58232..a91e3cafa5 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -139,7 +139,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
   test "authentication request with request-uri that doesn't match credentials digest-uri" do
     @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
-    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
+    @request.env['ORIGINAL_FULLPATH'] = "/http_digest_authentication_test/dummy_digest/altered/uri"
     get :display
 
     assert_response :unauthorized
@@ -208,16 +208,44 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
     assert !ActionController::HttpAuthentication::Digest.validate_digest_response(@request, "SuperSecret"){nil}
   end
 
+  test "authentication request with request-uri ending in '/'" do
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/"
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+
+    # simulate normalizing PATH_INFO
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
+    get :display
+
+    assert_response :success
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
   test "authentication request with request-uri ending in '?'" do
-    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please',
-                                                            :uri => '/http_digest_authentication_test/dummy_digest?')
-    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest?"
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/?"
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:username => 'pretty', :password => 'please')
+
+    # simulate normalizing PATH_INFO
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
     get :display
 
     assert_response :success
     assert_equal 'Definitely Maybe', @response.body
   end
 
+  test "authentication request with absolute uri in credentials (as in IE) ending with /" do
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest/"
+    @request.env['HTTP_AUTHORIZATION'] = encode_credentials(:uri => "http://test.host/http_digest_authentication_test/dummy_digest/",
+                                                            :username => 'pretty', :password => 'please')
+
+    # simulate normalizing PATH_INFO
+    @request.env['PATH_INFO'] = "/http_digest_authentication_test/dummy_digest"
+    get :display
+
+    assert_response :success
+    assert assigns(:logged_in)
+    assert_equal 'Definitely Maybe', @response.body
+  end
+
   private
 
   def encode_credentials(options)
@@ -238,7 +266,10 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
 
     credentials = decode_credentials(@response.headers['WWW-Authenticate'])
     credentials.merge!(options)
-    credentials.merge!(:uri => @request.env['PATH_INFO'].to_s)
+    path_info = @request.env['PATH_INFO'].to_s
+    uri = options[:uri] || path_info
+    credentials.merge!(:uri => uri)
+    @request.env["ORIGINAL_FULLPATH"] = path_info
     ActionController::HttpAuthentication::Digest.encode_credentials(method, credentials, password, options[:password_is_ha1])
   end
 
-- 
cgit v1.2.3


From e883c06a4f924cc4ba74efe4dad36394fad26fa0 Mon Sep 17 00:00:00 2001
From: "Rahul P. Chaudhari" <rahul100885@gmail.com>
Date: Tue, 20 Dec 2011 23:43:23 +0530
Subject: Updated gemspec for ruby 1.9.3

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index fe5bed70a9..e369277e5a 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = version
   s.summary     = 'Web-flow and rendering framework putting the VC in MVC (part of Rails).'
   s.description = 'Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.'
-  s.required_ruby_version = '>= 1.8.7'
+  s.required_ruby_version = '>= 1.9.3'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
-- 
cgit v1.2.3


From ee69ef62a8edf6adfa4aba33e5d4f61ad55b6a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=A3is=20Ozols?= <ugis.ozolss@gmail.com>
Date: Wed, 21 Dec 2011 09:25:29 +0200
Subject: Remove some of the ActiveSupport core extensions related to 1.8.

---
 actionpack/lib/action_view/helpers/number_helper.rb | 1 -
 actionpack/lib/action_view/template/resolver.rb     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index b37e837a23..1c0fdb8ff9 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'active_support/core_ext/big_decimal/conversions'
-require 'active_support/core_ext/float/rounding'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
 
diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index f855ea257c..7fa86866a7 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -1,6 +1,5 @@
 require "pathname"
 require "active_support/core_ext/class"
-require "active_support/core_ext/io"
 require "action_view/template"
 
 module ActionView
-- 
cgit v1.2.3


From b74f5b73989edaca124b4b6f8594e63bda6344c9 Mon Sep 17 00:00:00 2001
From: "Rahul P. Chaudhari" <rahul100885@gmail.com>
Date: Wed, 21 Dec 2011 13:34:54 +0530
Subject: Remove unused conditions for 1.9

---
 actionpack/test/controller/test_test.rb         |  9 ++---
 actionpack/test/template/capture_helper_test.rb | 30 +++++++----------
 actionpack/test/template/text_helper_test.rb    | 45 ++++++-------------------
 3 files changed, 26 insertions(+), 58 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index b64e275363..0e75a23cfd 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -665,13 +665,8 @@ XML
 
   FILES_DIR = File.dirname(__FILE__) + '/../fixtures/multipart'
 
-  if RUBY_VERSION < '1.9'
-    READ_BINARY = 'rb'
-    READ_PLAIN = 'r'
-  else
-    READ_BINARY = 'rb:binary'
-    READ_PLAIN = 'r:binary'
-  end
+  READ_BINARY = 'rb:binary'
+  READ_PLAIN = 'r:binary'
 
   def test_test_uploaded_file
     filename = 'mona_lisa.jpg'
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index 13e2d5b595..a37e3a8d6a 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -131,17 +131,15 @@ class CaptureHelperTest < ActionView::TestCase
     assert buffer.equal?(@av.output_buffer)
   end
 
-  unless RUBY_VERSION < '1.9'
-    def test_with_output_buffer_sets_proper_encoding
-      @av.output_buffer = ActionView::OutputBuffer.new
+  def test_with_output_buffer_sets_proper_encoding
+    @av.output_buffer = ActionView::OutputBuffer.new
 
-      # Ensure we set the output buffer to an encoding different than the default one.
-      alt_encoding = alt_encoding(@av.output_buffer)
-      @av.output_buffer.force_encoding(alt_encoding)
+    # Ensure we set the output buffer to an encoding different than the default one.
+    alt_encoding = alt_encoding(@av.output_buffer)
+    @av.output_buffer.force_encoding(alt_encoding)
 
-      @av.with_output_buffer do
-        assert_equal alt_encoding, @av.output_buffer.encoding
-      end
+    @av.with_output_buffer do
+      assert_equal alt_encoding, @av.output_buffer.encoding
     end
   end
 
@@ -165,14 +163,12 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal '', view.output_buffer
   end
 
-  unless RUBY_VERSION < '1.9'
-    def test_flush_output_buffer_preserves_the_encoding_of_the_output_buffer
-      view = view_with_controller
-      alt_encoding = alt_encoding(view.output_buffer)
-      view.output_buffer.force_encoding(alt_encoding)
-      flush_output_buffer
-      assert_equal alt_encoding, view.output_buffer.encoding
-    end
+  def test_flush_output_buffer_preserves_the_encoding_of_the_output_buffer
+    view = view_with_controller
+    alt_encoding = alt_encoding(view.output_buffer)
+    view.output_buffer.force_encoding(alt_encoding)
+    flush_output_buffer
+    assert_equal alt_encoding, view.output_buffer.encoding
   end
 
   def alt_encoding(output_buffer)
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index a0afb77f05..96af824b51 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -82,25 +82,13 @@ class TextHelperTest < ActionView::TestCase
     assert_equal "Hello Big[...]", truncate("Hello Big World!", :omission => "[...]", :length => 15, :separator => ' ')
   end
 
-  if RUBY_VERSION < '1.9.0'
-    def test_truncate_multibyte
-      with_kcode 'none' do
-        assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", :length => 10)
-      end
-      with_kcode 'u' do
-        assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
-          truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244", :length => 10)
-      end
-    end
-  else
-    def test_truncate_multibyte
-      # .mb_chars always returns a UTF-8 String.
-      # assert_equal "\354\225\210\353\205\225\355...",
-      #   truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", :length => 10)
-
-      assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
-        truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8'), :length => 10)
-    end
+  def test_truncate_multibyte
+    # .mb_chars always returns a UTF-8 String.
+    # assert_equal "\354\225\210\353\205\225\355...",
+    #   truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", :length => 10)
+
+    assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...".force_encoding('UTF-8'),
+      truncate("\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8'), :length => 10)
   end
 
   def test_highlight_should_be_html_safe
@@ -243,21 +231,10 @@ class TextHelperTest < ActionView::TestCase
     )
   end
 
-  if RUBY_VERSION < '1.9'
-    def test_excerpt_with_utf8
-      with_kcode('u') do
-        assert_equal("...\357\254\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
-      end
-      with_kcode('none') do
-        assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped", 'could', 8))
-      end
-    end
-  else
-    def test_excerpt_with_utf8
-      assert_equal("...\357\254\203ciency could not be...".force_encoding('UTF-8'), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding('UTF-8'), 'could', 8))
-      # .mb_chars always returns UTF-8, even in 1.9. This is not great, but it's how it works. Let's work this out.
-      # assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped".force_encoding("BINARY"), 'could', 8))
-    end
+  def test_excerpt_with_utf8
+    assert_equal("...\357\254\203ciency could not be...".force_encoding('UTF-8'), excerpt("That's why e\357\254\203ciency could not be helped".force_encoding('UTF-8'), 'could', 8))
+    # .mb_chars always returns UTF-8, even in 1.9. This is not great, but it's how it works. Let's work this out.
+    # assert_equal("...\203ciency could not be...", excerpt("That's why e\357\254\203ciency could not be helped".force_encoding("BINARY"), 'could', 8))
   end
 
   def test_word_wrap
-- 
cgit v1.2.3


From 7276fc63be79a5769acb28b54d248c87591c1825 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 21 Dec 2011 15:39:50 +0530
Subject: 'with_kcode' removed.

Testing Sandbox removed.
---
 actionpack/test/lib/testing_sandbox.rb                | 15 ---------------
 actionpack/test/template/output_safety_helper_test.rb |  2 --
 actionpack/test/template/sanitize_helper_test.rb      |  2 --
 actionpack/test/template/text_helper_test.rb          |  2 --
 4 files changed, 21 deletions(-)
 delete mode 100644 actionpack/test/lib/testing_sandbox.rb

(limited to 'actionpack')

diff --git a/actionpack/test/lib/testing_sandbox.rb b/actionpack/test/lib/testing_sandbox.rb
deleted file mode 100644
index c36585104f..0000000000
--- a/actionpack/test/lib/testing_sandbox.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-module TestingSandbox
-  # Temporarily replaces KCODE for the block
-  def with_kcode(kcode)
-    if RUBY_VERSION < '1.9'
-      old_kcode, $KCODE = $KCODE, kcode
-      begin
-        yield
-      ensure
-        $KCODE = old_kcode
-      end
-    else
-      yield
-    end
-  end
-end
diff --git a/actionpack/test/template/output_safety_helper_test.rb b/actionpack/test/template/output_safety_helper_test.rb
index fc127c24e9..76c71c9e6d 100644
--- a/actionpack/test/template/output_safety_helper_test.rb
+++ b/actionpack/test/template/output_safety_helper_test.rb
@@ -1,9 +1,7 @@
 require 'abstract_unit'
-require 'testing_sandbox'
 
 class OutputSafetyHelperTest < ActionView::TestCase
   tests ActionView::Helpers::OutputSafetyHelper
-  include TestingSandbox
 
   def setup
     @string = "hello"
diff --git a/actionpack/test/template/sanitize_helper_test.rb b/actionpack/test/template/sanitize_helper_test.rb
index 222d4dbf4c..4182af590e 100644
--- a/actionpack/test/template/sanitize_helper_test.rb
+++ b/actionpack/test/template/sanitize_helper_test.rb
@@ -1,11 +1,9 @@
 require 'abstract_unit'
-require 'testing_sandbox'
 
 # The exhaustive tests are in test/controller/html/sanitizer_test.rb.
 # This tests the that the helpers hook up correctly to the sanitizer classes.
 class SanitizeHelperTest < ActionView::TestCase
   tests ActionView::Helpers::SanitizeHelper
-  include TestingSandbox
 
   def test_strip_links
     assert_equal "Dont touch me", strip_links("Dont touch me")
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index 96af824b51..839bf900dc 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -1,10 +1,8 @@
 # encoding: utf-8
 require 'abstract_unit'
-require 'testing_sandbox'
 
 class TextHelperTest < ActionView::TestCase
   tests ActionView::Helpers::TextHelper
-  include TestingSandbox
 
   def setup
     super
-- 
cgit v1.2.3


From 127d2c82996dffef088d14c6f5f9af6e66c20820 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Wed, 21 Dec 2011 15:03:35 +0300
Subject: remove check for string from request body setter

it was required on ruby 1.8
---
 actionpack/lib/action_dispatch/http/response.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 5797c63924..84732085f0 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -121,14 +121,7 @@ module ActionDispatch # :nodoc:
     def body=(body)
       @blank = true if body == EMPTY
 
-      # Explicitly check for strings. This is *wrong* theoretically
-      # but if we don't check this, the performance on string bodies
-      # is bad on Ruby 1.8 (because strings responds to each then).
-      @body = if body.respond_to?(:to_str) || !body.respond_to?(:each)
-        [body]
-      else
-        body
-      end
+      @body = body.respond_to?(:each) ? body : [body]
     end
 
     def body_parts
-- 
cgit v1.2.3


From 0f510e970f00ac819d331f0415db3ac5ada7b861 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 21 Dec 2011 17:55:57 +0530
Subject: Using uuid which is supported in 1.9

Orignal commit #ada78066fdbccffb1da092a2470211fa252b3c99
---
 actionpack/lib/action_dispatch/middleware/request_id.rb | 2 +-
 actionpack/test/dispatch/request_id_test.rb             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/request_id.rb b/actionpack/lib/action_dispatch/middleware/request_id.rb
index bee446c8a5..d5a0b80fd5 100644
--- a/actionpack/lib/action_dispatch/middleware/request_id.rb
+++ b/actionpack/lib/action_dispatch/middleware/request_id.rb
@@ -33,7 +33,7 @@ module ActionDispatch
       end
 
       def internal_request_id
-        SecureRandom.hex(16)
+        SecureRandom.uuid
       end
   end
 end
diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index b6e8b6c3ad..e2a38af233 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -14,7 +14,7 @@ class RequestIdTest < ActiveSupport::TestCase
   end
 
   test "generating a request id when none is supplied" do
-    assert_match(/\w+/, stub_request.uuid)
+    assert_match /\w+-\w+-\w+-\w+-\w+/, stub_request.uuid
   end
 
   private
-- 
cgit v1.2.3


From a3c1dc223bb9df3387e1171e17650cef85bf5bb9 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 21 Dec 2011 21:21:39 +0530
Subject: removed warning "warning: ambiguous first argument; put parentheses
 or even spaces"

---
 actionpack/test/dispatch/request_id_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/request_id_test.rb b/actionpack/test/dispatch/request_id_test.rb
index e2a38af233..4b98cd32f2 100644
--- a/actionpack/test/dispatch/request_id_test.rb
+++ b/actionpack/test/dispatch/request_id_test.rb
@@ -14,7 +14,7 @@ class RequestIdTest < ActiveSupport::TestCase
   end
 
   test "generating a request id when none is supplied" do
-    assert_match /\w+-\w+-\w+-\w+-\w+/, stub_request.uuid
+    assert_match(/\w+-\w+-\w+-\w+-\w+/, stub_request.uuid)
   end
 
   private
-- 
cgit v1.2.3


From 52c214f7a388d1bf5c43be96c0495259d54f0f0c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 21 Dec 2011 10:43:54 -0700
Subject: caches should not be global, so no need to clear in the teardown

---
 actionpack/test/controller/routing_test.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index f40d663ae8..a60da65ae5 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -81,10 +81,6 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     @rs = ::ActionDispatch::Routing::RouteSet.new
   end
 
-  def teardown
-    @rs.clear!
-  end
-
   def test_class_and_lambda_constraints
     subdomain = Class.new {
       def matches? request
-- 
cgit v1.2.3


From 0fdf02929184bc49d97e645146ae9d06c4464f31 Mon Sep 17 00:00:00 2001
From: "Karunakar (Ruby)" <revurikarna@gmail.com>
Date: Thu, 22 Dec 2011 00:19:25 +0530
Subject: Action pack logger methodschanged to active supoort Logger methods

---
 actionpack/lib/action_dispatch/middleware/debug_exceptions.rb | 2 +-
 actionpack/lib/action_dispatch/middleware/params_parser.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index dabbabb1e6..b903f98761 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -76,7 +76,7 @@ module ActionDispatch
     end
 
     def stderr_logger
-      @stderr_logger ||= Logger.new($stderr)
+      @stderr_logger ||= ActiveSupport::Logger.new($stderr)
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 6ded9dbfed..1cb803ffb9 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -69,7 +69,7 @@ module ActionDispatch
       end
 
       def logger(env)
-        env['action_dispatch.logger'] || Logger.new($stderr)
+        env['action_dispatch.logger'] || ActiveSupport::Logger.new($stderr)
       end
   end
 end
-- 
cgit v1.2.3


From 9fbaf9f0777485b32ae12d0cc261695b9bb26eea Mon Sep 17 00:00:00 2001
From: Lucas Mazza <luc4smazza@gmail.com>
Date: Wed, 21 Dec 2011 17:31:53 -0200
Subject: raises an ArgumentError if no valid options are given to
 TemplateRenderer#determine_template

---
 actionpack/lib/action_view/renderer/template_renderer.rb |  2 ++
 actionpack/test/template/render_test.rb                  | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 3e3a44b432..06148ccc98 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -25,6 +25,8 @@ module ActionView
       elsif options.key?(:template)
         options[:template].respond_to?(:render) ?
           options[:template] : find_template(options[:template], options[:prefixes], false, keys, @details)
+      else
+        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option."
       end
     end
 
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 2ba86306f4..761bcf61f2 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -20,6 +20,13 @@ module RenderTestCases
     assert_equal ORIGINAL_LOCALES, I18n.available_locales.map {|l| l.to_s }.sort
   end
 
+  def test_render_without_options
+    @view.render()
+    flunk "Render did not raise ArgumentError"
+  rescue ArgumentError => e
+    assert_match "You invoked render but did not give any of :partial, :template, :inline, :file or :text option.", e.message
+  end
+
   def test_render_file
     assert_equal "Hello world!", @view.render(:file => "test/hello_world")
   end
@@ -43,21 +50,21 @@ module RenderTestCases
     assert_match "<h1>No Comment</h1>", @view.render(:template => "comments/empty", :formats => [:html])
     assert_match "<error>No Comment</error>", @view.render(:template => "comments/empty", :formats => [:xml])
   end
-  
+
   def test_render_file_with_locale
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => [:de])
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:file => "comments/empty", :locale => :de)
   end
-  
+
   def test_render_template_with_locale
     assert_equal "<h1>Kein Kommentar</h1>", @view.render(:template => "comments/empty", :locale => [:de])
   end
-  
+
   def test_render_file_with_handlers
     assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => [:builder])
     assert_equal "<h1>No Comment</h1>\n", @view.render(:file => "comments/empty", :handlers => :builder)
   end
-  
+
   def test_render_template_with_handlers
     assert_equal "<h1>No Comment</h1>\n", @view.render(:template => "comments/empty", :handlers => [:builder])
   end
-- 
cgit v1.2.3


From 44ff03bb2eb1eb2b088265389a2adc89936d7099 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 21 Dec 2011 11:45:41 -0700
Subject: adding integration test for journey #7

---
 actionpack/test/controller/routing_test.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a60da65ae5..a931222bbc 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -81,6 +81,28 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     @rs = ::ActionDispatch::Routing::RouteSet.new
   end
 
+  def test_regexp_precidence
+    @rs.draw do
+      match '/whois/:domain', :constraints => {
+        :domain => /\w+\.[\w\.]+/ },
+        :to     => lambda { |env| [200, {}, 'regexp'] }
+
+      match '/whois/:id', :to => lambda { |env| [200, {}, 'id'] }
+    end
+
+    body = @rs.call({'PATH_INFO'      => '/whois/example.org',
+                     'REQUEST_METHOD' => 'GET',
+                     'HTTP_HOST'      => 'www.example.org'})[2]
+
+    assert_equal 'regexp', body
+
+    body = @rs.call({'PATH_INFO'      => '/whois/123',
+                     'REQUEST_METHOD' => 'GET',
+                     'HTTP_HOST'      => 'clients.example.org'})[2]
+
+    assert_equal 'id', body
+  end
+
   def test_class_and_lambda_constraints
     subdomain = Class.new {
       def matches? request
-- 
cgit v1.2.3


From e68b72dbc4d121e05f70cc56c7b4dfb7e314b8b9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 21 Dec 2011 14:22:38 -0700
Subject: just use def setup

---
 actionpack/test/dispatch/routing_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 5325f81364..d5c1586600 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2414,7 +2414,8 @@ class TestAppendingRoutes < ActionDispatch::IntegrationTest
     lambda { |e| [ 200, { 'Content-Type' => 'text/plain' }, [resp] ] }
   end
 
-  setup do
+  def setup
+    super
     s = self
     @app = ActionDispatch::Routing::RouteSet.new
     @app.append do
-- 
cgit v1.2.3


From de6e92fe53ca8760ca3bb16ece64e152eb15c8ef Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 22 Dec 2011 12:53:14 -0700
Subject: refactoring routing tests

---
 actionpack/test/controller/routing_test.rb | 53 +++++++++++-------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index a931222bbc..d6ae9909b8 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -78,7 +78,19 @@ class LegacyRouteSetTests < Test::Unit::TestCase
   attr_reader :rs
 
   def setup
-    @rs = ::ActionDispatch::Routing::RouteSet.new
+    @rs       = ::ActionDispatch::Routing::RouteSet.new
+    @response = nil
+  end
+
+  def get(uri_or_host, path = nil, port = nil)
+    host = uri_or_host.host unless path
+    path ||= uri_or_host.path
+
+    params = {'PATH_INFO'      => path,
+              'REQUEST_METHOD' => 'GET',
+              'HTTP_HOST'      => host}
+
+    @rs.call(params)[2]
   end
 
   def test_regexp_precidence
@@ -90,17 +102,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
       match '/whois/:id', :to => lambda { |env| [200, {}, 'id'] }
     end
 
-    body = @rs.call({'PATH_INFO'      => '/whois/example.org',
-                     'REQUEST_METHOD' => 'GET',
-                     'HTTP_HOST'      => 'www.example.org'})[2]
-
-    assert_equal 'regexp', body
-
-    body = @rs.call({'PATH_INFO'      => '/whois/123',
-                     'REQUEST_METHOD' => 'GET',
-                     'HTTP_HOST'      => 'clients.example.org'})[2]
-
-    assert_equal 'id', body
+    assert_equal 'regexp', get(URI('http://example.org/whois/example.org'))
+    assert_equal 'id', get(URI('http://example.org/whois/123'))
   end
 
   def test_class_and_lambda_constraints
@@ -117,17 +120,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
                  :to          => lambda { |env| [200, {}, 'clients'] }
     end
 
-    body = @rs.call({'PATH_INFO'      => '/',
-                     'REQUEST_METHOD' => 'GET',
-                     'HTTP_HOST'      => 'www.example.org'})[2]
-
-    assert_equal 'default', body
-
-    body = @rs.call({'PATH_INFO'      => '/',
-                     'REQUEST_METHOD' => 'GET',
-                     'HTTP_HOST'      => 'clients.example.org'})[2]
-
-    assert_equal 'clients', body
+    assert_equal 'default', get(URI('http://www.example.org/'))
+    assert_equal 'clients', get(URI('http://clients.example.org/'))
   end
 
   def test_lambda_constraints
@@ -141,17 +135,8 @@ class LegacyRouteSetTests < Test::Unit::TestCase
                  :to          => lambda { |env| [200, {}, 'clients'] }
     end
 
-    body = @rs.call({'PATH_INFO'      => '/',
-                     'REQUEST_METHOD' => 'GET',
-                     'HTTP_HOST'      => 'www.example.org'})[2]
-
-    assert_equal 'default', body
-
-    body = @rs.call({'PATH_INFO'      => '/',
-                     'REQUEST_METHOD' => 'GET',
-                     'HTTP_HOST'      => 'clients.example.org'})[2]
-
-    assert_equal 'clients', body
+    assert_equal 'default', get(URI('http://www.example.org/'))
+    assert_equal 'clients', get(URI('http://clients.example.org/'))
   end
 
   def test_draw_with_block_arity_one_raises
-- 
cgit v1.2.3


From 3f92e5e40720bd3c00935b2df42d9c781248b9e7 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 22 Dec 2011 13:09:43 -0700
Subject: rack bodies should be a list

---
 actionpack/test/controller/routing_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index d6ae9909b8..715cc229e1 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -90,16 +90,16 @@ class LegacyRouteSetTests < Test::Unit::TestCase
               'REQUEST_METHOD' => 'GET',
               'HTTP_HOST'      => host}
 
-    @rs.call(params)[2]
+    @rs.call(params)[2].join
   end
 
   def test_regexp_precidence
     @rs.draw do
       match '/whois/:domain', :constraints => {
         :domain => /\w+\.[\w\.]+/ },
-        :to     => lambda { |env| [200, {}, 'regexp'] }
+        :to     => lambda { |env| [200, {}, %w{regexp}] }
 
-      match '/whois/:id', :to => lambda { |env| [200, {}, 'id'] }
+      match '/whois/:id', :to => lambda { |env| [200, {}, %w{id}] }
     end
 
     assert_equal 'regexp', get(URI('http://example.org/whois/example.org'))
@@ -115,9 +115,9 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
     @rs.draw do
       match '/', :constraints => subdomain.new,
-                 :to          => lambda { |env| [200, {}, 'default'] }
+                 :to          => lambda { |env| [200, {}, %w{default}] }
       match '/', :constraints => { :subdomain => 'clients' },
-                 :to          => lambda { |env| [200, {}, 'clients'] }
+                 :to          => lambda { |env| [200, {}, %w{clients}] }
     end
 
     assert_equal 'default', get(URI('http://www.example.org/'))
@@ -128,11 +128,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     @rs.draw do
       match '/', :constraints => lambda { |req|
         req.subdomain.present? and req.subdomain != "clients" },
-                 :to          => lambda { |env| [200, {}, 'default'] }
+                 :to          => lambda { |env| [200, {}, %w{default}] }
 
       match '/', :constraints => lambda { |req|
         req.subdomain.present? && req.subdomain == "clients" },
-                 :to          => lambda { |env| [200, {}, 'clients'] }
+                 :to          => lambda { |env| [200, {}, %w{clients}] }
     end
 
     assert_equal 'default', get(URI('http://www.example.org/'))
-- 
cgit v1.2.3


From 4ee537a8a21ecab2a4d0c8e6a6730a72a7937428 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 22 Dec 2011 18:04:22 -0700
Subject: Adding an integration test.  Fixes #4136

---
 actionpack/test/controller/routing_test.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 715cc229e1..715010d7f7 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -139,6 +139,15 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal 'clients', get(URI('http://clients.example.org/'))
   end
 
+  def test_empty_string_match
+    rs.draw do
+      get '/:username', :constraints => { :username => /[^\/]+/ },
+                       :to => lambda { |e| [200, {}, ['foo']] }
+    end
+    assert_equal 'Not Found', get(URI('http://example.org/'))
+    assert_equal 'foo', get(URI('http://example.org/hello'))
+  end
+
   def test_draw_with_block_arity_one_raises
     assert_raise(RuntimeError) do
       @rs.draw { |map| map.match '/:controller(/:action(/:id))' }
-- 
cgit v1.2.3


From ead2593a54223498647555171e930f9cbe08759c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 22 Dec 2011 18:52:42 -0700
Subject: adding an integration test for splat regexp substitutions. fixes
 #4138

---
 actionpack/test/controller/routing_test.rb | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 715010d7f7..53a50898c5 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -148,6 +148,19 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal 'foo', get(URI('http://example.org/hello'))
   end
 
+  def test_non_greedy_glob_regexp
+    params = nil
+    rs.draw do
+      get '/posts/:id(/*filters)', :constraints => { :filters => /.+?/ },
+        :to => lambda { |e|
+        params = e["action_dispatch.request.path_parameters"]
+        [200, {}, ['foo']]
+      }
+    end
+    assert_equal 'foo', get(URI('http://example.org/posts/1/foo.js'))
+    assert_equal({:id=>"1", :filters=>"foo", :format=>"js"}, params)
+  end
+
   def test_draw_with_block_arity_one_raises
     assert_raise(RuntimeError) do
       @rs.draw { |map| map.match '/:controller(/:action(/:id))' }
-- 
cgit v1.2.3


From 131c9ba9d00f49e3b52bf606ca60317c28b4ce6a Mon Sep 17 00:00:00 2001
From: "Karunakar (Ruby)" <revurikarna@gmail.com>
Date: Sat, 24 Dec 2011 00:17:21 +0530
Subject: Moving to logger methods to ActiveSupport Logger

---
 actionpack/test/controller/addresses_render_test.rb | 4 ++--
 actionpack/test/controller/base_test.rb             | 4 ++--
 actionpack/test/controller/capture_test.rb          | 4 ++--
 actionpack/test/controller/render_json_test.rb      | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index c1cd22113d..0b5f2d7679 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
 require 'controller/fake_controllers'
 
 class Address
@@ -23,7 +23,7 @@ class AddressesTest < ActionController::TestCase
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 9c22a4e7e0..a4f858d06d 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
 require 'pp' # require 'pp' early to prevent hidden_methods from not picking up the pretty-print methods until too late
 
 # Provide some controller to run the tests on.
@@ -142,7 +142,7 @@ class PerformActionTest < ActionController::TestCase
 
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request     = ActionController::TestRequest.new
     @response    = ActionController::TestResponse.new
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index d78acb8ce8..a217510434 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
 
 class CaptureController < ActionController::Base
   def self.controller_name; "test"; end
@@ -39,7 +39,7 @@ class CaptureTest < ActionController::TestCase
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
diff --git a/actionpack/test/controller/render_json_test.rb b/actionpack/test/controller/render_json_test.rb
index fc604a2db3..75fed8e933 100644
--- a/actionpack/test/controller/render_json_test.rb
+++ b/actionpack/test/controller/render_json_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'controller/fake_models'
+require 'active_support/logger'
 require 'pathname'
 
 class RenderJsonTest < ActionController::TestCase
@@ -69,7 +70,7 @@ class RenderJsonTest < ActionController::TestCase
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
     super
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end
-- 
cgit v1.2.3


From 5f3b9dec0a03055824fa8187ef260e74d75a75eb Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Fri, 23 Dec 2011 19:56:49 +0300
Subject: remove Rails application fallback from AD::IntegrationTest

set AD::IntegrationTest.app in railtie initializer
---
 actionpack/lib/action_dispatch.rb                     | 3 +++
 actionpack/lib/action_dispatch/railtie.rb             | 2 ++
 actionpack/lib/action_dispatch/testing/integration.rb | 9 ++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 4b821037dc..bcb2ac8ffc 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -29,6 +29,7 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include
 
 require 'active_support'
 require 'active_support/dependencies/autoload'
+require 'active_support/core_ext/module/attribute_accessors'
 
 require 'action_pack'
 require 'active_model'
@@ -88,6 +89,8 @@ module ActionDispatch
     autoload :CacheStore,    'action_dispatch/middleware/session/cache_store'
   end
 
+  mattr_accessor :test_app
+
   autoload_under 'testing' do
     autoload :Assertions
     autoload :Integration
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index a4f4825f92..46c06386d8 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -28,6 +28,8 @@ module ActionDispatch
 
       config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
       ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
+
+      ActionDispatch.test_app = app
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 0f1bb9f260..26db8662a8 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -463,9 +463,12 @@ module ActionDispatch
     @@app = nil
 
     def self.app
-      # DEPRECATE Rails application fallback
-      # This should be set by the initializer
-      @@app || (defined?(Rails.application) && Rails.application) || nil
+      if !@@app && !ActionDispatch.test_app
+        ActiveSupport::Deprecation.warn "Rails application fallback is deprecated " \
+          "and no longer works, please set ActionDispatch.test_app", caller
+      end
+
+      @@app || ActionDispatch.test_app
     end
 
     def self.app=(app)
-- 
cgit v1.2.3


From 2315e96a177502afea1910d2211e90c021e915f0 Mon Sep 17 00:00:00 2001
From: Kristian Freeman <kristianfreeman@gmail.com>
Date: Fri, 23 Dec 2011 13:03:21 -0800
Subject: Finished implementation of MIT license linking.

---
 actionpack/README.rdoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc
index 95301c21ee..fc36423f83 100644
--- a/actionpack/README.rdoc
+++ b/actionpack/README.rdoc
@@ -327,7 +327,9 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 == License
 
-Action Pack is released under the MIT license.
+Action Pack is released under the MIT license:
+
+* http://www.opensource.org/licenses/MIT
 
 
 == Support
-- 
cgit v1.2.3


From f7669cd8344a83485d01f94e7b5896616cd57f51 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sat, 24 Dec 2011 00:44:23 +0300
Subject: add ability to set a prompt string in include_blank option for date
 helpers, closes #4143

---
 actionpack/lib/action_view/helpers/date_helper.rb |  4 ++--
 actionpack/test/template/date_helper_test.rb      | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 2806348337..cf24f27536 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -13,7 +13,7 @@ module ActionView
     #
     # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday"
     # would give birthday[month] instead of date[month] if passed to the <tt>select_month</tt> method.
-    # * <tt>:include_blank</tt> - set to true if it should be possible to set an empty date.
+    # * <tt>:include_blank</tt> - set to true or to a prompt string if it should be possible to set an empty date.
     # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true,
     #   the <tt>select_month</tt> method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead
     #   of "date[month]".
@@ -887,7 +887,7 @@ module ActionView
           select_options.merge!(:disabled => 'disabled') if @options[:disabled]
 
           select_html = "\n"
-          select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank]
+          select_html << content_tag(:option, "#{ERB::Util.html_escape(@options[:include_blank]) if @options[:include_blank].kind_of?(String)}", :value => '') + "\n" if @options[:include_blank]
           select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
           select_html << select_options_as_html
 
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index fadfb59572..21c9083386 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1581,6 +1581,26 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :include_blank => true)
   end
 
+  def test_date_select_with_stringified_blank
+    @post = Post.new
+
+    start_year = Time.now.year-5
+    end_year   = Time.now.year+5
+
+    expected = '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i"/>' + "\n"
+    expected <<   %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << "<option value=\"\">blank</option>\n"
+    start_year.upto(end_year) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
+    expected << "</select>\n"
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << "<option value=\"\">blank</option>\n"
+    1.upto(12) { |i| expected << %(<option value="#{i}">#{Date::MONTHNAMES[i]}</option>\n) }
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", :order=>[:year, :month], :include_blank=> 'blank')
+  end
+
   def test_date_select_with_nil_and_blank_and_order
     @post = Post.new
 
-- 
cgit v1.2.3


From 77ed289609ff02b23b9d3c89aa0aeace8d8b280d Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Sat, 24 Dec 2011 01:01:25 +0300
Subject: remove checking for non-empty string before calling to_sym

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 4d83c6dee1..2117cb76b5 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1432,8 +1432,7 @@ module ActionDispatch
           end
 
           def action_path(name, path = nil) #:nodoc:
-            # Ruby 1.8 can't transform empty strings to symbols
-            name = name.to_sym if name.is_a?(String) && !name.empty?
+            name = name.to_sym if name.is_a?(String)
             path || @scope[:path_names][name] || name.to_s
           end
 
-- 
cgit v1.2.3


From 547f32fee50f22e824fbdfb9e540b166fe273cda Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Fri, 23 Dec 2011 18:00:01 -0700
Subject: Remove broken #compute_source_path

---
 actionpack/lib/sprockets/helpers/rails_helper.rb | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 1bd9d5ca26..c34b3f6f26 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -114,11 +114,6 @@ module Sprockets
 
         class AssetNotPrecompiledError < StandardError; end
 
-        # Return the filesystem path for the source
-        def compute_source_path(source, ext)
-          asset_for(source, ext)
-        end
-
         def asset_for(source, ext)
           source = source.to_s
           return nil if is_uri?(source)
-- 
cgit v1.2.3


From ae60475a41cb0f5b3f7e071b75a0b5c5214c9f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= <retro@ballgag.cz>
Date: Sat, 24 Dec 2011 02:50:39 +0100
Subject: Changelog release dates fixed according to rubygems.org

---
 actionpack/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b753addef4..fb8586b1e7 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -149,14 +149,14 @@
 *   Assets should use the request protocol by default or default to
     relative if no request is available *Jonathan del Strother*
 
-## Rails 3.1.3 (unreleased) ##
+## Rails 3.1.3 (November 20, 2011) ##
 
 *   Fix using `tranlate` helper with a html translation which uses the `:count` option for
     pluralization.
 
     *Jon Leighton*
 
-## Rails 3.1.2 (unreleased) ##
+## Rails 3.1.2 (November 18, 2011) ##
 
 *   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
     in combination with HTML-safe translations, the interpolated input would not get HTML
@@ -197,7 +197,7 @@
 
 *   Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
 
-## Rails 3.1.1 (unreleased) ##
+## Rails 3.1.1 (October 7, 2011) ##
 
 *   javascript_path and stylesheet_path now refer to /assets if asset pipelining
     is on. [Santiago Pastorino]
-- 
cgit v1.2.3


From 7b1ac55f50bd580a8a9c6e9bfa8b178f1ab6f443 Mon Sep 17 00:00:00 2001
From: "Andrey A.I. Sitnik" <andrey@sitnik.ru>
Date: Fri, 23 Dec 2011 21:29:49 +0700
Subject: Gzip files on page caching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/lib/action_controller/caching/pages.rb | 32 +++++++++++++++---
 actionpack/test/controller/caching_test.rb        | 41 ++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 957bb7de6b..ba512ec372 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -66,24 +66,30 @@ 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)
+        def cache_page(content, path, extension = nil, gzip = Zlib::BEST_COMPRESSION)
           return unless perform_caching
           path = page_cache_path(path, extension)
 
           instrument_page_cache :write_page, path do
             FileUtils.makedirs(File.dirname(path))
             File.open(path, "wb+") { |f| f.write(content) }
+            if gzip
+              Zlib::GzipWriter.open(path + '.gz', gzip) { |f| f.write(content) }
+            end
           end
         end
 
         # Caches the +actions+ using the page-caching approach that'll store the cache in a path within the page_cache_directory that
         # matches the triggering url.
         #
+        # You can disable gzipping by setting +:gzip+ option to false.
+        #
         # Usage:
         #
         #   # cache the index action
@@ -91,10 +97,28 @@ 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!
-          after_filter({:only => actions}.merge(options)) { |c| c.cache_page }
+
+          gzip_level = options.fetch(:gzip, :best_compression)
+          if gzip_level
+            gzip_level = case gzip_level
+              when Symbol
+                Zlib.const_get(gzip_level.to_s.upcase)
+              when Fixnum
+                gzip_level
+              else
+                Zlib::BEST_COMPRESSION
+            end
+          end
+
+          after_filter({:only => actions}.merge(options)) do |c|
+            c.cache_page(nil, nil, gzip_level)
+          end
         end
 
         private
@@ -136,7 +160,7 @@ module ActionController #:nodoc:
       # 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:
       #   cache_page "I'm the cached content", :controller => "lists", :action => "show"
-      def cache_page(content = nil, options = nil)
+      def cache_page(content = nil, options = nil, gzip = Zlib::BEST_COMPRESSION)
         return unless self.class.perform_caching && caching_allowed?
 
         path = case options
@@ -152,7 +176,7 @@ module ActionController #:nodoc:
           extension = ".#{type_symbol}"
         end
 
-        self.class.cache_page(content || response.body, path, extension)
+        self.class.cache_page(content || response.body, path, extension, gzip)
       end
 
     end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 015e6b9955..dfebb29da3 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -17,6 +17,9 @@ class PageCachingTestController < CachingController
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
   caches_page :found, :not_found
   caches_page :about_me
+  caches_page :default_gzip
+  caches_page :no_gzip, :gzip => false
+  caches_page :gzip_level, :gzip => :best_speed
 
 
   def ok
@@ -40,6 +43,18 @@ class PageCachingTestController < CachingController
     cache_page("Super soaker", "/index.html")
   end
 
+  def default_gzip
+    render :text => "Text"
+  end
+
+  def no_gzip
+    render :text => "PNG"
+  end
+
+  def gzip_level
+    render :text => "Big text"
+  end
+
   def expire_custom_path
     expire_page("/index.html")
     head :ok
@@ -115,6 +130,30 @@ class PageCachingTest < ActionController::TestCase
     assert !File.exist?("#{FILE_STORE_PATH}/index.html")
   end
 
+  def test_should_gzip_cache
+    get :custom_path
+    assert File.exist?("#{FILE_STORE_PATH}/index.html.gz")
+
+    get :expire_custom_path
+    assert !File.exist?("#{FILE_STORE_PATH}/index.html.gz")
+  end
+
+  def test_should_allow_to_disable_gzip
+    get :no_gzip
+    assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/no_gzip.html")
+    assert !File.exist?("#{FILE_STORE_PATH}/page_caching_test/no_gzip.html.gz")
+  end
+
+  def test_should_use_best_gzip_by_default
+    @controller.expects(:cache_page).with(nil, nil, Zlib::BEST_COMPRESSION)
+    get :default_gzip
+  end
+
+  def test_should_set_gzip_level
+    @controller.expects(:cache_page).with(nil, nil, Zlib::BEST_SPEED)
+    get :gzip_level
+  end
+
   def test_should_cache_without_trailing_slash_on_url
     @controller.class.cache_page 'cached content', '/page_caching_test/trailing_slash'
     assert File.exist?("#{FILE_STORE_PATH}/page_caching_test/trailing_slash.html")
@@ -224,7 +263,7 @@ class ActionCachingTestController < CachingController
     @cache_this = MockTime.now.to_f.to_s
     render :text => @cache_this
   end
-  
+
   def record_not_found
     raise ActiveRecord::RecordNotFound, "oops!"
   end
-- 
cgit v1.2.3


From 39081f166023092041605144c87d7a6cd3b65102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Dec 2011 09:54:29 +0100
Subject: Provide a class optin for page_cache_compression.

---
 actionpack/lib/action_controller/caching/pages.rb | 37 ++++++++++++-----------
 actionpack/test/controller/caching_test.rb        |  7 +++--
 2 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index ba512ec372..82b3c30f97 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -16,7 +16,7 @@ module ActionController #:nodoc:
     #     caches_page :show, :new
     #   end
     #
-    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used 
+    # This will generate cache files such as <tt>weblog/show/5.html</tt> and <tt>weblog/new.html</tt>, which match the URLs used
     # that would normally trigger dynamic page generation. Page caching works by configuring a web server to first check for the
     # existence of files on disk, and to serve them directly when found, without passing the request through to Action Pack.
     # This is much faster than handling the full dynamic request in the usual way.
@@ -38,8 +38,6 @@ 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
@@ -47,14 +45,18 @@ module ActionController #:nodoc:
         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.
         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.
+        config_accessor :page_cache_compression
+        self.page_cache_compression ||= false
       end
 
       module ClassMethods
@@ -85,10 +87,11 @@ module ActionController #:nodoc:
           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 disable gzipping by setting +:gzip+ option to false.
+        # You can also pass a :gzip option to override the class configuration one.
         #
         # Usage:
         #
@@ -104,16 +107,16 @@ module ActionController #:nodoc:
           return unless perform_caching
           options = actions.extract_options!
 
-          gzip_level = options.fetch(:gzip, :best_compression)
-          if gzip_level
-            gzip_level = case gzip_level
-              when Symbol
-                Zlib.const_get(gzip_level.to_s.upcase)
-              when Fixnum
-                gzip_level
-              else
-                Zlib::BEST_COMPRESSION
-            end
+          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|
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index dfebb29da3..34a38a5567 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -14,6 +14,8 @@ class CachingController < ActionController::Base
 end
 
 class PageCachingTestController < CachingController
+  self.page_cache_compression = :best_compression
+
   caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? }
   caches_page :found, :not_found
   caches_page :about_me
@@ -21,7 +23,6 @@ class PageCachingTestController < CachingController
   caches_page :no_gzip, :gzip => false
   caches_page :gzip_level, :gzip => :best_speed
 
-
   def ok
     head :ok
   end
@@ -144,7 +145,7 @@ class PageCachingTest < ActionController::TestCase
     assert !File.exist?("#{FILE_STORE_PATH}/page_caching_test/no_gzip.html.gz")
   end
 
-  def test_should_use_best_gzip_by_default
+  def test_should_use_config_gzip_by_default
     @controller.expects(:cache_page).with(nil, nil, Zlib::BEST_COMPRESSION)
     get :default_gzip
   end
@@ -233,7 +234,7 @@ class ActionCachingTestController < CachingController
   caches_action :show, :cache_path => 'http://test.host/custom/show'
   caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
   caches_action :with_layout
-  caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } } 
+  caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } }
   caches_action :layout_false, :layout => false
   caches_action :record_not_found, :four_oh_four, :simple_runtime_error
 
-- 
cgit v1.2.3


From e6bfcc21a8b1a139dacc8d6c957bc4ab3e55c3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Dec 2011 09:59:28 +0100
Subject: Remove unecessary config_accessors.

---
 actionpack/lib/abstract_controller/rendering.rb   | 8 +-------
 actionpack/lib/action_controller/caching/pages.rb | 6 +++---
 actionpack/lib/action_controller/metal/helpers.rb | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index d95770c049..9019c07bca 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -35,7 +35,7 @@ module AbstractController
     include AbstractController::ViewPaths
 
     included do
-      config_accessor :protected_instance_variables, :instance_reader => false
+      class_attribute :protected_instance_variables
       self.protected_instance_variables = []
     end
 
@@ -59,12 +59,6 @@ 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
     end
diff --git a/actionpack/lib/action_controller/caching/pages.rb b/actionpack/lib/action_controller/caching/pages.rb
index 82b3c30f97..159f718029 100644
--- a/actionpack/lib/action_controller/caching/pages.rb
+++ b/actionpack/lib/action_controller/caching/pages.rb
@@ -42,20 +42,20 @@ module ActionController #:nodoc:
         # For Rails, this directory has already been set to Rails.public_path (which is usually set to <tt>Rails.root + "/public"</tt>). Changing
         # this setting can be useful to avoid naming conflicts with files in <tt>public/</tt>, but doing so will likely require configuring your
         # web server to look in the new location for cached files.
-        config_accessor :page_cache_directory
+        class_attribute :page_cache_directory
         self.page_cache_directory ||= ''
 
         # Most Rails requests do not have an extension, such as <tt>/weblog/new</tt>. In these cases, the page caching mechanism will add one in
         # order to make it easy for the cached files to be picked up properly by the web server. By default, this cache extension is <tt>.html</tt>.
         # If you want something else, like <tt>.php</tt> or <tt>.shtml</tt>, just set Base.page_cache_extension. In cases where a request already has an
         # extension, such as <tt>.xml</tt> or <tt>.rss</tt>, page caching will not add an extension. This allows it to work well with RESTful apps.
-        config_accessor :page_cache_extension
+        class_attribute :page_cache_extension
         self.page_cache_extension ||= '.html'
 
         # The compression used for gzip. If false (default), the page is not compressed.
         # If can be a symbol showing the ZLib compression method, for example, :best_compression
         # or :best_speed or an integer configuring the compression level.
-        config_accessor :page_cache_compression
+        class_attribute :page_cache_compression
         self.page_cache_compression ||= false
       end
 
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index bd515bba82..50d7aac300 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -56,7 +56,7 @@ module ActionController
     include AbstractController::Helpers
 
     included do
-      config_accessor :helpers_path, :include_all_helpers
+      class_attribute :helpers_path, :include_all_helpers
       self.helpers_path ||= []
       self.include_all_helpers = true
     end
-- 
cgit v1.2.3


From d1d3cac0d2828f3b7fe0380412a62fb773fc052d Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 24 Dec 2011 15:06:31 +0530
Subject: Revert "Changelog release dates fixed according to rubygems.org"

This reverts commit ae60475a41cb0f5b3f7e071b75a0b5c5214c9f85.

Reason: Changelogs are not meant to be edited in docrails.
---
 actionpack/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index fb8586b1e7..b753addef4 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -149,14 +149,14 @@
 *   Assets should use the request protocol by default or default to
     relative if no request is available *Jonathan del Strother*
 
-## Rails 3.1.3 (November 20, 2011) ##
+## Rails 3.1.3 (unreleased) ##
 
 *   Fix using `tranlate` helper with a html translation which uses the `:count` option for
     pluralization.
 
     *Jon Leighton*
 
-## Rails 3.1.2 (November 18, 2011) ##
+## Rails 3.1.2 (unreleased) ##
 
 *   Fix XSS security vulnerability in the `translate` helper method. When using interpolation
     in combination with HTML-safe translations, the interpolated input would not get HTML
@@ -197,7 +197,7 @@
 
 *   Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
 
-## Rails 3.1.1 (October 7, 2011) ##
+## Rails 3.1.1 (unreleased) ##
 
 *   javascript_path and stylesheet_path now refer to /assets if asset pipelining
     is on. [Santiago Pastorino]
-- 
cgit v1.2.3


From f32247cb3eb1a444e40a66c1ad6147fdac4392c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Dec 2011 10:53:44 +0100
Subject: Update CHANGELOGs

---
 actionpack/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index b753addef4..0c1228b7c6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Add :gzip option to `caches_page`. The default option can be configured globally using `page_cache_compression` *Andrey Sitnik*
+
 *   The ShowExceptions middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in `env["action_dispatch.exception"]` and with the PATH_INFO rewritten to the status code. *José Valim*
 
 *   Add `button_tag` support to ActionView::Helpers::FormBuilder.
-- 
cgit v1.2.3


From 58f69ba085542bf99ae6cdd34ddf62cb847aceed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 24 Dec 2011 11:28:05 +0100
Subject: Remove Rescue middleware that was never used by Rails.

---
 actionpack/lib/action_dispatch.rb                  |  1 -
 .../lib/action_dispatch/middleware/rescue.rb       | 26 ----------------------
 actionpack/test/controller/rescue_test.rb          | 17 +-------------
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 actionpack/lib/action_dispatch/middleware/rescue.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index bcb2ac8ffc..070ffbdceb 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -60,7 +60,6 @@ module ActionDispatch
     autoload :PublicExceptions
     autoload :Reloader
     autoload :RemoteIp
-    autoload :Rescue
     autoload :ShowExceptions
     autoload :Static
   end
diff --git a/actionpack/lib/action_dispatch/middleware/rescue.rb b/actionpack/lib/action_dispatch/middleware/rescue.rb
deleted file mode 100644
index aee672112c..0000000000
--- a/actionpack/lib/action_dispatch/middleware/rescue.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module ActionDispatch
-  class Rescue
-    def initialize(app, rescuers = {}, &block)
-      @app, @rescuers = app, {}
-      rescuers.each { |exception, rescuer| rescue_from(exception, rescuer) }
-      instance_eval(&block) if block_given?
-    end
-
-    def call(env)
-      @app.call(env)
-    rescue Exception => exception
-      if rescuer = @rescuers[exception.class.name]
-        env['action_dispatch.rescue.exception'] = exception
-        rescuer.call(env)
-      else
-        raise exception
-      end
-    end
-
-    protected
-      def rescue_from(exception, rescuer)
-        exception = exception.class.name if exception.is_a?(Exception)
-        @rescuers[exception.to_s] = rescuer
-      end
-  end
-end
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index c445285538..86d6737cbb 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -338,23 +338,8 @@ class RescueTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'rescue routing exceptions' do
-    raiser = proc { |env| raise ActionController::RoutingError, "Did not handle the request" }
-    @app = ActionDispatch::Rescue.new(raiser) do
-      rescue_from ActionController::RoutingError, lambda { |env| [200, {"Content-Type" => "text/html"}, ["Gotcha!"]] }
-    end
-
-    get '/b00m'
-    assert_equal "Gotcha!", response.body
-  end
-
-  test 'unrescued exception' do
-    raiser = proc { |env| raise ActionController::RoutingError, "Did not handle the request" }
-    @app = ActionDispatch::Rescue.new(raiser)
-    assert_raise(ActionController::RoutingError) { get '/b00m' }
-  end
-
   private
+
     def with_test_routing
       with_routing do |set|
         set.draw do
-- 
cgit v1.2.3


From 5ca86ac8f924b333a5a01a47cc07cbcf39c16e80 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sat, 24 Dec 2011 15:57:54 +0300
Subject: deprecate String#encoding_aware? and remove its usage

---
 .../vendor/html-scanner/html/tokenizer.rb          |  2 +-
 actionpack/lib/action_dispatch/http/parameters.rb  |  2 -
 actionpack/lib/action_dispatch/http/upload.rb      |  4 +-
 .../lib/action_dispatch/routing/route_set.rb       |  2 +-
 actionpack/lib/action_view/buffers.rb              |  2 +-
 .../lib/action_view/helpers/javascript_helper.rb   |  6 +-
 actionpack/lib/action_view/template.rb             | 24 +++---
 .../lib/action_view/template/handlers/erb.rb       | 24 +++---
 actionpack/test/abstract_unit.rb                   | 13 ++-
 .../request/url_encoded_params_parsing_test.rb     |  2 -
 actionpack/test/dispatch/response_test.rb          |  3 -
 actionpack/test/dispatch/uploaded_file_test.rb     |  8 +-
 actionpack/test/template/javascript_helper_test.rb |  6 +-
 actionpack/test/template/template_test.rb          | 98 +++++++++++-----------
 14 files changed, 84 insertions(+), 112 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
index c252e01cf5..8ac8d34430 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/tokenizer.rb
@@ -23,7 +23,7 @@ module HTML #:nodoc:
 
     # Create a new Tokenizer for the given text.
     def initialize(text)
-      text.encode! if text.encoding_aware?
+      text.encode!
       @scanner = StringScanner.new(text)
       @position = 0
       @line = 0
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index ef5d207b26..d9b63faf5e 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -41,8 +41,6 @@ module ActionDispatch
       # you'll get a weird error down the road, but our form handling
       # should really prevent that from happening
       def encode_params(params)
-        return params unless "ruby".encoding_aware?
-
         if params.is_a?(String)
           return params.force_encoding("UTF-8").encode!
         elsif !params.is_a?(Hash)
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 94fa747a79..5ab99d1061 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -22,8 +22,8 @@ module ActionDispatch
       
       private
       def encode_filename(filename)
-        # Encode the filename in the utf8 encoding, unless it is nil or we're in 1.8
-        if "ruby".encoding_aware? && filename
+        # Encode the filename in the utf8 encoding, unless it is nil
+        if filename
           filename.force_encoding("UTF-8").encode!
         else
           filename
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 6d6de36a08..d065d9f9d8 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -584,7 +584,7 @@ module ActionDispatch
         @router.recognize(req) do |route, matches, params|
           params.each do |key, value|
             if value.is_a?(String)
-              value = value.dup.force_encoding(Encoding::BINARY) if value.encoding_aware?
+              value = value.dup.force_encoding(Encoding::BINARY)
               params[key] = URI.parser.unescape(value)
             end
           end
diff --git a/actionpack/lib/action_view/buffers.rb b/actionpack/lib/action_view/buffers.rb
index be7f65c2ce..2372d3c433 100644
--- a/actionpack/lib/action_view/buffers.rb
+++ b/actionpack/lib/action_view/buffers.rb
@@ -4,7 +4,7 @@ module ActionView
   class OutputBuffer < ActiveSupport::SafeBuffer #:nodoc:
     def initialize(*)
       super
-      encode! if encoding_aware?
+      encode!
     end
 
     def <<(value)
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 842f4c23a3..309923490c 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -14,11 +14,7 @@ module ActionView
         "'"     => "\\'"
       }
 
-      if "ruby".encoding_aware?
-        JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '&#x2028;'
-      else
-        JS_ESCAPE_MAP["\342\200\250"] = '&#x2028;'
-      end
+      JS_ESCAPE_MAP["\342\200\250".force_encoding('UTF-8').encode!] = '&#x2028;'
 
       # Escapes carriage returns and single and double quotes for JavaScript segments.
       #
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index eac6287b0b..2d9fc3df7a 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -184,7 +184,7 @@ module ActionView
     # before passing the source on to the template engine, leaving a
     # blank line in its stead.
     def encode!
-      return unless source.encoding_aware? && source.encoding == Encoding::BINARY
+      return unless source.encoding == Encoding::BINARY
 
       # Look for # encoding: *. If we find one, we'll encode the
       # String in that encoding, otherwise, we'll use the
@@ -265,20 +265,18 @@ module ActionView
           end
         end_src
 
-        if source.encoding_aware?
-          # Make sure the source is in the encoding of the returned code
-          source.force_encoding(code.encoding)
+        # Make sure the source is in the encoding of the returned code
+        source.force_encoding(code.encoding)
 
-          # In case we get back a String from a handler that is not in
-          # BINARY or the default_internal, encode it to the default_internal
-          source.encode!
+        # In case we get back a String from a handler that is not in
+        # BINARY or the default_internal, encode it to the default_internal
+        source.encode!
 
-          # Now, validate that the source we got back from the template
-          # handler is valid in the default_internal. This is for handlers
-          # that handle encoding but screw up
-          unless source.valid_encoding?
-            raise WrongEncodingError.new(@source, Encoding.default_internal)
-          end
+        # Now, validate that the source we got back from the template
+        # handler is valid in the default_internal. This is for handlers
+        # that handle encoding but screw up
+        unless source.valid_encoding?
+          raise WrongEncodingError.new(@source, Encoding.default_internal)
         end
 
         begin
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 25f26dd609..323df67c97 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -67,23 +67,19 @@ module ActionView
         end
 
         def call(template)
-          if template.source.encoding_aware?
-            # First, convert to BINARY, so in case the encoding is
-            # wrong, we can still find an encoding tag
-            # (<%# encoding %>) inside the String using a regular
-            # expression
-            template_source = template.source.dup.force_encoding("BINARY")
+          # First, convert to BINARY, so in case the encoding is
+          # wrong, we can still find an encoding tag
+          # (<%# encoding %>) inside the String using a regular
+          # expression
+          template_source = template.source.dup.force_encoding("BINARY")
 
-            erb = template_source.gsub(ENCODING_TAG, '')
-            encoding = $2
+          erb = template_source.gsub(ENCODING_TAG, '')
+          encoding = $2
 
-            erb.force_encoding valid_encoding(template.source.dup, encoding)
+          erb.force_encoding valid_encoding(template.source.dup, encoding)
 
-            # Always make sure we return a String in the default_internal
-            erb.encode!
-          else
-            erb = template.source.dup
-          end
+          # Always make sure we return a String in the default_internal
+          erb.encode!
 
           self.class.erb_implementation.new(
             erb,
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 40ca23a39d..63109d592a 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -14,14 +14,11 @@ ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
 
 require 'active_support/core_ext/kernel/reporting'
 
-require 'active_support/core_ext/string/encoding'
-if "ruby".encoding_aware?
-  # These are the normal settings that will be set up by Railties
-  # TODO: Have these tests support other combinations of these values
-  silence_warnings do
-    Encoding.default_internal = "UTF-8"
-    Encoding.default_external = "UTF-8"
-  end
+# These are the normal settings that will be set up by Railties
+# TODO: Have these tests support other combinations of these values
+silence_warnings do
+  Encoding.default_internal = "UTF-8"
+  Encoding.default_external = "UTF-8"
 end
 
 require 'test/unit'
diff --git a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
index 04a0fb6f34..05569561d2 100644
--- a/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
@@ -146,8 +146,6 @@ class UrlEncodedParamsParsingTest < ActionDispatch::IntegrationTest
     end
 
     def assert_utf8(object)
-      return unless "ruby".encoding_aware?
-
       correct_encoding = Encoding.default_internal
 
       unless object.is_a?(Hash)
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 9bdd5ecbc6..82d1200f8e 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -6,9 +6,6 @@ class ResponseTest < ActiveSupport::TestCase
   end
 
   def test_response_body_encoding
-    # FIXME: remove this conditional on Rails 4.0
-    return unless "<3".encoding_aware?
-
     body = ["hello".encode('utf-8')]
     response = ActionDispatch::Response.new 200, {}, body
     assert_equal Encoding::UTF_8, response.body.encoding
diff --git a/actionpack/test/dispatch/uploaded_file_test.rb b/actionpack/test/dispatch/uploaded_file_test.rb
index 7e4a1519fb..0b95291e18 100644
--- a/actionpack/test/dispatch/uploaded_file_test.rb
+++ b/actionpack/test/dispatch/uploaded_file_test.rb
@@ -13,11 +13,9 @@ module ActionDispatch
       assert_equal 'foo', uf.original_filename
     end
     
-    if "ruby".encoding_aware?
-      def test_filename_should_be_in_utf_8
-        uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
-        assert_equal "UTF-8", uf.original_filename.encoding.to_s
-      end
+    def test_filename_should_be_in_utf_8
+      uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
+      assert_equal "UTF-8", uf.original_filename.encoding.to_s
     end
 
     def test_content_type
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 4b9c3c97b1..d98ffe8fa7 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -28,11 +28,7 @@ class JavaScriptHelperTest < ActionView::TestCase
     assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
     assert_equal %(backslash\\\\test), escape_javascript( %(backslash\\test) )
     assert_equal %(dont <\\/close> tags), escape_javascript(%(dont </close> tags))
-    if "ruby".encoding_aware?
-      assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!)
-    else
-      assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline))
-    end
+    assert_equal %(unicode &#x2028; newline), escape_javascript(%(unicode \342\200\250 newline).force_encoding('UTF-8').encode!)
     assert_equal %(dont <\\/close> tags), j(%(dont </close> tags))
   end
 
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 13d30a93ce..f9c228f0c3 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -114,67 +114,65 @@ class TestERBTemplate < ActiveSupport::TestCase
     end
   end
 
-  if "ruby".encoding_aware?
-    def test_resulting_string_is_utf8
-      @template = new_template
-      assert_equal Encoding::UTF_8, render.encoding
-    end
+  def test_resulting_string_is_utf8
+    @template = new_template
+    assert_equal Encoding::UTF_8, render.encoding
+  end
+
+  def test_no_magic_comment_word_with_utf_8
+    @template = new_template("hello \u{fc}mlat")
+    assert_equal Encoding::UTF_8, render.encoding
+    assert_equal "hello \u{fc}mlat", render
+  end
 
-    def test_no_magic_comment_word_with_utf_8
-      @template = new_template("hello \u{fc}mlat")
+  # This test ensures that if the default_external
+  # is set to something other than UTF-8, we don't
+  # get any errors and get back a UTF-8 String.
+  def test_default_external_works
+    with_external_encoding "ISO-8859-1" do
+      @template = new_template("hello \xFCmlat")
       assert_equal Encoding::UTF_8, render.encoding
       assert_equal "hello \u{fc}mlat", render
     end
+  end
 
-    # This test ensures that if the default_external
-    # is set to something other than UTF-8, we don't
-    # get any errors and get back a UTF-8 String.
-    def test_default_external_works
-      with_external_encoding "ISO-8859-1" do
-        @template = new_template("hello \xFCmlat")
-        assert_equal Encoding::UTF_8, render.encoding
-        assert_equal "hello \u{fc}mlat", render
-      end
-    end
-
-    def test_encoding_can_be_specified_with_magic_comment
-      @template = new_template("# encoding: ISO-8859-1\nhello \xFCmlat")
-      assert_equal Encoding::UTF_8, render.encoding
-      assert_equal "\nhello \u{fc}mlat", render
-    end
+  def test_encoding_can_be_specified_with_magic_comment
+    @template = new_template("# encoding: ISO-8859-1\nhello \xFCmlat")
+    assert_equal Encoding::UTF_8, render.encoding
+    assert_equal "\nhello \u{fc}mlat", render
+  end
 
-    # TODO: This is currently handled inside ERB. The case of explicitly
-    # lying about encodings via the normal Rails API should be handled
-    # inside Rails.
-    def test_lying_with_magic_comment
-      assert_raises(ActionView::Template::Error) do
-        @template = new_template("# encoding: UTF-8\nhello \xFCmlat", :virtual_path => nil)
-        render
-      end
+  # TODO: This is currently handled inside ERB. The case of explicitly
+  # lying about encodings via the normal Rails API should be handled
+  # inside Rails.
+  def test_lying_with_magic_comment
+    assert_raises(ActionView::Template::Error) do
+      @template = new_template("# encoding: UTF-8\nhello \xFCmlat", :virtual_path => nil)
+      render
     end
+  end
 
-    def test_encoding_can_be_specified_with_magic_comment_in_erb
-      with_external_encoding Encoding::UTF_8 do
-        @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil)
-        assert_equal Encoding::UTF_8, render.encoding
-        assert_equal "hello \u{fc}mlat", render
-      end
+  def test_encoding_can_be_specified_with_magic_comment_in_erb
+    with_external_encoding Encoding::UTF_8 do
+      @template = new_template("<%# encoding: ISO-8859-1 %>hello \xFCmlat", :virtual_path => nil)
+      assert_equal Encoding::UTF_8, render.encoding
+      assert_equal "hello \u{fc}mlat", render
     end
+  end
 
-    def test_error_when_template_isnt_valid_utf8
-      assert_raises(ActionView::Template::Error, /\xFC/) do
-        @template = new_template("hello \xFCmlat", :virtual_path => nil)
-        render
-      end
+  def test_error_when_template_isnt_valid_utf8
+    assert_raises(ActionView::Template::Error, /\xFC/) do
+      @template = new_template("hello \xFCmlat", :virtual_path => nil)
+      render
     end
+  end
 
-    def with_external_encoding(encoding)
-      old = Encoding.default_external
-      Encoding::Converter.new old, encoding if old != encoding
-      silence_warnings { Encoding.default_external = encoding }
-      yield
-    ensure
-      silence_warnings { Encoding.default_external = old }
-    end
+  def with_external_encoding(encoding)
+    old = Encoding.default_external
+    Encoding::Converter.new old, encoding if old != encoding
+    silence_warnings { Encoding.default_external = encoding }
+    yield
+  ensure
+    silence_warnings { Encoding.default_external = old }
   end
 end
-- 
cgit v1.2.3


From 1e9e88fcd335c7d5a99159d592c3e1b605510a16 Mon Sep 17 00:00:00 2001
From: Sergey Nartimov <just.lest@gmail.com>
Date: Sun, 25 Dec 2011 14:34:58 +0300
Subject: remove checks for encodings availability

---
 actionpack/lib/action_dispatch/http/request.rb     |  2 +-
 .../middleware/session/abstract_store.rb           |  2 +-
 .../lib/action_view/helpers/capture_helper.rb      |  2 +-
 actionpack/test/controller/routing_test.rb         |  2 +-
 actionpack/test/controller/send_file_test.rb       |  2 +-
 actionpack/test/controller/test_test.rb            |  2 +-
 .../request/multipart_params_parsing_test.rb       |  2 +-
 actionpack/test/template/output_buffer_test.rb     | 16 +++--
 actionpack/test/template/render_test.rb            | 70 +++++++++++-----------
 9 files changed, 48 insertions(+), 52 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 820921252d..0a0ebe7fad 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -189,7 +189,7 @@ module ActionDispatch
     # variable is already set, wrap it in a StringIO.
     def body
       if raw_post = @env['RAW_POST_DATA']
-        raw_post.force_encoding(Encoding::BINARY) if raw_post.respond_to?(:force_encoding)
+        raw_post.force_encoding(Encoding::BINARY)
         StringIO.new(raw_post)
       else
         @env['rack.input']
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index f75b4d4d04..6a8e690d18 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -30,7 +30,7 @@ module ActionDispatch
 
       def generate_sid
         sid = SecureRandom.hex(16)
-        sid.encode!('UTF-8') if sid.respond_to?(:encode!)
+        sid.encode!('UTF-8')
         sid
       end
 
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 8abd85c3a3..0a0d31dded 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -181,7 +181,7 @@ module ActionView
       def with_output_buffer(buf = nil) #:nodoc:
         unless buf
           buf = ActionView::OutputBuffer.new
-          buf.force_encoding(output_buffer.encoding) if output_buffer.respond_to?(:encoding) && buf.respond_to?(:force_encoding)
+          buf.force_encoding(output_buffer.encoding) if output_buffer
         end
         self.output_buffer, old_buffer = buf, output_buffer
         yield
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 53a50898c5..c9785d9b8a 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -483,7 +483,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal({ :controller => "content", :action => 'show_page', :id => 'foo' }, rs.recognize_path("/page/foo"))
 
     token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in Russian
-    token.force_encoding(Encoding::BINARY) if token.respond_to?(:force_encoding)
+    token.force_encoding(Encoding::BINARY)
     escaped_token = CGI::escape(token)
 
     assert_equal '/page/' + escaped_token, url_for(rs, { :controller => 'content', :action => 'show_page', :id => token })
diff --git a/actionpack/test/controller/send_file_test.rb b/actionpack/test/controller/send_file_test.rb
index 8f885ff28e..36884846be 100644
--- a/actionpack/test/controller/send_file_test.rb
+++ b/actionpack/test/controller/send_file_test.rb
@@ -61,7 +61,7 @@ class SendFileTest < ActionController::TestCase
     require 'stringio'
     output = StringIO.new
     output.binmode
-    output.string.force_encoding(file_data.encoding) if output.string.respond_to?(:force_encoding)
+    output.string.force_encoding(file_data.encoding)
     assert_nothing_raised { response.body_parts.each { |part| output << part.to_s } }
     assert_equal file_data, output.string
   end
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 0e75a23cfd..b3b7ece518 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -673,7 +673,7 @@ XML
     path = "#{FILES_DIR}/#{filename}"
     content_type = 'image/png'
     expected = File.read(path)
-    expected.force_encoding(Encoding::BINARY) if expected.respond_to?(:force_encoding)
+    expected.force_encoding(Encoding::BINARY)
 
     file = Rack::Test::UploadedFile.new(path, content_type)
     assert_equal filename, file.original_filename
diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 560ea00923..d144f013f5 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -89,7 +89,7 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
 
     # Rack doesn't handle multipart/mixed for us.
     files = params['files']
-    files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
+    files.force_encoding('ASCII-8BIT')
     assert_equal 19756, files.size
   end
 
diff --git a/actionpack/test/template/output_buffer_test.rb b/actionpack/test/template/output_buffer_test.rb
index bd49a11af1..eb0df3d1ab 100644
--- a/actionpack/test/template/output_buffer_test.rb
+++ b/actionpack/test/template/output_buffer_test.rb
@@ -39,15 +39,13 @@ class OutputBufferTest < ActionController::TestCase
     assert_equal ['foo', 'bar'], body_parts
   end
 
-  if '1.9'.respond_to?(:force_encoding)
-    test 'flushing preserves output buffer encoding' do
-      original_buffer = ' '.force_encoding(Encoding::EUC_JP)
-      @vc.output_buffer = original_buffer
-      @vc.flush_output_buffer
-      assert_equal ['foo', original_buffer], body_parts
-      assert_not_equal original_buffer, output_buffer
-      assert_equal Encoding::EUC_JP, output_buffer.encoding
-    end
+  test 'flushing preserves output buffer encoding' do
+    original_buffer = ' '.force_encoding(Encoding::EUC_JP)
+    @vc.output_buffer = original_buffer
+    @vc.flush_output_buffer
+    assert_equal ['foo', original_buffer], body_parts
+    assert_not_equal original_buffer, output_buffer
+    assert_equal Encoding::EUC_JP, output_buffer.encoding
   end
 
   protected
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 761bcf61f2..5d3dc73ed2 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -410,51 +410,49 @@ class LazyViewRenderTest < ActiveSupport::TestCase
     GC.start
   end
 
-  if '1.9'.respond_to?(:force_encoding)
-    def test_render_utf8_template_with_magic_comment
-      with_external_encoding Encoding::ASCII_8BIT do
-        result = @view.render(:file => "test/utf8_magic", :formats => [:html], :layouts => "layouts/yield")
-        assert_equal Encoding::UTF_8, result.encoding
-        assert_equal "\nРусский \nтекст\n\nUTF-8\nUTF-8\nUTF-8\n", result
-      end
+  def test_render_utf8_template_with_magic_comment
+    with_external_encoding Encoding::ASCII_8BIT do
+      result = @view.render(:file => "test/utf8_magic", :formats => [:html], :layouts => "layouts/yield")
+      assert_equal Encoding::UTF_8, result.encoding
+      assert_equal "\nРусский \nтекст\n\nUTF-8\nUTF-8\nUTF-8\n", result
     end
+  end
 
-    def test_render_utf8_template_with_default_external_encoding
-      with_external_encoding Encoding::UTF_8 do
-        result = @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
-        assert_equal Encoding::UTF_8, result.encoding
-        assert_equal "Русский текст\n\nUTF-8\nUTF-8\nUTF-8\n", result
-      end
+  def test_render_utf8_template_with_default_external_encoding
+    with_external_encoding Encoding::UTF_8 do
+      result = @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
+      assert_equal Encoding::UTF_8, result.encoding
+      assert_equal "Русский текст\n\nUTF-8\nUTF-8\nUTF-8\n", result
     end
+  end
 
-    def test_render_utf8_template_with_incompatible_external_encoding
-      with_external_encoding Encoding::SHIFT_JIS do
-        begin
-          @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
-          flunk 'Should have raised incompatible encoding error'
-        rescue ActionView::Template::Error => error
-          assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
-        end
+  def test_render_utf8_template_with_incompatible_external_encoding
+    with_external_encoding Encoding::SHIFT_JIS do
+      begin
+        @view.render(:file => "test/utf8", :formats => [:html], :layouts => "layouts/yield")
+        flunk 'Should have raised incompatible encoding error'
+      rescue ActionView::Template::Error => error
+        assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
       end
     end
+  end
 
-    def test_render_utf8_template_with_partial_with_incompatible_encoding
-      with_external_encoding Encoding::SHIFT_JIS do
-        begin
-          @view.render(:file => "test/utf8_magic_with_bare_partial", :formats => [:html], :layouts => "layouts/yield")
-          flunk 'Should have raised incompatible encoding error'
-        rescue ActionView::Template::Error => error
-          assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
-        end
+  def test_render_utf8_template_with_partial_with_incompatible_encoding
+    with_external_encoding Encoding::SHIFT_JIS do
+      begin
+        @view.render(:file => "test/utf8_magic_with_bare_partial", :formats => [:html], :layouts => "layouts/yield")
+        flunk 'Should have raised incompatible encoding error'
+      rescue ActionView::Template::Error => error
+        assert_match 'Your template was not saved as valid Shift_JIS', error.original_exception.message
       end
     end
+  end
 
-    def with_external_encoding(encoding)
-      old = Encoding.default_external
-      silence_warnings { Encoding.default_external = encoding }
-      yield
-    ensure
-      silence_warnings { Encoding.default_external = old }
-    end
+  def with_external_encoding(encoding)
+    old = Encoding.default_external
+    silence_warnings { Encoding.default_external = encoding }
+    yield
+  ensure
+    silence_warnings { Encoding.default_external = old }
   end
 end
-- 
cgit v1.2.3


From 40bda760675f7cd05d44c66c6daf1f95161a15de Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 25 Dec 2011 11:02:42 -0800
Subject: removes the compatibility method Module#instance_method_names

---
 actionpack/lib/action_view/helpers/form_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index ffb5a729ed..5a301ca9b1 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -5,7 +5,6 @@ require 'action_view/helpers/form_tag_helper'
 require 'action_view/helpers/active_model_helper'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/slice'
-require 'active_support/core_ext/module/method_names'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/array/extract_options'
@@ -1232,7 +1231,7 @@ module ActionView
     class FormBuilder
       # The methods which wrap a form helper call.
       class_attribute :field_helpers
-      self.field_helpers = FormHelper.instance_method_names - %w(form_for convert_to_model)
+      self.field_helpers = FormHelper.instance_methods - [:form_for, :convert_to_model]
 
       attr_accessor :object_name, :object, :options
 
-- 
cgit v1.2.3


From a7ba8e1fb325a20dc5115eeef278ce946d0450c7 Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Wed, 21 Dec 2011 22:28:40 +0300
Subject: remove File#to_path alias

---
 actionpack/lib/action_controller/metal/data_streaming.rb | 3 +--
 actionpack/lib/action_controller/metal/streaming.rb      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 0670a58d97..30ddf6c16e 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/file/path'
 require 'action_controller/metal/exceptions'
 
 module ActionController #:nodoc:
@@ -115,7 +114,7 @@ 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?
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 5fe5334458..0e46402962 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/file/path'
 require 'rack/chunked'
 
 module ActionController #:nodoc:
@@ -195,7 +194,7 @@ module ActionController #:nodoc:
   # ==== Passenger
   #
   # To be described.
-  # 
+  #
   module Streaming
     extend ActiveSupport::Concern
 
-- 
cgit v1.2.3


From 28cd098d99c52486aecb72aab39105d8abcd52ad Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 26 Dec 2011 11:31:22 +0100
Subject: Correctly display rack apps with dynamic constraints in
 RoutesInspector

If you used dynamic constraint like that:

  scope :constraint => MyConstraint.new do
    mount RackApp => "/foo"
  end

routes were not displayed correctly when using `rake routes`.
This commit fixes it. If you want nice display of dynamic
constraints in `rake routes` output, please just override
to_s method in your constraint's class.
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 2117cb76b5..ce4d407217 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -16,7 +16,7 @@ module ActionDispatch
           end
         end
 
-        attr_reader :app
+        attr_reader :app, :constraints
 
         def initialize(app, constraints, request)
           @app, @constraints, @request = app, constraints, request
-- 
cgit v1.2.3


From 719ba0b6bb0653da3f35ed55557d7c3f034c092a Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 26 Dec 2011 13:56:47 +0100
Subject: Revert "Merge pull request #4154 from
 nashby/include-blank-date-helper"

This reverts commit 76f0fa6066b78cd8f0e139dff4a7b65c96db5778, reversing
changes made to 28cd098d99c52486aecb72aab39105d8abcd52ad.
---
 actionpack/lib/action_view/helpers/date_helper.rb |  4 ++--
 actionpack/test/template/date_helper_test.rb      | 20 --------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index cf24f27536..2806348337 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -13,7 +13,7 @@ module ActionView
     #
     # * <tt>:prefix</tt> - overwrites the default prefix of "date" used for the select names. So specifying "birthday"
     # would give birthday[month] instead of date[month] if passed to the <tt>select_month</tt> method.
-    # * <tt>:include_blank</tt> - set to true or to a prompt string if it should be possible to set an empty date.
+    # * <tt>:include_blank</tt> - set to true if it should be possible to set an empty date.
     # * <tt>:discard_type</tt> - set to true if you want to discard the type part of the select name. If set to true,
     #   the <tt>select_month</tt> method would use simply "date" (which can be overwritten using <tt>:prefix</tt>) instead
     #   of "date[month]".
@@ -887,7 +887,7 @@ module ActionView
           select_options.merge!(:disabled => 'disabled') if @options[:disabled]
 
           select_html = "\n"
-          select_html << content_tag(:option, "#{ERB::Util.html_escape(@options[:include_blank]) if @options[:include_blank].kind_of?(String)}", :value => '') + "\n" if @options[:include_blank]
+          select_html << content_tag(:option, '', :value => '') + "\n" if @options[:include_blank]
           select_html << prompt_option_tag(type, @options[:prompt]) + "\n" if @options[:prompt]
           select_html << select_options_as_html
 
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 21c9083386..fadfb59572 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1581,26 +1581,6 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", :include_blank => true)
   end
 
-  def test_date_select_with_stringified_blank
-    @post = Post.new
-
-    start_year = Time.now.year-5
-    end_year   = Time.now.year+5
-
-    expected = '<input name="post[written_on(3i)]" type="hidden" id="post_written_on_3i"/>' + "\n"
-    expected <<   %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
-    expected << "<option value=\"\">blank</option>\n"
-    start_year.upto(end_year) { |i| expected << %(<option value="#{i}">#{i}</option>\n) }
-    expected << "</select>\n"
-
-    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
-    expected << "<option value=\"\">blank</option>\n"
-    1.upto(12) { |i| expected << %(<option value="#{i}">#{Date::MONTHNAMES[i]}</option>\n) }
-    expected << "</select>\n"
-
-    assert_dom_equal expected, date_select("post", "written_on", :order=>[:year, :month], :include_blank=> 'blank')
-  end
-
   def test_date_select_with_nil_and_blank_and_order
     @post = Post.new
 
-- 
cgit v1.2.3


From a19d0f5a66f17c356c5255c5d5930a73a25f627a Mon Sep 17 00:00:00 2001
From: Vasiliy Ermolovich <younash@gmail.com>
Date: Tue, 27 Dec 2011 22:46:44 +0300
Subject: deprecate Base64.encode64s from AS. Use Base64.strict_encode64
 instead

---
 actionpack/lib/action_controller/metal/http_authentication.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 56335a22cb..594ba7a7b8 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -145,7 +145,7 @@ module ActionController
       end
 
       def encode_credentials(user_name, password)
-        "Basic #{ActiveSupport::Base64.encode64s("#{user_name}:#{password}")}"
+        "Basic #{ActiveSupport::Base64.strict_encode64("#{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(":"))
-        ActiveSupport::Base64.encode64("#{t}:#{digest}").gsub("\n", '')
+        ActiveSupport::Base64.strict_encode64("#{t}:#{digest}")
       end
 
       # Might want a shorter timeout depending on whether the request
-- 
cgit v1.2.3


From 0d01e09c6c78c2276433e69671af5c211e243d50 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 28 Dec 2011 12:20:51 -0200
Subject: Bump to rack 1.4.0

---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index e369277e5a..dbf78a6d94 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activemodel',   version)
   s.add_dependency('rack-cache',    '~> 1.1')
   s.add_dependency('builder',       '~> 3.0.0')
-  s.add_dependency('rack',          '~> 1.3.5')
+  s.add_dependency('rack',          '~> 1.4.0')
   s.add_dependency('rack-test',     '~> 0.6.1')
   s.add_dependency('journey',       '~> 1.0.0.rc1')
   s.add_dependency('sprockets',     '~> 2.1.2')
-- 
cgit v1.2.3


From 4cd7c4e8cef756412cb088b959569c06ba25817b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Andr=C3=A9s?= <fuzzy.alej@gmail.com>
Date: Wed, 28 Dec 2011 15:41:33 +0100
Subject: Fixed formatting of code examples in form_tag_helper.rb

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 1424a3584d..fb89641a16 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -407,7 +407,7 @@ module ActionView
       #
       #   submit_tag "Save", :confirm => "Are you sure?"
       #   # => <input name='commit' type='submit' value='Save'
-      #         data-confirm="Are you sure?" />
+      #   #     data-confirm="Are you sure?" />
       #
       def submit_tag(value = "Save changes", options = {})
         options = options.stringify_keys
@@ -451,12 +451,12 @@ module ActionView
       #     content_tag(:strong, 'Ask me!')
       #   end
       #   # => <button name="button" type="button">
-      #          <strong>Ask me!</strong>
-      #        </button>
+      #   #     <strong>Ask me!</strong>
+      #   #    </button>
       #
       #   button_tag "Checkout", :disable_with => "Please wait..."
       #   # => <button data-disable-with="Please wait..." name="button"
-      #                type="submit">Checkout</button>
+      #   #            type="submit">Checkout</button>
       #
       def button_tag(content_or_options = nil, options = nil, &block)
         options = content_or_options if block_given? && content_or_options.is_a?(Hash)
-- 
cgit v1.2.3


From c8dcc19cf9e40c4387bfc197bc118da16c8469c3 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 28 Dec 2011 15:55:06 -0200
Subject: Add CHANGELOG entry

---
 actionpack/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 0c1228b7c6..c992f1388a 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Depends on rack ~> 1.4.0 *Santiago Pastorino*
+
 *   Add :gzip option to `caches_page`. The default option can be configured globally using `page_cache_compression` *Andrey Sitnik*
 
 *   The ShowExceptions middleware now accepts a exceptions application that is responsible to render an exception when the application fails. The application is invoked with a copy of the exception in `env["action_dispatch.exception"]` and with the PATH_INFO rewritten to the status code. *José Valim*
-- 
cgit v1.2.3


From a7d3851bdbc030e1eb14b66fd72ad602b6d4348c Mon Sep 17 00:00:00 2001
From: Kevin Moore <kevin@thinkpixellab.com>
Date: Wed, 28 Dec 2011 10:59:28 -0800
Subject: Documented about using :path option for resources

---
 actionpack/lib/action_dispatch/routing/mapper.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 2117cb76b5..84f544c546 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1053,6 +1053,13 @@ module ActionDispatch
         #
         #   The above example will now change /posts/new to /posts/brand_new
         #
+        # [:path]
+        #   Allows you to change the path prefix for the resource.
+        #
+        #     resources :posts, :path => 'postings'
+        #
+        #   The resource and all segments will now route to /postings instead of /posts
+        #
         # [:only]
         #   Only generate routes for the given actions.
         #
-- 
cgit v1.2.3


From 77df5ba0a17b2e7587c7849429027ed71af8547a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 17:14:22 -0800
Subject: no need for bang bang :bomb:

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index bc5b163931..fbcbfb9645 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -214,7 +214,7 @@ module ActionDispatch
       protected
 
         def now_is_loaded?
-          !!@now
+          @now
         end
 
         # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-- 
cgit v1.2.3


From b88a181b7f296d89237bdb727ecc15cbfdf13b65 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 17:22:37 -0800
Subject: fix method visibility

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index fbcbfb9645..c9d23f23ec 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -212,22 +212,22 @@ module ActionDispatch
       end
 
       protected
+      def now_is_loaded?
+        @now
+      end
 
-        def now_is_loaded?
-          @now
-        end
-
-        # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-        #     use()               # marks the entire flash as used
-        #     use('msg')          # marks the "msg" entry as used
-        #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
-        #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
-        # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
-        # if no key is passed.
-        def use(key = nil, used = true)
-          Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
-          return key ? self[key] : self
-        end
+      private
+      # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
+      #     use()               # marks the entire flash as used
+      #     use('msg')          # marks the "msg" entry as used
+      #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
+      #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
+      # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
+      # if no key is passed.
+      def use(key = nil, used = true)
+        Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
+        return key ? self[key] : self
+      end
     end
 
     def initialize(app)
-- 
cgit v1.2.3


From ea35967524797c0ae82333bdef3667ddb0934d05 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 17:35:45 -0800
Subject: Use Set#subtract and Set#merge for keeping track of used / unused
 keys

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index c9d23f23ec..e79050706d 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -163,7 +163,8 @@ module ActionDispatch
       #    flash.keep            # keeps the entire flash
       #    flash.keep(:notice)   # keeps only the "notice" entry, the rest of the flash is discarded
       def keep(k = nil)
-        use(k, false)
+        @used.subtract Array(k || keys)
+        k ? self[k] : self
       end
 
       # Marks the entire flash or a single flash entry to be discarded by the end of the current action:
@@ -171,7 +172,8 @@ module ActionDispatch
       #     flash.discard              # discard the entire flash at the end of the current action
       #     flash.discard(:warning)    # discard only the "warning" entry at the end of the current action
       def discard(k = nil)
-        use(k)
+        @used.merge Array(k || keys)
+        k ? self[k] : self
       end
 
       # Mark for removal entries that were kept, and delete unkept ones.
@@ -215,19 +217,6 @@ module ActionDispatch
       def now_is_loaded?
         @now
       end
-
-      private
-      # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-      #     use()               # marks the entire flash as used
-      #     use('msg')          # marks the "msg" entry as used
-      #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
-      #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
-      # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
-      # if no key is passed.
-      def use(key = nil, used = true)
-        Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
-        return key ? self[key] : self
-      end
     end
 
     def initialize(app)
-- 
cgit v1.2.3


From 21df2bfc4a916d5f9bbffa48fec0f08235d276b9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 17:39:51 -0800
Subject: again, use Set#subtract

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index e79050706d..d1545355f8 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -190,7 +190,7 @@ module ActionDispatch
         end
 
         # clean up after keys that could have been left over by calling reject! or shift on the flash
-        (@used - keys).each{ |k| @used.delete(k) }
+        @used.subtract(@used - keys)
       end
 
       # Convenience accessor for flash[:alert]
-- 
cgit v1.2.3


From ffad4927b1803765fca78241d2f368c33888c048 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 18:21:35 -0800
Subject: mutations can't be done without the consent of our proxy object. 
 This is one benefit of choosing composition over inheritance.

---
 actionpack/lib/action_dispatch/middleware/flash.rb |  3 --
 actionpack/test/controller/flash_hash_test.rb      | 62 ++++++++++++++++++++++
 2 files changed, 62 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index d1545355f8..1b82b15511 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -188,9 +188,6 @@ module ActionDispatch
             @used.delete(k)
           end
         end
-
-        # clean up after keys that could have been left over by calling reject! or shift on the flash
-        @used.subtract(@used - keys)
       end
 
       # Convenience accessor for flash[:alert]
diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb
index 9b69a2648e..e7ae7ce5f5 100644
--- a/actionpack/test/controller/flash_hash_test.rb
+++ b/actionpack/test/controller/flash_hash_test.rb
@@ -75,6 +75,7 @@ module ActionDispatch
     def test_discard_no_args
       @hash['hello'] = 'world'
       @hash.discard
+
       @hash.sweep
       assert_equal({}, @hash.to_hash)
     end
@@ -83,8 +84,69 @@ module ActionDispatch
       @hash['hello'] = 'world'
       @hash['omg']   = 'world'
       @hash.discard 'hello'
+
       @hash.sweep
       assert_equal({'omg' => 'world'}, @hash.to_hash)
     end
+
+    def test_keep_sweep
+      @hash['hello'] = 'world'
+
+      @hash.sweep
+      assert_equal({'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_update_sweep
+      @hash['hello'] = 'world'
+      @hash.update({'hi' => 'mom'})
+
+      @hash.sweep
+      assert_equal({'hello' => 'world', 'hi' => 'mom'}, @hash.to_hash)
+    end
+
+    def test_delete_sweep
+      @hash['hello'] = 'world'
+      @hash['hi']    = 'mom'
+      @hash.delete 'hi'
+
+      @hash.sweep
+      assert_equal({'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_clear_sweep
+      @hash['hello'] = 'world'
+      @hash.clear
+
+      @hash.sweep
+      assert_equal({}, @hash.to_hash)
+    end
+
+    def test_replace_sweep
+      @hash['hello'] = 'world'
+      @hash.replace({'hi' => 'mom'})
+
+      @hash.sweep
+      assert_equal({'hi' => 'mom'}, @hash.to_hash)
+    end
+
+    def test_discard_then_add
+      @hash['hello'] = 'world'
+      @hash['omg']   = 'world'
+      @hash.discard 'hello'
+      @hash['hello'] = 'world'
+
+      @hash.sweep
+      assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
+    end
+
+    def test_keep_all_sweep
+      @hash['hello'] = 'world'
+      @hash['omg']   = 'world'
+      @hash.discard 'hello'
+      @hash.keep
+
+      @hash.sweep
+      assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
+    end
   end
 end
-- 
cgit v1.2.3


From dea160266fee0576c2059a0699cbf93b465e95a2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 18:25:36 -0800
Subject: rename @used to something a bit more meaningful

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 1b82b15511..bf381af9e7 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -78,7 +78,7 @@ module ActionDispatch
       include Enumerable
 
       def initialize #:nodoc:
-        @used    = Set.new
+        @discard = Set.new
         @closed  = false
         @flashes = {}
         @now     = nil
@@ -139,7 +139,7 @@ module ActionDispatch
       alias :merge! :update
 
       def replace(h) #:nodoc:
-        @used = Set.new
+        @discard = Set.new
         @flashes.replace h
         self
       end
@@ -163,7 +163,7 @@ module ActionDispatch
       #    flash.keep            # keeps the entire flash
       #    flash.keep(:notice)   # keeps only the "notice" entry, the rest of the flash is discarded
       def keep(k = nil)
-        @used.subtract Array(k || keys)
+        @discard.subtract Array(k || keys)
         k ? self[k] : self
       end
 
@@ -172,7 +172,7 @@ module ActionDispatch
       #     flash.discard              # discard the entire flash at the end of the current action
       #     flash.discard(:warning)    # discard only the "warning" entry at the end of the current action
       def discard(k = nil)
-        @used.merge Array(k || keys)
+        @discard.merge Array(k || keys)
         k ? self[k] : self
       end
 
@@ -181,11 +181,11 @@ module ActionDispatch
       # This method is called automatically by filters, so you generally don't need to care about it.
       def sweep #:nodoc:
         keys.each do |k|
-          unless @used.include?(k)
-            @used << k
+          unless @discard.include?(k)
+            @discard << k
           else
             delete(k)
-            @used.delete(k)
+            @discard.delete(k)
           end
         end
       end
-- 
cgit v1.2.3


From bdfd11e6dafb1fac175fa0e7283be31e8849ec67 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 18:33:44 -0800
Subject: mutations on the underlying hash should also mutate the discard set

---
 actionpack/lib/action_dispatch/middleware/flash.rb |  8 +++++---
 actionpack/test/controller/flash_hash_test.rb      | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index bf381af9e7..6564a5b16f 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -93,7 +93,7 @@ module ActionDispatch
       end
 
       def []=(k, v) #:nodoc:
-        keep(k)
+        @discard.delete k
         @flashes[k] = v
       end
 
@@ -102,7 +102,7 @@ module ActionDispatch
       end
 
       def update(h) #:nodoc:
-        h.keys.each { |k| keep(k) }
+        @discard.subtract h.keys
         @flashes.update h
         self
       end
@@ -116,6 +116,7 @@ module ActionDispatch
       end
 
       def delete(key)
+        @discard.delete key
         @flashes.delete key
         self
       end
@@ -129,6 +130,7 @@ module ActionDispatch
       end
 
       def clear
+        @discard.clear
         @flashes.clear
       end
 
@@ -139,7 +141,7 @@ module ActionDispatch
       alias :merge! :update
 
       def replace(h) #:nodoc:
-        @discard = Set.new
+        @discard.clear
         @flashes.replace h
         self
       end
diff --git a/actionpack/test/controller/flash_hash_test.rb b/actionpack/test/controller/flash_hash_test.rb
index e7ae7ce5f5..ccca0dac17 100644
--- a/actionpack/test/controller/flash_hash_test.rb
+++ b/actionpack/test/controller/flash_hash_test.rb
@@ -104,6 +104,15 @@ module ActionDispatch
       assert_equal({'hello' => 'world', 'hi' => 'mom'}, @hash.to_hash)
     end
 
+    def test_update_delete_sweep
+      @hash['hello'] = 'world'
+      @hash.delete 'hello'
+      @hash.update({'hello' => 'mom'})
+
+      @hash.sweep
+      assert_equal({'hello' => 'mom'}, @hash.to_hash)
+    end
+
     def test_delete_sweep
       @hash['hello'] = 'world'
       @hash['hi']    = 'mom'
@@ -148,5 +157,15 @@ module ActionDispatch
       @hash.sweep
       assert_equal({'omg' => 'world', 'hello' => 'world'}, @hash.to_hash)
     end
+
+    def test_double_sweep
+      @hash['hello'] = 'world'
+      @hash.sweep
+
+      assert_equal({'hello' => 'world'}, @hash.to_hash)
+
+      @hash.sweep
+      assert_equal({}, @hash.to_hash)
+    end
   end
 end
-- 
cgit v1.2.3


From afd9512c0b4ff98f3fec2ff9fd78d430b2ace974 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 28 Dec 2011 18:39:39 -0800
Subject: simplify sweep now that discard and flashes are in sync

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 6564a5b16f..cff0877030 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -182,14 +182,8 @@ module ActionDispatch
       #
       # This method is called automatically by filters, so you generally don't need to care about it.
       def sweep #:nodoc:
-        keys.each do |k|
-          unless @discard.include?(k)
-            @discard << k
-          else
-            delete(k)
-            @discard.delete(k)
-          end
-        end
+        @discard.each { |k| @flashes.delete k }
+        @discard.replace @flashes.keys
       end
 
       # Convenience accessor for flash[:alert]
-- 
cgit v1.2.3


From 25b10f4c1c7db7dea631d6877fdd6eae5947fe21 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 09:02:54 -0800
Subject: modules don't have any instance methods

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index d065d9f9d8..9de8849a90 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -94,9 +94,7 @@ module ActionDispatch
           @routes = {}
           @helpers = []
 
-          @module ||= Module.new do
-            instance_methods.each { |selector| remove_method(selector) }
-          end
+          @module ||= Module.new
         end
 
         def add(name, route)
-- 
cgit v1.2.3


From c0904e47f2982c2cd323c44060e99cfbe8e9869a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 09:06:34 -0800
Subject: decouple initialize from clear!. Initialize ivars in initialize,
 clear ivars in clear!

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 9de8849a90..e691124193 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -83,7 +83,9 @@ module ActionDispatch
         attr_reader :routes, :helpers, :module
 
         def initialize
-          clear!
+          @routes  = {}
+          @helpers = []
+          @module  = Module.new
         end
 
         def helper_names
@@ -91,10 +93,8 @@ module ActionDispatch
         end
 
         def clear!
-          @routes = {}
-          @helpers = []
-
-          @module ||= Module.new
+          @routes.clear
+          @helpers.clear
         end
 
         def add(name, route)
-- 
cgit v1.2.3


From 1fc6036b4b2fe314e30513925fd6b42a2b634b4b Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Thu, 29 Dec 2011 22:58:57 +0530
Subject: revise some doc changes

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index fb89641a16..bb753ae27a 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -393,21 +393,17 @@ module ActionView
       #   submit_tag "Save edits", :disabled => true
       #   # => <input disabled="disabled" name="commit" type="submit" value="Save edits" />
       #
-      #
       #   submit_tag "Complete sale", :disable_with => "Please wait..."
-      #   # => <input name="commit" data-disable-with="Please wait..."
-      #   #    type="submit" value="Complete sale" />
+      #   # => <input name="commit" data-disable-with="Please wait..." type="submit" value="Complete sale" />
       #
       #   submit_tag nil, :class => "form_submit"
       #   # => <input class="form_submit" name="commit" type="submit" />
       #
       #   submit_tag "Edit", :disable_with => "Editing...", :class => "edit_button"
-      #   # => <input class="edit_button" data-disable_with="Editing..."
-      #   #    name="commit" type="submit" value="Edit" />
+      #   # => <input class="edit_button" data-disable_with="Editing..." name="commit" type="submit" value="Edit" />
       #
       #   submit_tag "Save", :confirm => "Are you sure?"
-      #   # => <input name='commit' type='submit' value='Save'
-      #   #     data-confirm="Are you sure?" />
+      #   # => <input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />
       #
       def submit_tag(value = "Save changes", options = {})
         options = options.stringify_keys
@@ -455,8 +451,7 @@ module ActionView
       #   #    </button>
       #
       #   button_tag "Checkout", :disable_with => "Please wait..."
-      #   # => <button data-disable-with="Please wait..." name="button"
-      #   #            type="submit">Checkout</button>
+      #   # => <button data-disable-with="Please wait..." name="button" type="submit">Checkout</button>
       #
       def button_tag(content_or_options = nil, options = nil, &block)
         options = content_or_options if block_given? && content_or_options.is_a?(Hash)
-- 
cgit v1.2.3


From 88aeeee288641a3009f05574079d4c50277e77a5 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 09:52:18 -0800
Subject: removing dead code.

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index e691124193..3b9d8dc57b 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -123,16 +123,7 @@ module ActionDispatch
           routes.length
         end
 
-        def reset!
-          old_routes = routes.dup
-          clear!
-          old_routes.each do |name, route|
-            add(name, route)
-          end
-        end
-
-        def install(destinations = [ActionController::Base, ActionView::Base], regenerate = false)
-          reset! if regenerate
+        def install(destinations = [ActionController::Base, ActionView::Base])
           Array(destinations).each do |dest|
             dest.__send__(:include, @module)
           end
@@ -285,9 +276,9 @@ module ActionDispatch
         @prepend.each { |blk| eval_block(blk) }
       end
 
-      def install_helpers(destinations = [ActionController::Base, ActionView::Base], regenerate_code = false)
+      def install_helpers(destinations = [ActionController::Base, ActionView::Base])
         Array(destinations).each { |d| d.module_eval { include Helpers } }
-        named_routes.install(destinations, regenerate_code)
+        named_routes.install(destinations)
       end
 
       module MountedHelpers
-- 
cgit v1.2.3


From 0035c54e2f5b0d5b4d27d50d16fb91bad4060c5a Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 10:25:58 -0800
Subject: don't use instance eval, just reference variables so we don't have to
 worry about "inspect" marshalling

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 3b9d8dc57b..3ffa4b4bea 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -149,22 +149,23 @@ module ActionDispatch
           def define_hash_access(route, name, kind, options)
             selector = hash_access_name(name, kind)
 
-            # We use module_eval to avoid leaks
-            @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_possible_method :#{selector}
-              def #{selector}(*args)
-                options = args.extract_options!
-                result = #{options.inspect}
+            @module.module_eval do
+              remove_possible_method selector
+
+              define_method(selector) do |*args|
+                inner_options = args.extract_options!
+                result = options.dup
 
                 if args.any?
                   result[:_positional_args] = args
-                  result[:_positional_keys] = #{route.segment_keys.inspect}
+                  result[:_positional_keys] = route.segment_keys
                 end
 
-                result.merge(options)
+                result.merge(inner_options)
               end
-              protected :#{selector}
-            END_EVAL
+
+              protected selector
+            end
             helpers << selector
           end
 
-- 
cgit v1.2.3


From 8a130edb0f7b3aacf74d080d3da3b2d871f650d6 Mon Sep 17 00:00:00 2001
From: grentis <grentis@gmail.com>
Date: Thu, 29 Dec 2011 21:58:55 +0100
Subject: content_for with flush parameter

---
 .../lib/action_view/helpers/capture_helper.rb      | 37 +++++++++++----
 actionpack/test/template/capture_helper_test.rb    | 55 ++++++++++++++++++++++
 2 files changed, 84 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 0a0d31dded..17bbfe2efd 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -81,8 +81,8 @@ module ActionView
       #   <%# This is the layout %>
       #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
       #   <head>
-      #	    <title>My Website</title>
-      #	    <%= yield :script %>
+      #     <title>My Website</title>
+      #     <%= yield :script %>
       #   </head>
       #   <body>
       #     <%= yield %>
@@ -110,7 +110,7 @@ module ActionView
       # That will place +script+ tags for your default set of JavaScript files on the page;
       # this technique is useful if you'll only be using these scripts in a few views.
       #
-      # Note that content_for concatenates the blocks it is given for a particular
+      # Note that content_for concatenates (default) the blocks it is given for a particular
       # identifier in order. For example:
       #
       #   <% content_for :navigation do %>
@@ -127,16 +127,37 @@ module ActionView
       #
       #   <ul><%= content_for :navigation %></ul>
       #
+      # If the flush parameter is true content_for replaces the blocks it is given. For example:
+      #
+      #   <% content_for :navigation do %>
+      #     <li><%= link_to 'Home', :action => 'index' %></li>
+      #   <% end %>
+      #
+      #   <%#  Add some other content, or use a different template: %>
+      #
+      #   <% content_for :navigation, true do %>
+      #     <li><%= link_to 'Login', :action => 'login' %></li>
+      #   <% end %>
+      #
+      # Then, in another template or layout, this code would render only the last link:
+      #
+      #   <ul><%= content_for :navigation %></ul>
+      #
       # Lastly, simple content can be passed as a parameter:
       #
       #   <% content_for :script, javascript_include_tag(:defaults) %>
       #
       # WARNING: content_for is ignored in caches. So you shouldn't use it
       # for elements that will be fragment cached.
-      def content_for(name, content = nil, &block)
+      def content_for(name, content = nil, flush = false, &block)
         if content || block_given?
-          content = capture(&block) if block_given?
-          @view_flow.append(name, content) if content
+          if block_given?
+            flush = content if content
+            content = capture(&block)
+          end
+          if content
+            flush ? @view_flow.set(name, content) : @view_flow.append(name, content)
+          end
           nil
         else
           @view_flow.get(name)
@@ -164,8 +185,8 @@ module ActionView
       #   <%# This is the layout %>
       #   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
       #   <head>
-      #	    <title>My Website</title>
-      #	    <%= yield :script %>
+      #     <title>My Website</title>
+      #     <%= yield :script %>
       #   </head>
       #   <body class="<%= content_for?(:right_col) ? 'one-column' : 'two-column' %>">
       #     <%= yield %>
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index a37e3a8d6a..17469f8c3e 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -53,6 +53,13 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_multiple_calls_and_flush
+    assert ! content_for?(:title)
+    content_for :title, 'foo'
+    content_for :title, 'bar', true
+    assert_equal 'bar', content_for(:title)
+  end
+
   def test_content_for_with_block
     assert ! content_for?(:title)
     content_for :title do
@@ -63,6 +70,39 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_block_and_multiple_calls_with_flush
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, true do
+      'bar'
+    end
+    assert_equal 'bar', content_for(:title)
+  end
+
+  def test_content_for_with_block_and_multiple_calls_with_flush_nil_content
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, nil, true do
+      'bar'
+    end
+    assert_equal 'bar', content_for(:title)
+  end
+
+  def test_content_for_with_block_and_multiple_calls_without_flush
+    assert ! content_for?(:title)
+    content_for :title do
+      'foo'
+    end
+    content_for :title, false do
+      'bar'
+    end
+    assert_equal 'foobar', content_for(:title)
+  end
+
   def test_content_for_with_whitespace_block
     assert ! content_for?(:title)
     content_for :title, 'foo'
@@ -74,12 +114,27 @@ class CaptureHelperTest < ActionView::TestCase
     assert_equal 'foobar', content_for(:title)
   end
 
+  def test_content_for_with_whitespace_block_and_flush
+    assert ! content_for?(:title)
+    content_for :title, 'foo'
+    content_for :title, true do
+      output_buffer << "  \n  "
+      nil
+    end
+    content_for :title, 'bar', true
+    assert_equal 'bar', content_for(:title)
+  end
+
   def test_content_for_returns_nil_when_writing
     assert ! content_for?(:title)
     assert_equal nil, content_for(:title, 'foo')
     assert_equal nil, content_for(:title) { output_buffer << 'bar'; nil }
     assert_equal nil, content_for(:title) { output_buffer << "  \n  "; nil }
     assert_equal 'foobar', content_for(:title)
+    assert_equal nil, content_for(:title, 'foo', true)
+    assert_equal nil, content_for(:title, true) { output_buffer << 'bar'; nil }
+    assert_equal nil, content_for(:title, true) { output_buffer << "  \n  "; nil }
+    assert_equal 'bar', content_for(:title)
   end
 
   def test_content_for_question_mark
-- 
cgit v1.2.3


From 72c290ca1597f2ecf3252aaa51d3baef0cac0440 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 11:47:21 -0800
Subject: avoid extra method calls by just defining the delegate

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 3ffa4b4bea..fb49bc153c 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -315,9 +315,10 @@ module ActionDispatch
             include UrlFor
 
             @_routes = routes
-            class << self
-              delegate :url_for, :to => '@_routes'
+            def self.url_for(options)
+              @_routes.url_for options
             end
+
             extend routes.named_routes.module
 
             # ROUTES TODO: install_helpers isn't great... can we make a module with the stuff that
-- 
cgit v1.2.3


From fb3e09a877f6b4649dff8c9fc4a991a3ac7fa3cf Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 11:50:35 -0800
Subject: don't need the begin / end

---
 .../lib/action_dispatch/routing/route_set.rb       | 38 ++++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index fb49bc153c..22d4ccf623 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -307,33 +307,29 @@ module ActionDispatch
       end
 
       def url_helpers
-        @url_helpers ||= begin
-          routes = self
+        routes = self
 
-          helpers = Module.new do
-            extend ActiveSupport::Concern
-            include UrlFor
+        @url_helpers ||= Module.new {
+          extend ActiveSupport::Concern
+          include UrlFor
 
-            @_routes = routes
-            def self.url_for(options)
-              @_routes.url_for options
-            end
+          @_routes = routes
+          def self.url_for(options)
+            @_routes.url_for options
+          end
 
-            extend routes.named_routes.module
+          extend routes.named_routes.module
 
-            # ROUTES TODO: install_helpers isn't great... can we make a module with the stuff that
-            # we can include?
-            # Yes plz - JP
-            included do
-              routes.install_helpers(self)
-              singleton_class.send(:redefine_method, :_routes) { routes }
-            end
-
-            define_method(:_routes) { @_routes || routes }
+          # ROUTES TODO: install_helpers isn't great... can we make a module with the stuff that
+          # we can include?
+          # Yes plz - JP
+          included do
+            routes.install_helpers(self)
+            singleton_class.send(:redefine_method, :_routes) { routes }
           end
 
-          helpers
-        end
+          define_method(:_routes) { @_routes || routes }
+        }
       end
 
       def empty?
-- 
cgit v1.2.3


From cd97d0b5b73d12a8a6c4d202782d8542a3738e3b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 11:59:39 -0800
Subject: we know the classes will be a list, so *tell* it to respond to each
 rather than casting

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 22d4ccf623..ee61d421b0 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -124,7 +124,7 @@ module ActionDispatch
         end
 
         def install(destinations = [ActionController::Base, ActionView::Base])
-          Array(destinations).each do |dest|
+          destinations.each do |dest|
             dest.__send__(:include, @module)
           end
         end
@@ -278,7 +278,7 @@ module ActionDispatch
       end
 
       def install_helpers(destinations = [ActionController::Base, ActionView::Base])
-        Array(destinations).each { |d| d.module_eval { include Helpers } }
+        destinations.each { |d| d.module_eval { include Helpers } }
         named_routes.install(destinations)
       end
 
@@ -324,7 +324,7 @@ module ActionDispatch
           # we can include?
           # Yes plz - JP
           included do
-            routes.install_helpers(self)
+            routes.install_helpers([self])
             singleton_class.send(:redefine_method, :_routes) { routes }
           end
 
-- 
cgit v1.2.3


From 87dd62ab2e4a426011392f41090006428fd01e3c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 14:37:52 -0800
Subject: stop using __send__ and just module eval in the extensions

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index ee61d421b0..c60e26983d 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -124,9 +124,8 @@ module ActionDispatch
         end
 
         def install(destinations = [ActionController::Base, ActionView::Base])
-          destinations.each do |dest|
-            dest.__send__(:include, @module)
-          end
+          helper = @module
+          destinations.each { |d| d.module_eval { include helper } }
         end
 
         private
-- 
cgit v1.2.3


From e43b2b35c7042c87fd18e3ecd55c14eabd5746ba Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 16:07:07 -0800
Subject: just add the writer rather than adding both and removing one

---
 actionpack/lib/action_dispatch/routing/url_for.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index 22e41c9c16..6c2a98ab15 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -90,8 +90,7 @@ module ActionDispatch
           if respond_to?(:class_attribute)
             class_attribute :default_url_options
           else
-            mattr_accessor :default_url_options
-            remove_method :default_url_options
+            mattr_writer :default_url_options
           end
 
           self.default_url_options = {}
-- 
cgit v1.2.3


From 5681f79f642c57397bf18d239a9aa1dbf71b0f24 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 29 Dec 2011 17:27:10 -0800
Subject: be explicit about where helpers are installed

---
 actionpack/lib/action_dispatch/routing/route_set.rb       | 2 +-
 actionpack/test/controller/action_pack_assertions_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index c60e26983d..10b3e212e6 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -276,7 +276,7 @@ module ActionDispatch
         @prepend.each { |blk| eval_block(blk) }
       end
 
-      def install_helpers(destinations = [ActionController::Base, ActionView::Base])
+      def install_helpers(destinations)
         destinations.each { |d| d.module_eval { include Helpers } }
         named_routes.install(destinations)
       end
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 5252e43c25..fab70c71d6 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -165,7 +165,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
         match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
         match ':controller/:action'
       end
-      set.install_helpers
+      set.install_helpers([ActionController::Base, ActionView::Base])
 
       process :redirect_to_named_route
       assert_redirected_to 'http://test.host/route_one'
-- 
cgit v1.2.3


From 18ed37b9259107b7ddd608a4a56b288b14a47c1b Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Sat, 31 Dec 2011 01:12:53 +0530
Subject: fiber is available in ruby19

---
 actionpack/lib/action_view/renderer/streaming_template_renderer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index 1ccf5a8ddb..4b66f66e2d 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -1,7 +1,7 @@
 # 1.9 ships with Fibers but we need to require the extra
 # methods explicitly. We only load those extra methods if
 # Fiber is available in the first place.
-require 'fiber' if defined?(Fiber)
+require 'fiber'
 
 module ActionView
   # == TODO
-- 
cgit v1.2.3