From 993e8c55ca24f0d41364614a0ae3a7d42e216e94 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 20 May 2011 13:09:32 +0900
Subject: No "t." for the migration DSL!

Now you can omit |t| block parameter and all the t. from your migration code, that means, the syntax looks more Rails-3-ish, like the routes DSL and ActionMailer DSL.
Also, this change won't break any of your existing migration files, since the traditional syntax is still available.
---
 .../connection_adapters/abstract/schema_statements.rb  |  4 ++--
 .../connection_adapters/sqlite_adapter.rb              | 18 ++++++++++--------
 activerecord/lib/active_record/session_store.rb        |  7 ++++---
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 9f9c2c42cb..21612dd15b 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -154,11 +154,11 @@ module ActiveRecord
       #  )
       #
       # See also TableDefinition#column for details on how to create columns.
-      def create_table(table_name, options = {})
+      def create_table(table_name, options = {}, &blk)
         td = table_definition
         td.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
 
-        yield td if block_given?
+        td.instance_eval(&blk) if blk
 
         if options[:force] && table_exists?(table_name)
           drop_table(table_name, options)
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index d2785b234a..4b25384664 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -394,27 +394,29 @@ module ActiveRecord
           drop_table(from)
         end
 
-        def copy_table(from, to, options = {}) #:nodoc:
-          options = options.merge(:id => (!columns(from).detect{|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
+        def copy_table(from, to, options = {}, &block) #:nodoc:
+          from_columns, from_primary_key = columns(from), primary_key(from)
+          options = options.merge(:id => (!from_columns.detect {|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
+          table_definition = nil
           create_table(to, options) do |definition|
-            @definition = definition
-            columns(from).each do |column|
+            table_definition = definition
+            from_columns.each do |column|
               column_name = options[:rename] ?
                 (options[:rename][column.name] ||
                  options[:rename][column.name.to_sym] ||
                  column.name) : column.name
 
-              @definition.column(column_name, column.type,
+              table_definition.column(column_name, column.type,
                 :limit => column.limit, :default => column.default,
                 :null => column.null)
             end
-            @definition.primary_key(primary_key(from)) if primary_key(from)
-            yield @definition if block_given?
+            table_definition.primary_key from_primary_key if from_primary_key
+            table_definition.instance_eval(&block) if block
           end
 
           copy_table_indexes(from, to, options[:rename] || {})
           copy_table_contents(from, to,
-            @definition.columns.map {|column| column.name},
+            table_definition.columns.map {|column| column.name},
             options[:rename] || {})
         end
 
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index c3e976002e..7bbac1505e 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -64,12 +64,13 @@ module ActiveRecord
       end
 
       def create_table!
+        id_col_name, data_col_name = session_id_column, data_column_name
         connection_pool.clear_table_cache!(table_name)
         connection.create_table(table_name) do |t|
-          t.string session_id_column, :limit => 255
-          t.text data_column_name
+          t.string id_col_name, :limit => 255
+          t.text data_col_name
         end
-        connection.add_index table_name, session_id_column, :unique => true
+        connection.add_index table_name, id_col_name, :unique => true
       end
     end
 
-- 
cgit v1.2.3


From 696c2ea68d7cdbf7eb15f7dce2d83498ef659eb7 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 20 May 2011 13:17:16 +0900
Subject: Tests for new create_table DSL

---
 activerecord/test/cases/migration_test.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index bf7565a0d0..111dd01f2b 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1653,6 +1653,26 @@ if ActiveRecord::Base.connection.supports_migrations?
 
   end # SexyMigrationsTest
 
+  class SexierMigrationsTest < ActiveRecord::TestCase
+    def test_create_table_with_column_without_block_parameter
+      Person.connection.create_table :testings, :force => true do
+        column :foo, :string
+      end
+      assert Person.connection.column_exists?(:testings, :foo, :string)
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+
+    def test_create_table_with_sexy_column_without_block_parameter
+      Person.connection.create_table :testings, :force => true do
+        integer :bar
+      end
+      assert Person.connection.column_exists?(:testings, :bar, :integer)
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+  end # SexierMigrationsTest
+
   class MigrationLoggerTest < ActiveRecord::TestCase
     def test_migration_should_be_run_without_logger
       previous_logger = ActiveRecord::Base.logger
-- 
cgit v1.2.3


From 325fdfc92833cd2a0ccc97f4e168f11a406edc76 Mon Sep 17 00:00:00 2001
From: Franck Verrot <franck@verrot.fr>
Date: Sun, 31 Jul 2011 20:05:58 +0200
Subject: Remove warnings by calling remove_method

---
 activemodel/test/cases/serializers/xml_serialization_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index a38ef8e223..85f2085675 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -9,6 +9,7 @@ class Contact
 
   attr_accessor :address, :friends
 
+  remove_method :attributes
   def attributes
     instance_values.except("address", "friends")
   end
-- 
cgit v1.2.3


From 4535191c61b496b1a5e9dc57624581753fa71497 Mon Sep 17 00:00:00 2001
From: Ryan Oblak <rroblak@gmail.com>
Date: Tue, 27 Sep 2011 22:39:31 -0700
Subject: Modified String#pluralize to take an optional count parameter.

---
 .../lib/active_support/core_ext/string/inflections.rb   | 17 ++++++++++++++---
 activesupport/test/core_ext/string_ext_test.rb          | 12 ++++++++----
 .../source/active_support_core_extensions.textile       |  8 ++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index c7ceeb9de4..fd91b3cacb 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -9,14 +9,25 @@ require 'active_support/inflector/transliterate'
 class String
   # Returns the plural form of the word in the string.
   #
+  # If the optional parameter +count+ is specified,
+  # the singular form will be returned if <tt>count == 1</tt>.
+  # For any other value of +count+ the plural will be returned.
+  #
+  # ==== Examples
   #   "post".pluralize             # => "posts"
   #   "octopus".pluralize          # => "octopi"
   #   "sheep".pluralize            # => "sheep"
   #   "words".pluralize            # => "words"
   #   "the blue mailman".pluralize # => "the blue mailmen"
   #   "CamelOctopus".pluralize     # => "CamelOctopi"
-  def pluralize
-    ActiveSupport::Inflector.pluralize(self)
+  #   "apple".pluralize(1)         # => "apple"
+  #   "apple".pluralize(2)         # => "apples"
+  def pluralize(count = nil)
+    if count == 1
+      self
+    else
+      ActiveSupport::Inflector.pluralize(self)
+    end
   end
 
   # The reverse of +pluralize+, returns the singular form of a word in a string.
@@ -42,7 +53,7 @@ class String
   def constantize
     ActiveSupport::Inflector.constantize(self)
   end
-  
+
   # +safe_constantize+ tries to find a declared constant with the name specified
   # in the string. It returns nil when the name is not in CamelCase
   # or is not initialized.  See ActiveSupport::Inflector.safe_constantize
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 5c1dddaf96..4d876954cf 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -20,7 +20,7 @@ end
 class StringInflectionsTest < Test::Unit::TestCase
   include InflectorTestCases
   include ConstantizeTestCases
-  
+
   def test_erb_escape
     string = [192, 60].pack('CC')
     expected = 192.chr + "&lt;"
@@ -64,6 +64,10 @@ class StringInflectionsTest < Test::Unit::TestCase
     end
 
     assert_equal("plurals", "plurals".pluralize)
+
+    assert_equal("blargles", "blargle".pluralize(0))
+    assert_equal("blargle", "blargle".pluralize(1))
+    assert_equal("blargles", "blargle".pluralize(2))
   end
 
   def test_singularize
@@ -301,13 +305,13 @@ class StringInflectionsTest < Test::Unit::TestCase
         "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 \354\225\204\353\235\274\353\246\254\354\230\244".force_encoding('UTF-8').truncate(10)
     end
   end
-  
+
   def test_constantize
     run_constantize_tests_on do |string|
       string.constantize
     end
   end
-  
+
   def test_safe_constantize
     run_safe_constantize_tests_on do |string|
       string.safe_constantize
@@ -381,7 +385,7 @@ class OutputSafetyTest < ActiveSupport::TestCase
   test "A fixnum is safe by default" do
     assert 5.html_safe?
   end
-  
+
   test "a float is safe by default" do
     assert 5.7.html_safe?
   end
diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 5aee001545..153a897b1c 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -1426,6 +1426,14 @@ The method +pluralize+ returns the plural of its receiver:
 
 As the previous example shows, Active Support knows some irregular plurals and uncountable nouns. Built-in rules can be extended in +config/initializers/inflections.rb+. That file is generated by the +rails+ command and has instructions in comments.
 
++pluralize+ can also take an optional +count+ parameter.  If <tt>count == 1</tt> the singular form will be returned.  For any other value of +count+ the plural form will be returned:
+
+<ruby>
+"dude".pluralize(0) # => "dudes"
+"dude".pluralize(1) # => "dude"
+"dude".pluralize(2) # => "dudes"
+</ruby>
+
 Active Record uses this method to compute the default table name that corresponds to a model:
 
 <ruby>
-- 
cgit v1.2.3


From 78de4fcd050b5f2f67a1bf974ba6960b4b017443 Mon Sep 17 00:00:00 2001
From: Dmitriy Kiriyenko <dmitriy.kiriyenko@gmail.com>
Date: Thu, 4 Aug 2011 15:44:08 +0300
Subject: When running "rake db:drop" also drop test database in development
 environment.

---
 .../lib/active_record/railties/databases.rake      | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index b3316fd1a2..1009af850c 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -37,11 +37,7 @@ db_namespace = namespace :db do
 
   desc 'Create the database from config/database.yml for the current Rails.env (use db:create:all to create all dbs in the config)'
   task :create => :load_config do
-    # Make the test database at the same time as the development one, if it exists
-    if Rails.env.development? && ActiveRecord::Base.configurations['test']
-      create_database(ActiveRecord::Base.configurations['test'])
-    end
-    create_database(ActiveRecord::Base.configurations[Rails.env])
+    configs_for_environment.each { |config| create_database(config) }
   end
 
   def mysql_creation_options(config)
@@ -138,12 +134,7 @@ db_namespace = namespace :db do
 
   desc 'Drops the database for the current Rails.env (use db:drop:all to drop all databases)'
   task :drop => :load_config do
-    config = ActiveRecord::Base.configurations[Rails.env || 'development']
-    begin
-      drop_database(config)
-    rescue Exception => e
-      $stderr.puts "Couldn't drop #{config['database']} : #{e.inspect}"
-    end
+    configs_for_environment.each { |config| drop_database_and_rescue(config) }
   end
 
   def local_database?(config, &block)
@@ -548,6 +539,19 @@ def drop_database(config)
   end
 end
 
+def drop_database_and_rescue(config)
+  begin
+    drop_database(config)
+  rescue Exception => e
+    $stderr.puts "Couldn't drop #{config['database']} : #{e.inspect}"
+  end
+end
+
+def configs_for_environment
+  environments = [Rails.env, ("test" if Rails.env.development?)]
+  ActiveRecord::Base.configurations.values_at(*environments).compact
+end
+
 def session_table_name
   ActiveRecord::SessionStore::Session.table_name
 end
-- 
cgit v1.2.3


From 3dbedd2823ff6c8a1f2f078ae9df9c6ceb275e1b Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Fri, 14 Oct 2011 21:09:53 -0700
Subject: Default timestamps to non-null

---
 .../connection_adapters/abstract/schema_definitions.rb         |  2 +-
 .../connection_adapters/abstract/schema_statements.rb          |  4 ++--
 activerecord/test/cases/migration_test.rb                      | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 82f564e41d..989a4fcbca 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -252,7 +252,7 @@ module ActiveRecord
       # Appends <tt>:datetime</tt> columns <tt>:created_at</tt> and
       # <tt>:updated_at</tt> to the table.
       def timestamps(*args)
-        options = args.extract_options!
+        options = { :null => false }.merge(args.extract_options!)
         column(:created_at, :datetime, options)
         column(:updated_at, :datetime, options)
       end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 8e3ba1297e..b4a9e29ef1 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -507,8 +507,8 @@ module ActiveRecord
       # ===== Examples
       #  add_timestamps(:suppliers)
       def add_timestamps(table_name)
-        add_column table_name, :created_at, :datetime
-        add_column table_name, :updated_at, :datetime
+        add_column table_name, :created_at, :datetime, :null => false
+        add_column table_name, :updated_at, :datetime, :null => false
       end
 
       # Removes the timestamp columns (created_at and updated_at) from the table definition.
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 93a1249e43..4b5dd18be8 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -389,8 +389,8 @@ if ActiveRecord::Base.connection.supports_migrations?
       created_at_column = created_columns.detect {|c| c.name == 'created_at' }
       updated_at_column = created_columns.detect {|c| c.name == 'updated_at' }
 
-      assert created_at_column.null
-      assert updated_at_column.null
+      assert !created_at_column.null
+      assert !updated_at_column.null
     ensure
       Person.connection.drop_table table_name rescue nil
     end
@@ -471,11 +471,11 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       # Do a manual insertion
       if current_adapter?(:OracleAdapter)
-        Person.connection.execute "insert into people (id, wealth) values (people_seq.nextval, 12345678901234567890.0123456789)"
+        Person.connection.execute "insert into people (id, wealth, created_at, updated_at) values (people_seq.nextval, 12345678901234567890.0123456789, 0, 0)"
       elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
-        Person.connection.execute "insert into people (wealth) values ('12345678901234567890.0123456789')"
+        Person.connection.execute "insert into people (wealth, created_at, updated_at) values ('12345678901234567890.0123456789', 0, 0)"
       else
-        Person.connection.execute "insert into people (wealth) values (12345678901234567890.0123456789)"
+        Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, 0, 0)"
       end
 
       # SELECT
-- 
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(-)

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 26204def8f28f190b9fef1144720288f87bd4fb4 Mon Sep 17 00:00:00 2001
From: mhutchin <mike@mhutchinson.com>
Date: Sat, 15 Oct 2011 05:32:13 -0700
Subject: [layouts and rendering] Copy editing to improve readability

---
 .../guides/source/layouts_and_rendering.textile    | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index 69ef05104c..6f0dc57090 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -348,9 +348,9 @@ h5. Finding Layouts
 
 To find the current layout, Rails first looks for a file in +app/views/layouts+ with the same base name as the controller. For example, rendering actions from the +PhotosController+ class will use +app/views/layouts/photos.html.erb+ (or +app/views/layouts/photos.builder+). If there is no such controller-specific layout, Rails will use +app/views/layouts/application.html.erb+ or +app/views/layouts/application.builder+. If there is no +.erb+ layout, Rails will use a +.builder+ layout if one exists. Rails also provides several ways to more precisely assign specific layouts to individual controllers and actions.
 
-h6. Specifying Layouts on a per-Controller Basis
+h6. Specifying Layouts for Controllers
 
-You can override the automatic layout conventions in your controllers by using the +layout+ declaration in the controller. For example:
+You can override the default layout conventions in your controllers by using the +layout+ declaration. For example:
 
 <ruby>
 class ProductsController < ApplicationController
@@ -359,9 +359,9 @@ class ProductsController < ApplicationController
 end
 </ruby>
 
-With this declaration, all methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
+With this declaration, all of the methods within +ProductsController+ will use +app/views/layouts/inventory.html.erb+ for their layout.
 
-To assign a specific layout for the entire application, use a declaration in your +ApplicationController+ class:
+To assign a specific layout for the entire application, use a +layout+ declaration in your +ApplicationController+ class:
 
 <ruby>
 class ApplicationController < ActionController::Base
@@ -370,7 +370,7 @@ class ApplicationController < ActionController::Base
 end
 </ruby>
 
-With this declaration, all views in the entire application will use +app/views/layouts/main.html.erb+ for their layout.
+With this declaration, all of the views in the entire application will use +app/views/layouts/main.html.erb+ for their layout.
 
 h6. Choosing Layouts at Runtime
 
@@ -392,9 +392,9 @@ class ProductsController < ApplicationController
 end
 </ruby>
 
-Now, if the current user is a special user, they'll get a special layout when viewing a product. You can even use an inline method to determine the layout:
+Now, if the current user is a special user, they'll get a special layout when viewing a product.
 
-You can also decide the layout by passing a Proc object, the block you give the Proc will be given the +controller+ instance, so you can make decisions based on the current request. For example:
+You can even use an inline method, such as a Proc, to determine the layout. For example, if you pass a Proc object, the block you give the Proc will be given the +controller+ instance, so the layout can be determined based on the current request:
 
 <ruby>
 class ProductsController < ApplicationController
@@ -404,7 +404,7 @@ end
 
 h6. Conditional Layouts
 
-Layouts specified at the controller level support +:only+ and +:except+ options that take either a method name or an array of method names which correspond to method names within the controller:
+Layouts specified at the controller level support the +:only+ and +:except+ options. These options take either a method name, or an array of method names, corresponding to method names within the controller:
 
 <ruby>
 class ProductsController < ApplicationController
@@ -416,7 +416,7 @@ With this declaration, the +product+ layout would be used for everything but the
 
 h6. Layout Inheritance
 
-Layouts are shared downwards in the hierarchy, and more specific layouts always override more general ones. For example:
+Layout declarations cascade downward in the hierarchy, and more specific layout declarations always override more general ones. For example:
 
 * +application_controller.rb+
 
@@ -495,9 +495,9 @@ def show
 end
 </ruby>
 
-Make sure you use +and return+ and not +&amp;&amp; return+ because while the former will work, the latter will not due to operator precedence in the Ruby Language.
+Make sure to use +and return+ and not +&amp;&amp; return+, since +&amp;&amp; return+ will not work due to the operator precedence in the Ruby Language.
 
-Note that the implicit render done by ActionController detects if +render+ has been called, and thus avoids this error. Therefore, the following will work without errors:
+Note that the implicit render done by ActionController detects if +render+ has been called, so the following will work without errors:
 
 <ruby>
 def show
-- 
cgit v1.2.3


From 018e84af200859e72cc5b895c4a843f81c6b5931 Mon Sep 17 00:00:00 2001
From: "Karunakar (Ruby)" <revurikarna@gmail.com>
Date: Sun, 16 Oct 2011 01:00:57 +0530
Subject: railties README change to make consistent like others eg:activerecord

---
 railties/README.rdoc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/railties/README.rdoc b/railties/README.rdoc
index 95c43045b0..b77304fc3b 100644
--- a/railties/README.rdoc
+++ b/railties/README.rdoc
@@ -15,12 +15,18 @@ The latest version of Railties can be installed with RubyGems:
 
 * gem install railties
 
-Documentation can be found at
+== License
 
-* http://api.rubyonrails.org
+Railties is released under the MIT license.
 
+== Support
 
-== License
+API documentation is at
 
-Railties is released under the MIT license.
+* http://api.rubyonrails.org
+
+Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
+
+* https://github.com/rails/rails/issues
 
+You can find more usage information in the ActiveResource::Base documentation.
-- 
cgit v1.2.3


From 4867bfabaa03b4c936dd766c7f2edf0919e05ca4 Mon Sep 17 00:00:00 2001
From: "Karunakar (Ruby)" <revurikarna@gmail.com>
Date: Sun, 16 Oct 2011 01:12:00 +0530
Subject: more doc changes on railties README

---
 railties/README.rdoc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/railties/README.rdoc b/railties/README.rdoc
index b77304fc3b..ae40600401 100644
--- a/railties/README.rdoc
+++ b/railties/README.rdoc
@@ -15,6 +15,10 @@ The latest version of Railties can be installed with RubyGems:
 
 * gem install railties
 
+Source code can be downloaded as part of the Rails project on GitHub
+
+* https://github.com/rails/rails/tree/master/railties
+
 == License
 
 Railties is released under the MIT license.
@@ -29,4 +33,3 @@ Bug reports and feature requests can be filed with the rest for the Ruby on Rail
 
 * https://github.com/rails/rails/issues
 
-You can find more usage information in the ActiveResource::Base documentation.
-- 
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(-)

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 abf4f096e56a941ac4f908cb34c83bc82770ed56 Mon Sep 17 00:00:00 2001
From: mhutchin <mike@mhutchinson.com>
Date: Sat, 15 Oct 2011 15:59:26 -0700
Subject: [layouts and rendering] Copy editing

---
 .../guides/source/layouts_and_rendering.textile    | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile
index 6f0dc57090..df7b9b364c 100644
--- a/railties/guides/source/layouts_and_rendering.textile
+++ b/railties/guides/source/layouts_and_rendering.textile
@@ -334,7 +334,7 @@ render :status => 500
 render :status => :forbidden
 </ruby>
 
-Rails understands both numeric status codes and symbols for status codes.
+Rails understands both numeric and symbolic status codes.
 
 h6. The +:location+ Option
 
@@ -518,7 +518,7 @@ Another way to handle returning responses to an HTTP request is with +redirect_t
 redirect_to photos_url
 </ruby>
 
-You can use +redirect_to+ with any arguments that you could use with +link_to+ or +url_for+. In addition, there's a special redirect that sends the user back to the page they just came from:
+You can use +redirect_to+ with any arguments that you could use with +link_to+ or +url_for+. There's also a special redirect that sends the user back to the page they just came from:
 
 <ruby>
 redirect_to :back
@@ -526,7 +526,7 @@ redirect_to :back
 
 h5. Getting a Different Redirect Status Code
 
-Rails uses HTTP status code 302 (temporary redirect) when you call +redirect_to+. If you'd like to use a different status code (perhaps 301, permanent redirect), you can do so by using the +:status+ option:
+Rails uses HTTP status code 302, a temporary redirect, when you call +redirect_to+. If you'd like to use a different status code, perhaps 301, a permanent redirect, you can use the +:status+ option:
 
 <ruby>
 redirect_to photos_path, :status => 301
@@ -536,7 +536,7 @@ Just like the +:status+ option for +render+, +:status+ for +redirect_to+ accepts
 
 h5. The Difference Between +render+ and +redirect_to+
 
-Sometimes inexperienced developers conceive of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back an HTTP 302 status code.
+Sometimes inexperienced developers think of +redirect_to+ as a sort of +goto+ command, moving execution from one place to another in your Rails code. This is _not_ correct. Your code stops running and waits for a new request for the browser. It just happens that you've told the browser what request it should make next, by sending back an HTTP 302 status code.
 
 Consider these actions to see the difference:
 
@@ -553,7 +553,7 @@ def show
 end
 </ruby>
 
-With the code in this form, there will likely be a problem if the +@book+ variable is +nil+. Remember, a +render :action+ doesn't run any code in the target action, so nothing will set up the +@books+ variable that the +index+ view is presumably depending on. One way to fix this is to redirect instead of rendering:
+With the code in this form, there will likely be a problem if the +@book+ variable is +nil+. Remember, a +render :action+ doesn't run any code in the target action, so nothing will set up the +@books+ variable that the +index+ view will probably require. One way to fix this is to redirect instead of rendering:
 
 <ruby>
 def index
@@ -570,9 +570,9 @@ end
 
 With this code, the browser will make a fresh request for the index page, the code in the +index+ method will run, and all will be well.
 
-The only downside to this code, is that it requires a round trip to the browser, the browser requested the show action with +/books/1+ and the controller finds that there are no books, so the controller sends out a 302 redirect response to the browser telling it to go to +/books/+, the browser complies and sends a new request back to the controller asking now for the +index+ action, the controller then gets all the books in the database and renders the index template, sending it back down to the browser which then shows it on your screen.
+The only downside to this code is that it requires a round trip to the browser: the browser requested the show action with +/books/1+ and the controller finds that there are no books, so the controller sends out a 302 redirect response to the browser telling it to go to +/books/+, the browser complies and sends a new request back to the controller asking now for the +index+ action, the controller then gets all the books in the database and renders the index template, sending it back down to the browser which then shows it on your screen.
 
-While in a small app, this added latency might not be a problem, it is something to think about when speed of response is of the essence. One way to handle this double request (though a contrived example) could be:
+While in a small application, this added latency might not be a problem, it is something to think about if response time is a concern. We can demonstrate one way to handle this with a contrived example:
 
 <ruby>
 def index
@@ -588,7 +588,7 @@ def show
 end
 </ruby>
 
-Which would detect that there are no books, populate the +@books+ instance variable with all the books in the database and then directly render the +index.html.erb+ template returning it to the browser with a flash alert message telling the user what happened.
+This would detect that there are no books with the specified ID, populate the +@books+ instance variable with all the books in the model, and then directly render the +index.html.erb+ template, returning it to the browser with a flash alert message to tell the user what happened.
 
 h4. Using +head+ To Build Header-Only Responses
 
@@ -598,7 +598,7 @@ The +head+ method can be used to send responses with only headers to the browser
 head :bad_request
 </ruby>
 
-Which would produce the following header:
+This would produce the following header:
 
 <shell>
 HTTP/1.1 400 Bad Request
@@ -611,7 +611,7 @@ Set-Cookie: _blog_session=...snip...; path=/; HttpOnly
 Cache-Control: no-cache
 </shell>
 
-Or you can use other HTTP headers to convey additional information:
+Or you can use other HTTP headers to convey other information:
 
 <ruby>
 head :created, :location => photo_path(@photo)
@@ -633,15 +633,15 @@ Cache-Control: no-cache
 
 h3. Structuring Layouts
 
-When Rails renders a view as a response, it does so by combining the view with the current layout (using the rules for finding the current layout that were covered earlier in this guide). Within a layout, you have access to three tools for combining different bits of output to form the overall response:
+When Rails renders a view as a response, it does so by combining the view with the current layout, using the rules for finding the current layout that were covered earlier in this guide. Within a layout, you have access to three tools for combining different bits of output to form the overall response:
 
 * Asset tags
 * +yield+ and +content_for+
 * Partials
 
-h4. Asset Tags
+h4. Asset Tag Helpers
 
-Asset tags provide methods for generating HTML that links views to feeds, JavaScript, stylesheets, images, videos and audios. These are the six asset tags available in Rails:
+Asset tag helpers provide methods for generating HTML that link views to feeds, JavaScript, stylesheets, images, videos and audios. There are six asset tag helpers available in Rails:
 
 * +auto_discovery_link_tag+
 * +javascript_include_tag+
@@ -650,11 +650,11 @@ Asset tags provide methods for generating HTML that links views to feeds, JavaSc
 * +video_tag+
 * +audio_tag+
 
-You can use these tags in layouts or other views, although the tags other than +image_tag+ are most commonly used in the +&lt;head&gt;+ section of a layout.
+You can use these tags in layouts or other views, although the +auto_discovery_link_tag+, +javascript_include_tag+, and +stylesheet_link_tag+, are most commonly used in the +&lt;head&gt;+ section of a layout.
 
-WARNING: The asset tags do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
+WARNING: The asset tag helpers do _not_ verify the existence of the assets at the specified locations; they simply assume that you know what you're doing and generate the link.
 
-h5. Linking to Feeds with +auto_discovery_link_tag+
+h5. Linking to Feeds with the +auto_discovery_link_tag+
 
 The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsreaders can use to detect the presences of RSS or ATOM feeds. It takes the type of the link (+:rss+ or +:atom+), a hash of options that are passed through to url_for, and a hash of options for the tag:
 
@@ -663,13 +663,13 @@ The +auto_discovery_link_tag+ helper builds HTML that most browsers and newsread
   {:title => "RSS Feed"}) %>
 </erb>
 
-There are three tag options available for +auto_discovery_link_tag+:
+There are three tag options available for the +auto_discovery_link_tag+:
 
-* +:rel+ specifies the +rel+ value in the link (defaults to "alternate")
+* +:rel+ specifies the +rel+ value in the link. The default value is "alternate".
 * +:type+ specifies an explicit MIME type. Rails will generate an appropriate MIME type automatically.
-* +:title+ specifies the title of the link
+* +:title+ specifies the title of the link. The default value is the upshifted +:type+ value, for example, "ATOM" or "RSS".
 
-h5. Linking to JavaScript Files with +javascript_include_tag+
+h5. Linking to JavaScript Files with the +javascript_include_tag+
 
 The +javascript_include_tag+ helper returns an HTML +script+ tag for each source provided. Rails looks in +public/javascripts+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/javascripts/main.js+:
 
@@ -738,7 +738,7 @@ By default, the combined file will be delivered as +javascripts/all.js+. You can
 
 You can even use dynamic paths such as +cache/#{current_site}/main/display+.
 
-h5. Linking to CSS Files with +stylesheet_link_tag+
+h5. Linking to CSS Files with the +stylesheet_link_tag+
 
 The +stylesheet_link_tag+ helper returns an HTML +&lt;link&gt;+ tag for each source provided. Rails looks in +public/stylesheets+ for these files by default, but you can specify a full path relative to the document root, or a URL, if you prefer. For example, to include +public/stylesheets/main.css+:
 
@@ -764,7 +764,7 @@ To include +http://example.com/main.css+:
 <%= stylesheet_link_tag "http://example.com/main.css" %>
 </erb>
 
-By default, +stylesheet_link_tag+ creates links with +media="screen" rel="stylesheet" type="text/css"+. You can override any of these defaults by specifying an appropriate option (+:media+, +:rel+, or +:type+):
+By default, the +stylesheet_link_tag+ creates links with +media="screen" rel="stylesheet" type="text/css"+. You can override any of these defaults by specifying an appropriate option (+:media+, +:rel+, or +:type+):
 
 <erb>
 <%= stylesheet_link_tag "main_print", :media => "print" %>
@@ -797,7 +797,7 @@ By default, the combined file will be delivered as +stylesheets/all.css+. You ca
 
 You can even use dynamic paths such as +cache/#{current_site}/main/display+.
 
-h5. Linking to Images with +image_tag+
+h5. Linking to Images with the +image_tag+
 
 The +image_tag+ helper builds an HTML +&lt;img /&gt;+ tag to the specified file. By default, files are loaded from +public/images+.
 
@@ -846,7 +846,7 @@ In addition to the above special tags, you can supply a final hash of standard H
                           :class => 'nav_bar' %>
 </erb>
 
-h5. Linking to Videos with +video_tag+
+h5. Linking to Videos with the +video_tag+
 
 The +video_tag+ helper builds an HTML 5 +&lt;video&gt;+ tag to the specified file. By default, files are loaded from +public/videos+.
 
@@ -882,7 +882,7 @@ This will produce:
 <video><source src="trailer.ogg" /><source src="movie.ogg" /></video>
 </erb>
 
-h5. Linking to Audio files with +audio_tag+
+h5. Linking to Audio Files with the +audio_tag+
 
 The +audio_tag+ helper builds an HTML 5 +&lt;audio&gt;+ tag to the specified file. By default, files are loaded from +public/audios+.
 
@@ -933,7 +933,7 @@ You can also create a layout with multiple yielding regions:
 
 The main body of the view will always render into the unnamed +yield+. To render content into a named +yield+, you use the +content_for+ method.
 
-h4. Using +content_for+
+h4. Using the +content_for+ Method
 
 The +content_for+ method allows you to insert content into a named +yield+ block in your layout. For example, this view would work with the layout that you just saw:
 
-- 
cgit v1.2.3


From 9210458547bbf5e79aa650e15226a0d5c58ea6c7 Mon Sep 17 00:00:00 2001
From: Vishnu Atrai <me@vishnuatrai.com>
Date: Sun, 16 Oct 2011 14:29:06 +0530
Subject: fix to remove warning in test cases

---
 activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb b/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb
index 5ffd886dab..97adb6b297 100644
--- a/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb
+++ b/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb
@@ -21,7 +21,7 @@ class MysqlCaseSensitivityTest < ActiveRecord::TestCase
     CollationTest.create!(:string_ci_column => 'A')
     invalid = CollationTest.new(:string_ci_column => 'a')
     queries = assert_sql { invalid.save }
-    ci_uniqueness_query = queries.detect { |q| q.match /string_ci_column/ }
+    ci_uniqueness_query = queries.detect { |q| q.match(/string_ci_column/) }
     assert_no_match(/lower/i, ci_uniqueness_query)
   end
 
@@ -29,7 +29,7 @@ class MysqlCaseSensitivityTest < ActiveRecord::TestCase
     CollationTest.create!(:string_cs_column => 'A')
     invalid = CollationTest.new(:string_cs_column => 'a')
     queries = assert_sql { invalid.save }
-    cs_uniqueness_query = queries.detect { |q| q.match /string_cs_column/ }
+    cs_uniqueness_query = queries.detect { |q| q.match(/string_cs_column/) }
     assert_match(/lower/i, cs_uniqueness_query)
   end
 end
-- 
cgit v1.2.3


From bb8ee9264f8302ea9f669c96f46d9c3812d6f350 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Sat, 15 Oct 2011 09:51:30 +1100
Subject: [engines guide] improve intro to 'Hooking into an application'
 section

---
 railties/guides/source/engines.textile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 126d09ab87..4f77852c40 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -343,9 +343,13 @@ The +comment_counter+ local variable is given to us by the +<%= render @post.com
 
 That completes the comment function of the blogging engine. Now it's time to use it within an application.
 
-h3. Hooking into application
+h3. Hooking into an application
 
-Using an engine within an application is very easy. First, the engine needs to be specified inside the application's +Gemfile+. If there isn't an application handy to test this out in, generate one using the +rails new+ command outside of the engine directory like this:
+Using an engine within an application is very easy. This section covers how to mount the engine into an application and the initial setup required for it, as well as linking the engine to a +User+ class provided by the application to provide ownership for posts and comments within the engine.
+
+h4. Mounting the engine
+
+First, the engine needs to be specified inside the application's +Gemfile+. If there isn't an application handy to test this out in, generate one using the +rails new+ command outside of the engine directory like this:
 
 <shell>
 $ rails new unicorn
-- 
cgit v1.2.3


From 0f87cc1486e2b7f95fff69ead9e6c74344c89496 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Sat, 15 Oct 2011 09:52:07 +1100
Subject: [engines guide] Add 'Engine setup' section in 'Hooking into an
 application' section

---
 railties/guides/source/engines.textile | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 4f77852c40..8d5c231124 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -378,14 +378,32 @@ As described earlier, by placing the gem in the +Gemfile+ it will be loaded when
 To make the engine's functionality accessible from within an application, it needs to be mounted in that application's +config/routes.rb+ file:
 
 <ruby>
-  mount Blorgh::Engine, :at => "blog"
+mount Blorgh::Engine, :at => "blog"
 </ruby>
 
+This line will mount the engine at +blog+ in the application. Making it accessible at +http://localhost:3000/blog+ when the application runs with +rails s+.
+
 NOTE: Other engines, such as Devise, handle this a little differently by making you specify custom helpers such as +devise_for+ in the routes. These helpers do exactly the same thing, mounting pieces of the engines's functionality at a pre-defined path which may be customizable.
 
+h4. Engine setup
+
+The engine contains migrations for the +blorgh_posts+ and +blorgh_comments+ table which need to be created in the application's database so that the engine's models can query them correctly. To copy these migrations into the application use this command:
+
+<shell>
+$ rake blorgh:install:migrations
+</shell>
+
+This command, when run for the first time will copy over all the migrations from the engine. When run the next time, it will only copy over migrations that haven't been copied over already. The first run for this command will output something such as this:
+
+<shell>
+Copied migration [timestamp_1]_create_blorgh_posts.rb from blorgh
+Copied migration [timestamp_2]_create_blorgh_comments.rb from blorgh
+</shell>
+
+The first timestamp (+\[timestamp_1\]+) will be the current time and the second timestamp (+\[timestamp_2\]+) will be the current time plus a second. The reason for this is so that the migrations for the engine are run after any existing migrations in the application.
 
+To run these migrations within the context of the application, simply run +rake db:migrate+. When accessing the engine through +http://localhost:3000/blog+, the posts will be empty. This is because the table created inside the application is different from the one created within the engine. Go ahead, play around with the newly mounted engine. You'll find that it's the same as when it was only an engine.
 
-This line will mount the engine
 TODO: Application will provide a User foundation class which the engine hooks into through a configuration setting, configurable in the application's initializers. The engine will be mounted at the +/blog+ path in the application.
 
 h3. Overriding engine functionality
-- 
cgit v1.2.3


From 434148024d742ec50662bf72c5cbb8e5664985e5 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Sun, 16 Oct 2011 09:53:26 +1100
Subject: [engines guide] beginning to cover using application's classes

---
 railties/guides/source/engines.textile | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 8d5c231124..9cdca25329 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -404,7 +404,29 @@ The first timestamp (+\[timestamp_1\]+) will be the current time and the second
 
 To run these migrations within the context of the application, simply run +rake db:migrate+. When accessing the engine through +http://localhost:3000/blog+, the posts will be empty. This is because the table created inside the application is different from the one created within the engine. Go ahead, play around with the newly mounted engine. You'll find that it's the same as when it was only an engine.
 
-TODO: Application will provide a User foundation class which the engine hooks into through a configuration setting, configurable in the application's initializers. The engine will be mounted at the +/blog+ path in the application.
+h4. Using an application's classes
+
+When an engine is created, it may want to use specific classes from an application to provide links between the pieces of the engine and the pieces of the application. In the case of the +blorgh+ engine, making posts and comments have authors would make a lot of sense.
+
+Usually, an application would have a +User+ class that would provide the objects that would represent the posts' and comments' authors, but there could be a case where the application calls this class something different, such as +Person+. It's because of this reason that the engine should not hardcode the associations to be exactly for a +User+ class, but should allow for some flexibility around what the class is called.
+
+To keep it simple in this case, the application will have a class called +User+ which will represent the users of the application. It can be generated using this command:
+
+<shell>
+rails g model user name:string
+</shell>
+
+Also to keep it simple, the posts form will have a new text field called +author+ where users can elect to put their name. The engine will then take this name and create a new +User+ object from it or find one that already has that name, and then associate the post with it.
+
+First, the +author+ text field needs to be added to the +app/views/blorgh/posts/_form.html.erb+ partial inside the engine. This can be added above the +title+ field with this code:
+
+<erb>
+<div class="field">
+  <%= f.label :author %><br />
+  <%= f.text_field :author %>
+</div>
+</erb>
+
 
 h3. Overriding engine functionality
 
-- 
cgit v1.2.3


From 5bf0ea6830f9148f6b45d2774bfd7f54eec4a267 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Mon, 17 Oct 2011 08:55:32 +1100
Subject: [engines guide] Complete section about using an application's class

---
 railties/guides/source/engines.textile | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 9cdca25329..bc5fe7640a 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -404,7 +404,7 @@ The first timestamp (+\[timestamp_1\]+) will be the current time and the second
 
 To run these migrations within the context of the application, simply run +rake db:migrate+. When accessing the engine through +http://localhost:3000/blog+, the posts will be empty. This is because the table created inside the application is different from the one created within the engine. Go ahead, play around with the newly mounted engine. You'll find that it's the same as when it was only an engine.
 
-h4. Using an application's classes
+h4. Using a class provided by the application
 
 When an engine is created, it may want to use specific classes from an application to provide links between the pieces of the engine and the pieces of the application. In the case of the +blorgh+ engine, making posts and comments have authors would make a lot of sense.
 
@@ -416,17 +416,38 @@ To keep it simple in this case, the application will have a class called +User+
 rails g model user name:string
 </shell>
 
-Also to keep it simple, the posts form will have a new text field called +author+ where users can elect to put their name. The engine will then take this name and create a new +User+ object from it or find one that already has that name, and then associate the post with it.
+Also to keep it simple, the posts form will have a new text field called +author_name_+ where users can elect to put their name. The engine will then take this name and create a new +User+ object from it or find one that already has that name, and then associate the post with it.
 
-First, the +author+ text field needs to be added to the +app/views/blorgh/posts/_form.html.erb+ partial inside the engine. This can be added above the +title+ field with this code:
+First, the +author_name+ text field needs to be added to the +app/views/blorgh/posts/_form.html.erb+ partial inside the engine. This can be added above the +title+ field with this code:
 
 <erb>
 <div class="field">
-  <%= f.label :author %><br />
-  <%= f.text_field :author %>
+  <%= f.label :author_name %><br />
+  <%= f.text_field :author_name %>
 </div>
 </erb>
 
+The +Blorgh::Post+ model should then have some code to convert the +author_name+ field into an actual +User+ object and associate it as that post's +author+ before the post is saved. It will also need to have an +attr_accessor+ setup for this field so that the setter and getter methods are defined for it.
+
+To do all this, you'll need to add the +attr_accessor+ for +author_name+, the association for the author and the +before_save+ call into +app/models/blorgh/post.rb+. The +author+ association will be hard-coded to the +User+ class for the time being.
+
+<ruby>
+attr_accessor :author_name
+belongs_to :author, :class_name => "User"
+
+before_save :set_author
+
+private
+  def set_author
+    self.author = User.find_or_create_by_name(author_name)
+  end
+</ruby>
+
+By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. Now just before a post is saved it will be associated with a record from the +users+ table of the application.
+
+h4. Configuring an engine
+
+The next step is to make the class that represents a +User+ in the application customizable for the engine. This is because, as explained before, that class may not always be +User+.
 
 h3. Overriding engine functionality
 
-- 
cgit v1.2.3


From 7d8c650e8663e0af722225e66f72a82dcb518b55 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Mon, 17 Oct 2011 17:12:31 +1100
Subject: [engines guide] [reviewing] remove excessive 'Now'

---
 railties/guides/source/engines.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index bc5fe7640a..d191fe07b6 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -443,7 +443,7 @@ private
   end
 </ruby>
 
-By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. Now just before a post is saved it will be associated with a record from the +users+ table of the application.
+By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. Just before a post is saved it will be associated with a record from the +users+ table of the application.
 
 h4. Configuring an engine
 
-- 
cgit v1.2.3


From 180d4137ca8222cb90a285bfd60265ae93c56968 Mon Sep 17 00:00:00 2001
From: Martin Svalin <martin@lite.nu>
Date: Tue, 11 Oct 2011 21:44:22 +0200
Subject: ActiveModel::Errors#generate_message without i18n_scope, and more
 test cases for #add

---
 activemodel/lib/active_model/errors.rb | 12 ++++++++----
 activemodel/test/cases/errors_test.rb  | 21 +++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index d91e4a2b6a..f90030641d 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -300,13 +300,17 @@ module ActiveModel
     def generate_message(attribute, type = :invalid, options = {})
       type = options.delete(:message) if options[:message].is_a?(Symbol)
 
-      defaults = @base.class.lookup_ancestors.map do |klass|
-        [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.attributes.#{attribute}.#{type}",
-          :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.#{type}" ]
+      if @base.class.respond_to?(:i18n_scope)
+        defaults = @base.class.lookup_ancestors.map do |klass|
+          [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.attributes.#{attribute}.#{type}",
+            :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.i18n_key}.#{type}" ]
+        end
+      else
+        defaults = []
       end
 
       defaults << options.delete(:message)
-      defaults << :"#{@base.class.i18n_scope}.errors.messages.#{type}"
+      defaults << :"#{@base.class.i18n_scope}.errors.messages.#{type}" if @base.class.respond_to?(:i18n_scope)
       defaults << :"errors.attributes.#{attribute}.#{type}"
       defaults << :"errors.messages.#{type}"
 
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 4c76bb43a8..784a2b2709 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -66,6 +66,20 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["can not be blank"], person.errors[:name]
   end
 
+  test "should be able to add an error with a symbol" do
+    person = Person.new
+    person.errors.add(:name, :blank)
+    message = person.errors.generate_message(:name, :blank)
+    assert_equal [message], person.errors[:name]
+  end
+
+  test "should be able to add an error with a proc" do
+    person = Person.new
+    message = Proc.new { "can not be blank" }
+    person.errors.add(:name, message)
+    assert_equal ["can not be blank"], person.errors[:name]
+  end
+
   test 'should respond to size' do
     person = Person.new
     person.errors.add(:name, "can not be blank")
@@ -112,5 +126,12 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["is invalid"], hash[:email]
   end
 
+  test "generate_message should work without i18n_scope" do
+    person = Person.new
+    assert !Person.respond_to?(:i18n_scope)
+    assert_nothing_raised {
+      person.errors.generate_message(:name, :blank)
+    }
+  end
 end
 
-- 
cgit v1.2.3


From 518b30cf486164c59b7120b7b5039aa85c962630 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Mon, 17 Oct 2011 20:25:45 +1100
Subject: [engines guide] Point out that we need to run rake db:migrate after
 creating user model

---
 railties/guides/source/engines.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index d191fe07b6..42c99d3405 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -416,6 +416,8 @@ To keep it simple in this case, the application will have a class called +User+
 rails g model user name:string
 </shell>
 
+The +rake db:migrate+ command needs to be run here to ensure that our application has the +users+ table for future use.
+
 Also to keep it simple, the posts form will have a new text field called +author_name_+ where users can elect to put their name. The engine will then take this name and create a new +User+ object from it or find one that already has that name, and then associate the post with it.
 
 First, the +author_name+ text field needs to be added to the +app/views/blorgh/posts/_form.html.erb+ partial inside the engine. This can be added above the +title+ field with this code:
-- 
cgit v1.2.3


From cb95cca02674acf1f52d4c8f1a70fa22617e35d9 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Mon, 17 Oct 2011 20:26:37 +1100
Subject: [engines guide] missed a spot in the 'Using a class section' +
 further text for 'Configuring an engine' section

---
 railties/guides/source/engines.textile | 71 +++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 42c99d3405..6e27d823a7 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -445,11 +445,78 @@ private
   end
 </ruby>
 
-By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. Just before a post is saved it will be associated with a record from the +users+ table of the application.
+By defining that the +author+ association's object is represented by the +User+ class a link is established between the engine and the application. There needs to be a way of associating the records in the +blorgh_posts+ table with the records in the +users+ table. Because the association is called +author+, there should be an +author_id+ column added to the +blorgh_posts+ table. 
+
+To generate this new column, run this command within the engine:
+
+<shell>
+$ rails g migration add_author_to_blorgh_posts author:references 
+</shell>
+
+NOTE: Due to the migration's name, Rails will automatically know that you want to add a column to a specific table and write that into the migration for you. You don't need to tell it any more than this.
+
+This migration will need to be run on the application. To do that, it must first be copied using this command:
+
+<shell>
+$ rake blorgh:install:migrations
+</shell>
+
+NOTE: Notice here that only _one_ migration was copied over here. This is because the first two migrations were copied over the first time this command was run.
+
+And then migrated using this command:
+
+<shell>
+$ rake db:migrate
+</shell>
+
+Now with all the pieces in place, an action will take place that will associate an author -- represented by a record in the +users+ table -- with a post, represented by the +blorgh_posts+ table from the engine.
+
+Finally, the author's name should be displayed on the post's page. Add this code above the "Title" output inside +app/views/blorgh/posts/show.html.erb+:
+
+<erb>
+<p>
+  <b>Author:</b>
+  <%= @post.author.name %>
+</p>
+</erb>
+
+NOTE: For posts created previously, this will break the +show+ page for them. We recommend deleting these posts and starting again, or manually assigning an author using +rails c+. 
 
 h4. Configuring an engine
 
-The next step is to make the class that represents a +User+ in the application customizable for the engine. This is because, as explained before, that class may not always be +User+.
+The next step is to make the class that represents a +User+ in the application customizable for the engine. This is because, as explained before, that class may not always be +User+. To make this customizable, the engine will have a configuration setting called +user_class+ that will be used to specify what the class representing users is inside the application.
+
+To define this configuration setting, you should use a +mattr_accessor+ inside the +Blorgh+ module for the engine, located at +lib/blorgh.rb+ inside the engine. Inside this module, put this line:
+
+<ruby>
+mattr_accessor :user_class
+</ruby>
+
+This method works like its brothers +attr_accessor+ and +cattr_accessor+, but provides a setter and getter method on the module with the specified name. To use it, it must be referenced using +Blorgh.user_class+.
+
+The next step is switching the +Blorgh::Post+ model over to this new setting. For the +belongs_to+ association inside this model (+app/models/blorgh/post.rb+), it will now become this:
+
+<ruby>
+belongs_to :author, :class_name => Blorgh.user_class
+</ruby>
+
+The +set_author+ method also located in this class should also use this class:
+
+<ruby>
+self.author = Blorgh.user_class.constantize.find_or_create_by_name(author_name)
+</ruby>
+
+To set this configuration setting within the application, an initializer should be used. By using an initializer, the configuration will be set up before the application starts and makes references to the classes of the engine which may depend on this configuration setting existing.
+
+Create a new initializer at +config/initializers/blorgh.rb+ inside the application where the +blorgh+ engine is installed and put this content in it:
+
+<ruby>
+Blorgh.user_class = "User"
+</ruby>
+
+WARNING: It's very important here to use the +String+ version of the class, rather than the class itself. If you were to use the class, Rails would attempt to load that class and then reference the related table, which could lead to problems if the table wasn't already existing. Therefore, a +String+ should be used and then converted to a class using +constantize+ in the engine later on.
+
+
 
 h3. Overriding engine functionality
 
-- 
cgit v1.2.3


From 86919a6da17e164e6bb9e1f355052e552929141e Mon Sep 17 00:00:00 2001
From: Pascal Lindelauf <pascal@lindelauf.com>
Date: Mon, 17 Oct 2011 14:45:45 +0200
Subject: Clarified that the config.assets.initialize_on_precompile directive
 needs to be set in application.rb

---
 railties/guides/source/asset_pipeline.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index afaf0f6fe3..6eb4ae49e3 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -349,7 +349,7 @@ bundle exec rake assets:precompile
 </plain>
 
 For faster asset precompiles, you can partially load your application by setting
-+config.assets.initialize_on_precompile+ to false, though in that case templates
++config.assets.initialize_on_precompile+ to false in +config/application.rb+, though in that case templates
 cannot see application objects or methods. *Heroku requires this to be false.*
 
 WARNING: If you set +config.assets.initialize_on_precompile+ to false, be sure to
-- 
cgit v1.2.3


From 826a85069627060c11baf932423702b1228dd4df Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 17 Oct 2011 19:14:29 +0530
Subject: fix a typo and slightly reword has_secure_password comment

---
 activemodel/lib/active_model/secure_password.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index 7a109d9a52..db78864c67 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -32,8 +32,8 @@ module ActiveModel
       #   User.find_by_name("david").try(:authenticate, "notright")      # => nil
       #   User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
       def has_secure_password
-        # Load bcrypt-ruby only when has_secured_password is used to avoid make ActiveModel
-        # (and by extension the entire framework) dependent on a binary library.
+        # Load bcrypt-ruby only when has_secure_password is used.
+        # This is to avoid ActiveModel (and by extension the entire framework) being dependent on a binary library.
         gem 'bcrypt-ruby', '~> 3.0.0'
         require 'bcrypt'
 
-- 
cgit v1.2.3


From 8dffc62a9b957c91575f7c014f50806e86d64505 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 17 Oct 2011 19:15:24 +0530
Subject: use variables from test setup

---
 activemodel/test/cases/secure_password_test.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/activemodel/test/cases/secure_password_test.rb b/activemodel/test/cases/secure_password_test.rb
index 6950c3be1f..4338a3fc53 100644
--- a/activemodel/test/cases/secure_password_test.rb
+++ b/activemodel/test/cases/secure_password_test.rb
@@ -10,15 +10,13 @@ class SecurePasswordTest < ActiveModel::TestCase
   end
 
   test "blank password" do
-    user = User.new
-    user.password = ''
-    assert !user.valid?, 'user should be invalid'
+    @user.password = ''
+    assert !@user.valid?, 'user should be invalid'
   end
 
   test "nil password" do
-    user = User.new
-    user.password = nil
-    assert !user.valid?, 'user should be invalid'
+    @user.password = nil
+    assert !@user.valid?, 'user should be invalid'
   end
 
   test "password must be present" do
-- 
cgit v1.2.3


From 8510a0bb5a8a65e4bc067ee5a7d98aae965b47a5 Mon Sep 17 00:00:00 2001
From: Aaron Christy <aaron@edgecase.com>
Date: Sat, 15 Oct 2011 19:53:36 -0400
Subject: Exclude _destroy parameter in :all_blank check (issue #2937)

---
 activerecord/CHANGELOG                              | 5 +++++
 activerecord/lib/active_record/nested_attributes.rb | 5 +++--
 activerecord/test/cases/nested_attributes_test.rb   | 8 ++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 0f6a31d679..46076dac61 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -29,6 +29,11 @@
 
   [Andrés Mejía]
 
+* Fix nested attributes bug where _destroy parameter is taken into account
+  during :reject_if => :all_blank (fixes #2937)
+
+  [Aaron Christy]
+
 *Rails 3.1.1 (October 7, 2011)*
 
 * Add deprecation for the preload_associations method. Fixes #3022.
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index 2dbebfcaf8..d2065d701f 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -220,7 +220,7 @@ module ActiveRecord
     #     validates_presence_of :member
     #   end
     module ClassMethods
-      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |_, value| value.blank? } }
+      REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == '_destroy' || value.blank? } }
 
       # Defines an attributes writer for the specified association(s). If you
       # are using <tt>attr_protected</tt> or <tt>attr_accessible</tt>, then you
@@ -239,7 +239,8 @@ module ActiveRecord
       #   is specified, a record will be built for all attribute hashes that
       #   do not have a <tt>_destroy</tt> value that evaluates to true.
       #   Passing <tt>:all_blank</tt> instead of a Proc will create a proc
-      #   that will reject a record where all the attributes are blank.
+      #   that will reject a record where all the attributes are blank excluding
+      #   any value for _destroy.
       # [:limit]
       #   Allows you to specify the maximum number of the associated records that
       #   can be processed with the nested attributes. If the size of the
diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 67a9ed6cd8..2ae9cb4888 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -45,6 +45,14 @@ class TestNestedAttributesInGeneral < ActiveRecord::TestCase
     end
   end
 
+  def test_should_not_build_a_new_record_using_reject_all_even_if_destroy_is_given
+    pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
+    pirate.birds_with_reject_all_blank_attributes = [{:name => '', :color => '', :_destroy => '0'}]
+    pirate.save!
+
+    assert pirate.birds_with_reject_all_blank.empty?
+  end
+
   def test_should_not_build_a_new_record_if_reject_all_blank_returns_false
     pirate = Pirate.create!(:catchphrase => "Don' botharrr talkin' like one, savvy?")
     pirate.birds_with_reject_all_blank_attributes = [{:name => '', :color => ''}]
-- 
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(-)

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(-)

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 d21405a07ce9264ed92b9c7385141e05ccea565c Mon Sep 17 00:00:00 2001
From: "Rahul P. Chaudhari" <rahul100885@gmail.com>
Date: Mon, 17 Oct 2011 00:30:07 +0530
Subject: Added test case for postgresql database

---
 railties/test/generators/app_generator_test.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 133efb872f..2dcce4e884 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -143,6 +143,16 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
+  def test_config_postgresql_database
+    run_generator([destination_root, "-d", "postgresql"])
+    assert_file "config/database.yml", /postgresql/
+    unless defined?(JRUBY_VERSION)
+      assert_file "Gemfile", /^gem\s+["']pg["']$/
+    else
+      assert_file "Gemfile", /^gem\s+["']activerecord-jdbcpostgresql-adapter["']$/
+    end
+  end
+
   def test_config_jdbcmysql_database
     run_generator([destination_root, "-d", "jdbcmysql"])
     assert_file "config/database.yml", /mysql/
-- 
cgit v1.2.3


From c547e968f5709f174ee13818b35429cbe585b5dd Mon Sep 17 00:00:00 2001
From: Steven Anderson <steve@whilefalse.net>
Date: Mon, 17 Oct 2011 16:28:00 +0100
Subject: Added environment rake task to engines

---
 railties/lib/rails/tasks/engine.rake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/railties/lib/rails/tasks/engine.rake b/railties/lib/rails/tasks/engine.rake
index 2152e811f5..eea8abe7d2 100644
--- a/railties/lib/rails/tasks/engine.rake
+++ b/railties/lib/rails/tasks/engine.rake
@@ -2,6 +2,7 @@ task "load_app" do
   namespace :app do
     load APP_RAKEFILE
   end
+  task :environment => "app:environment"
 
   if !defined?(ENGINE_PATH) || !ENGINE_PATH
     ENGINE_PATH = find_engine_path(APP_RAKEFILE)
-- 
cgit v1.2.3


From 40d1555091433d827e23e92e9f816e11a2db679b Mon Sep 17 00:00:00 2001
From: steve <steve@whilefalse.net>
Date: Tue, 18 Oct 2011 17:06:32 +0100
Subject: Added test for rake environment in an engine

---
 railties/test/railties/shared_tests.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index 21fde49ff7..7653e52d26 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -21,6 +21,23 @@ module RailtiesTest
       assert_match "alert()", last_response.body
     end
 
+    def test_rake_environment_can_be_called_in_the_engine_or_plugin
+      boot_rails
+
+      @plugin.write "Rakefile", <<-RUBY
+        APP_RAKEFILE = '#{app_path}/Rakefile'
+        load 'rails/tasks/engine.rake'
+        task :foo => :environment do
+          puts "Task ran"
+        end
+      RUBY
+
+      Dir.chdir(@plugin.path) do
+        output = `bundle exec rake foo`
+        assert_match "Task ran", output
+      end
+    end
+
     def test_copying_migrations
       @plugin.write "db/migrate/1_create_users.rb", <<-RUBY
         class CreateUsers < ActiveRecord::Migration
-- 
cgit v1.2.3


From 76af2818a6b729955ad799b5346da7ed115440ea Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 18 Oct 2011 10:07:40 -0700
Subject: use now() for dates in pg

---
 activerecord/test/cases/migration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 4b5dd18be8..6ce7ae7877 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -475,7 +475,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
         Person.connection.execute "insert into people (wealth, created_at, updated_at) values ('12345678901234567890.0123456789', 0, 0)"
       else
-        Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, 0, 0)"
+        Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, now(), now())"
       end
 
       # SELECT
-- 
cgit v1.2.3


From 7f184aaf4352140c7e3bd33761058bb05737e11b Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 18 Oct 2011 16:03:58 -0200
Subject: Use again Rack's ContentLength middleware

---
 railties/lib/rails/commands/server.rb     |  1 -
 railties/lib/rails/rack.rb                |  1 -
 railties/lib/rails/rack/content_length.rb | 38 -------------------------------
 3 files changed, 40 deletions(-)
 delete mode 100644 railties/lib/rails/rack/content_length.rb

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 23392276d5..71e3711ba1 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,7 +78,6 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
-      middlewares << [Rails::Rack::ContentLength]
       Hash.new(middlewares)
     end
 
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index d4a41b217e..d1ee96f7fd 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -1,6 +1,5 @@
 module Rails
   module Rack
-    autoload :ContentLength, "rails/rack/content_length"
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
diff --git a/railties/lib/rails/rack/content_length.rb b/railties/lib/rails/rack/content_length.rb
deleted file mode 100644
index 6839af4152..0000000000
--- a/railties/lib/rails/rack/content_length.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require 'action_dispatch'
-require 'rack/utils'
-
-module Rails
-  module Rack
-    # Sets the Content-Length header on responses with fixed-length bodies.
-    class ContentLength
-      include ::Rack::Utils
-
-      def initialize(app, sendfile=nil)
-        @app = app
-        @sendfile = sendfile
-      end
-
-      def call(env)
-        status, headers, body = @app.call(env)
-        headers = HeaderHash.new(headers)
-
-        if !STATUS_WITH_NO_ENTITY_BODY.include?(status.to_i) &&
-           !headers['Content-Length'] &&
-           !headers['Transfer-Encoding'] &&
-           !(@sendfile && headers[@sendfile])
-
-          old_body = body
-          body, length = [], 0
-          old_body.each do |part|
-            body << part
-            length += bytesize(part)
-          end
-          old_body.close if old_body.respond_to?(:close)
-          headers['Content-Length'] = length.to_s
-        end
-
-        [status, headers, body]
-      end
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3


From d44702c830669e2647c073133bd6b09d7016424d Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 18 Oct 2011 16:14:38 -0200
Subject: Use again Rack's ContentLength middleware part 2

---
 railties/lib/rails/commands/server.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 71e3711ba1..33f9ac017c 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,6 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
+      middlewares << [Rack::ContentLength]
       Hash.new(middlewares)
     end
 
-- 
cgit v1.2.3


From 6a28c512e358a95bbabd24af9d2b0608df787158 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 18 Oct 2011 11:12:18 -0700
Subject: reset prepared statement when schema changes imapact statement
 results. fixes #3335

---
 .../connection_adapters/postgresql_adapter.rb      | 54 +++++++++++++++++-----
 .../test/cases/adapters/postgresql/schema_test.rb  |  8 ++++
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index d859843260..b7f346e050 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -278,6 +278,11 @@ module ActiveRecord
           cache.clear
         end
 
+        def delete(sql_key)
+          dealloc cache[sql_key]
+          cache.delete sql_key
+        end
+
         private
         def cache
           @cache[$$]
@@ -1030,27 +1035,54 @@ module ActiveRecord
         end
 
       private
+        FEATURE_NOT_SUPPORTED = "0A000" # :nodoc:
+
         def exec_no_cache(sql, binds)
           @connection.async_exec(sql)
         end
 
         def exec_cache(sql, binds)
-          sql_key = "#{schema_search_path}-#{sql}"
+          begin
+            stmt_key = prepare_statement sql
+
+            # Clear the queue
+            @connection.get_last_result
+            @connection.send_query_prepared(stmt_key, binds.map { |col, val|
+              type_cast(val, col)
+            })
+            @connection.block
+            @connection.get_last_result
+          rescue PGError => e
+            # Get the PG code for the failure.  Annoyingly, the code for
+            # prepared statements whose return value may have changed is
+            # FEATURE_NOT_SUPPORTED.  Check here for more details:
+            # http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/backend/utils/cache/plancache.c#l573
+            code = e.result.result_error_field(PGresult::PG_DIAG_SQLSTATE)
+            if FEATURE_NOT_SUPPORTED == code
+              @statements.delete sql_key(sql)
+              retry
+            else
+              raise e
+            end
+          end
+        end
+
+        # Returns the statement identifier for the client side cache
+        # of statements
+        def sql_key(sql)
+          "#{schema_search_path}-#{sql}"
+        end
+
+        # Prepare the statement if it hasn't been prepared, return
+        # the statement key.
+        def prepare_statement(sql)
+          sql_key = sql_key(sql)
           unless @statements.key? sql_key
             nextkey = @statements.next_key
             @connection.prepare nextkey, sql
             @statements[sql_key] = nextkey
           end
-
-          key = @statements[sql_key]
-
-          # Clear the queue
-          @connection.get_last_result
-          @connection.send_query_prepared(key, binds.map { |col, val|
-            type_cast(val, col)
-          })
-          @connection.block
-          @connection.get_last_result
+          @statements[sql_key]
         end
 
         # The internal PostgreSQL identifier of the money data type.
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index b01eabc840..c8f8714f66 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -62,6 +62,14 @@ class SchemaTest < ActiveRecord::TestCase
     @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
 
+  def test_schema_change_with_prepared_stmt
+    @connection.exec_query "select * from developers where id = $1", 'sql', [[nil, 1]]
+    @connection.exec_query "alter table developers add column zomg int", 'sql', []
+    @connection.exec_query "select * from developers where id = $1", 'sql', [[nil, 1]]
+  ensure
+    @connection.exec_query "alter table developers drop column if exists zomg", 'sql', []
+  end
+
   def test_table_exists?
     [Thing1, Thing2, Thing3, Thing4].each do |klass|
       name = klass.table_name
-- 
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(-)

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 c2f3c9bf56534f8f50b4e47a7e18e822f6600bbe Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 18 Oct 2011 13:30:01 -0700
Subject: only use now() on pg!

---
 activerecord/test/cases/migration_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 6ce7ae7877..b3f1785f44 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -474,8 +474,10 @@ if ActiveRecord::Base.connection.supports_migrations?
         Person.connection.execute "insert into people (id, wealth, created_at, updated_at) values (people_seq.nextval, 12345678901234567890.0123456789, 0, 0)"
       elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
         Person.connection.execute "insert into people (wealth, created_at, updated_at) values ('12345678901234567890.0123456789', 0, 0)"
-      else
+      elsif current_adapter?(:PostgreSQLAdapter)
         Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, now(), now())"
+      else
+        Person.connection.execute "insert into people (wealth, created_at, updated_at) values (12345678901234567890.0123456789, 0, 0)"
       end
 
       # SELECT
-- 
cgit v1.2.3


From 044e6ac245c24b91f7f815e2155bb7ac030ce831 Mon Sep 17 00:00:00 2001
From: Andy Lindeman <alindeman@gmail.com>
Date: Tue, 18 Oct 2011 23:45:56 -0300
Subject: Fixes the defaults for config.cache_classes

---
 railties/guides/source/configuring.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index baf944cf8d..58b92e7f9e 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -64,7 +64,7 @@ NOTE. The +config.asset_path+ configuration is ignored if the asset pipeline is
 
 * +config.autoload_paths+ accepts an array of paths from which Rails will autoload constants. Default is all directories under +app+.
 
-* +config.cache_classes+ controls whether or not application classes and modules should be reloaded on each request. Defaults to true in development mode, and false in test and production modes. Can also be enabled with +threadsafe!+.
+* +config.cache_classes+ controls whether or not application classes and modules should be reloaded on each request. Defaults to false in development mode, and true in test and production modes. Can also be enabled with +threadsafe!+.
 
 * +config.action_view.cache_template_loading+ controls whether or not templates should be reloaded on each request. Defaults to whatever is set for +config.cache_classes+.
 
-- 
cgit v1.2.3


From 3a746f7c48936bac1c08dcf229c7c8fc74fdfc13 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Wed, 19 Oct 2011 12:31:06 -0500
Subject: Use toplevel Rack::ContentLength

---
 railties/lib/rails/commands/server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 33f9ac017c..20484a10c8 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -78,7 +78,7 @@ module Rails
       middlewares = []
       middlewares << [Rails::Rack::LogTailer, log_path] unless options[:daemonize]
       middlewares << [Rails::Rack::Debugger]  if options[:debugger]
-      middlewares << [Rack::ContentLength]
+      middlewares << [::Rack::ContentLength]
       Hash.new(middlewares)
     end
 
-- 
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 +++++++++++++++++++
 activesupport/CHANGELOG                            |  7 +++
 activesupport/lib/active_support.rb                |  1 +
 activesupport/lib/active_support/tagged_logging.rb | 68 ++++++++++++++++++++++
 activesupport/test/tagged_logging_test.rb          | 34 +++++++++++
 railties/CHANGELOG                                 |  2 +
 .../config/environments/production.rb              |  3 +
 railties/lib/rails/application.rb                  |  2 +
 railties/lib/rails/application/bootstrap.rb        |  4 +-
 railties/lib/rails/application/configuration.rb    |  2 +-
 railties/lib/rails/rack.rb                         |  1 +
 railties/lib/rails/rack/logger.rb                  |  4 +-
 railties/lib/rails/rack/tagged_logging.rb          | 39 +++++++++++++
 17 files changed, 272 insertions(+), 5 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/request_id.rb
 create mode 100644 actionpack/test/dispatch/request_id_test.rb
 create mode 100644 activesupport/lib/active_support/tagged_logging.rb
 create mode 100644 activesupport/test/tagged_logging_test.rb
 create mode 100644 railties/lib/rails/rack/tagged_logging.rb

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
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 63f406cd9f..d3a838cff0 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,12 @@
 *Rails 3.2.0 (unreleased)*
 
+* Added ActiveSupport:TaggedLogging that can wrap any standard Logger class to provide tagging capabilities [DHH]
+
+    Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+    Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
+    Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
+    Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
+  
 * Added safe_constantize that constantizes a string but returns nil instead of an exception if the constant (or part of it) does not exist [Ryan Oblak]
 
 * ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! [Prem Sichanugrist]
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index cc9ea5cffa..ff78e718f2 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -71,6 +71,7 @@ module ActiveSupport
     autoload :OrderedOptions
     autoload :Rescuable
     autoload :StringInquirer
+    autoload :TaggedLogging
     autoload :XmlMini
   end
 
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
new file mode 100644
index 0000000000..0d8504bc1f
--- /dev/null
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -0,0 +1,68 @@
+module ActiveSupport
+  # Wraps any standard Logger class to provide tagging capabilities. Examples:
+  #
+  #   Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+  #   Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
+  #   Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
+  #   Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
+  #
+  # This is used by the default Rails.logger as configured by Railties to make it easy to stamp log lines
+  # with subdomains, request ids, and anything else to aid debugging of multi-user production applications.
+  class TaggedLogging
+    def initialize(logger)
+      @logger = logger
+      @tags   = []
+    end
+
+    def tagged(*tags)
+      new_tags = Array.wrap(tags).flatten
+      @tags += new_tags
+      yield
+    ensure
+      new_tags.size.times { @tags.pop }
+    end
+
+
+    def add(severity, message = nil, progname = nil, &block)
+      @logger.add(severity, "#{tags}#{message}", progname, &block)
+    end
+
+
+    def fatal(progname = nil, &block)
+      add(@logger.class::FATAL, progname, &block)
+    end
+
+    def error(progname = nil, &block)
+      add(@logger.class::ERROR, progname, &block)
+    end
+
+    def warn(progname = nil, &block)
+      add(@logger.class::WARN, progname, &block)
+    end
+
+    def info(progname = nil, &block)
+      add(@logger.class::INFO, progname, &block)
+    end
+
+    def debug(progname = nil, &block)
+      add(@logger.class::DEBUG, progname, &block)
+    end
+
+    def unknown(progname = nil, &block)
+      add(@logger.class::UNKNOWN, progname, &block)
+    end
+
+
+    def method_missing(method, *args)
+      @logger.send(method, *args)
+    end
+    
+
+    private
+      def tags
+        if @tags.any?
+          @tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
+        end
+      end
+  end
+end
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
new file mode 100644
index 0000000000..a1504c6ce4
--- /dev/null
+++ b/activesupport/test/tagged_logging_test.rb
@@ -0,0 +1,34 @@
+require 'abstract_unit'
+require 'active_support/core_ext/logger'
+require 'active_support/tagged_logging'
+
+class TaggedLoggingTest < ActiveSupport::TestCase
+  setup do
+    @output = StringIO.new
+    @logger = ActiveSupport::TaggedLogging.new(Logger.new(@output))
+  end
+
+  test "tagged once" do
+    @logger.tagged("BCX") { @logger.info "Funky time" }
+    assert_equal "[BCX] Funky time\n", @output.string
+  end
+  
+  test "tagged twice" do
+    @logger.tagged("BCX") { @logger.tagged("Jason") { @logger.info "Funky time" } }
+    assert_equal "[BCX] [Jason] Funky time\n", @output.string
+  end
+
+  test "tagged thrice at once" do
+    @logger.tagged("BCX", "Jason", "New") { @logger.info "Funky time" }
+    assert_equal "[BCX] [Jason] [New] Funky time\n", @output.string
+  end
+
+  test "mixed levels of tagging" do
+    @logger.tagged("BCX") do
+      @logger.tagged("Jason") { @logger.info "Funky time" }
+      @logger.info "Junky time!"
+    end
+
+    assert_equal "[BCX] [Jason] Funky time\n[BCX] Junky time!\n", @output.string
+  end
+end
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 187dd2428f..181019f851 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.2.0 (unreleased)*
 
+* Added Rails::Rack::TaggedLogging middleware by default that will apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications [DHH]
+
 * Default options to `rails new` can be set in ~/.railsrc [Guillermo Iguaran]
 
 * Added destroy alias to Rails engines. [Guillermo Iguaran]
diff --git a/railties/guides/code/getting_started/config/environments/production.rb b/railties/guides/code/getting_started/config/environments/production.rb
index 6ab63d30a6..4618191d6b 100644
--- a/railties/guides/code/getting_started/config/environments/production.rb
+++ b/railties/guides/code/getting_started/config/environments/production.rb
@@ -33,6 +33,9 @@ Blog::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
   # config.logger = SyslogLogger.new
 
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index cbb2d23238..a097cfd1be 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -164,6 +164,8 @@ module Rails
         middleware.use ::Rack::Lock unless config.allow_concurrency
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
+        middleware.use ::ActionDispatch::RequestId
+        middleware.use ::Rails::Rack::TaggedLogging, config.log_tags
         middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
diff --git a/railties/lib/rails/application/bootstrap.rb b/railties/lib/rails/application/bootstrap.rb
index 0aff05b681..c2cb121e42 100644
--- a/railties/lib/rails/application/bootstrap.rb
+++ b/railties/lib/rails/application/bootstrap.rb
@@ -24,12 +24,12 @@ module Rails
       initializer :initialize_logger, :group => :all do
         Rails.logger ||= config.logger || begin
           path = config.paths["log"].first
-          logger = ActiveSupport::BufferedLogger.new(path)
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(path))
           logger.level = ActiveSupport::BufferedLogger.const_get(config.log_level.to_s.upcase)
           logger.auto_flushing = false if Rails.env.production?
           logger
         rescue StandardError
-          logger = ActiveSupport::BufferedLogger.new(STDERR)
+          logger = ActiveSupport::TaggedLogging.new(ActiveSupport::BufferedLogger.new(STDERR))
           logger.level = ActiveSupport::BufferedLogger::WARN
           logger.warn(
             "Rails Error: Unable to access log file. Please ensure that #{path} exists and is chmod 0666. " +
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 448521d2f0..8f5b28faf8 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -8,7 +8,7 @@ module Rails
       attr_accessor :allow_concurrency, :asset_host, :asset_path, :assets,
                     :cache_classes, :cache_store, :consider_all_requests_local,
                     :dependency_loading, :filter_parameters,
-                    :force_ssl, :helpers_paths, :logger, :preload_frameworks,
+                    :force_ssl, :helpers_paths, :logger, :log_tags, :preload_frameworks,
                     :reload_plugins, :secret_token, :serve_static_assets,
                     :ssl_options, :static_cache_control, :session_options, 
                     :time_zone, :whiny_nils
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index d1ee96f7fd..b78293e570 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -3,5 +3,6 @@ module Rails
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
+    autoload :TaggedLogging, "rails/rack/tagged_logging"
   end
 end
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 3be262de08..4d388c4d10 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -21,8 +21,8 @@ module Rails
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
 
-        info "\n\nStarted #{request.request_method} \"#{path}\" " \
-             "for #{request.ip} at #{Time.now.to_default_s}"
+        info "\n\n"
+        info "Started #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
       end
 
       def after_dispatch(env)
diff --git a/railties/lib/rails/rack/tagged_logging.rb b/railties/lib/rails/rack/tagged_logging.rb
new file mode 100644
index 0000000000..7980319b37
--- /dev/null
+++ b/railties/lib/rails/rack/tagged_logging.rb
@@ -0,0 +1,39 @@
+module Rails
+  module Rack
+    # Enables easy tagging of any logging activity that occurs within the Rails request cycle. The tags are configured via the
+    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or the symbols :uuid or :subdomain.
+    # The latter two are then automatically expanded to request.uuid and request.subdaomins.first -- the two most common tags
+    # desired in production logs.
+    class TaggedLogging
+      def initialize(app, tags = nil)
+        @app, @tags = app, tags
+      end
+
+      def call(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { @app.call(env) }
+        else
+          @app.call(env)
+        end
+      end
+      
+      private
+        def compute_tags(env)
+          request = ActionDispatch::Request.new(env)
+
+          @tags.collect do |tag|
+            case tag
+            when Proc
+              tag.call(request)
+            when :uuid
+              request.uuid
+            when :subdomain
+              request.subdomains.first
+            else
+              tag
+            end
+          end
+        end
+    end
+  end
+end
-- 
cgit v1.2.3


From 4a4927f753d7f41c0903ab3adfb73be8490c382e Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 13:24:28 -0500
Subject: Simplify TaggedLogging symbol shortcuts (thanks Jose!)

---
 railties/lib/rails/rack/tagged_logging.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails/rack/tagged_logging.rb b/railties/lib/rails/rack/tagged_logging.rb
index 7980319b37..c519d7c3e6 100644
--- a/railties/lib/rails/rack/tagged_logging.rb
+++ b/railties/lib/rails/rack/tagged_logging.rb
@@ -1,9 +1,8 @@
 module Rails
   module Rack
     # Enables easy tagging of any logging activity that occurs within the Rails request cycle. The tags are configured via the
-    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or the symbols :uuid or :subdomain.
-    # The latter two are then automatically expanded to request.uuid and request.subdaomins.first -- the two most common tags
-    # desired in production logs.
+    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or symbols representing method
+    # names on request (so :uuid will result in request.uuid being added as a tag).
     class TaggedLogging
       def initialize(app, tags = nil)
         @app, @tags = app, tags
@@ -25,10 +24,8 @@ module Rails
             case tag
             when Proc
               tag.call(request)
-            when :uuid
-              request.uuid
-            when :subdomain
-              request.subdomains.first
+            when Symbol
+              request.send(tag)
             else
               tag
             end
-- 
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(-)

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(+)

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 c9ca86c29d4f4d8e1181c20ac0da8e1027a14344 Mon Sep 17 00:00:00 2001
From: Martin Svalin <martin@lite.nu>
Date: Wed, 19 Oct 2011 18:47:28 +0200
Subject: New #added? method on ActiveModel::Errors

The #added? method makes it possible to check if a specific error has been added, using the same parameters as for #add.
---
 activemodel/CHANGELOG                  |  2 ++
 activemodel/lib/active_model/errors.rb | 30 ++++++++++++++++++------
 activemodel/test/cases/errors_test.rb  | 43 ++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 3d26d646b0..bf077bef35 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -1,3 +1,5 @@
+* Added ActiveModel::Errors#added? to check if a specific error has been added [Martin Svalin]
+
 * Add ability to define strict validation(with :strict => true option) that always raises exception when fails [Bogdan Gusiev]
 
 * Deprecate "Model.model_name.partial_path" in favor of "model.to_partial_path" [Grant Hutchins, Peter Jaros]
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index f90030641d..6aa0d2a16f 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -213,13 +213,7 @@ module ActiveModel
     # If +message+ is a symbol, it will be translated using the appropriate scope (see +translate_error+).
     # If +message+ is a proc, it will be called, allowing for things like <tt>Time.now</tt> to be used within an error.
     def add(attribute, message = nil, options = {})
-      message ||= :invalid
-
-      if message.is_a?(Symbol)
-        message = generate_message(attribute, message, options.except(*CALLBACKS_OPTIONS))
-      elsif message.is_a?(Proc)
-        message = message.call
-      end
+      message = normalize_message(attribute, message, options)
       if options[:strict]
         raise ActiveModel::StrictValidationFailed,  message
       end
@@ -244,6 +238,15 @@ module ActiveModel
       end
     end
 
+    # Returns true if an error on the attribute with the given message is present, false otherwise.
+    # +message+ is treated the same as for +add+.
+    #   p.errors.add :name, :blank
+    #   p.errors.added? :name, :blank # => true
+    def added?(attribute, message = nil, options = {})
+      message = normalize_message(attribute, message, options)
+      self[attribute].include? message
+    end
+
     # Returns all the full error messages in an array.
     #
     #   class Company
@@ -329,6 +332,19 @@ module ActiveModel
 
       I18n.translate(key, options)
     end
+
+  private
+    def normalize_message(attribute, message, options)
+      message ||= :invalid
+
+      if message.is_a?(Symbol)
+        generate_message(attribute, message, options.except(*CALLBACKS_OPTIONS))
+      elsif message.is_a?(Proc)
+        message.call
+      else
+        message
+      end
+    end
   end
 
   class StrictValidationFailed < StandardError
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 784a2b2709..8ddedb160a 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -80,6 +80,49 @@ class ErrorsTest < ActiveModel::TestCase
     assert_equal ["can not be blank"], person.errors[:name]
   end
 
+  test "added? should be true if that error was added" do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    assert person.errors.added?(:name, "can not be blank")
+  end
+
+  test "added? should handle when message is a symbol" do
+    person = Person.new
+    person.errors.add(:name, :blank)
+    assert person.errors.added?(:name, :blank)
+  end
+
+  test "added? should handle when message is a proc" do
+    person = Person.new
+    message = Proc.new { "can not be blank" }
+    person.errors.add(:name, message)
+    assert person.errors.added?(:name, message)
+  end
+
+  test "added? should default message to :invalid" do
+    person = Person.new
+    person.errors.add(:name, :invalid)
+    assert person.errors.added?(:name)
+  end
+
+  test "added? should be true when several errors are present, and we ask for one of them" do
+    person = Person.new
+    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "is invalid")
+    assert person.errors.added?(:name, "can not be blank")
+  end
+
+  test "added? should be false if no errors are present" do
+    person = Person.new
+    assert !person.errors.added?(:name)
+  end
+
+  test "added? should be false when an error is present, but we check for another error" do
+    person = Person.new
+    person.errors.add(:name, "is invalid")
+    assert !person.errors.added?(:name, "can not be blank")
+  end
+
   test 'should respond to size' do
     person = Person.new
     person.errors.add(:name, "can not be blank")
-- 
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(-)

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 18dbfcb36369ebb800a22325f689ff4cf27ef467 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 14:53:34 -0500
Subject: Programatically define the log level methods and use the Logger
 constants instead (SyslogLogger didnt define them as I expected)

---
 activesupport/lib/active_support/tagged_logging.rb | 31 ++++++----------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 0d8504bc1f..0cabb528ef 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,3 +1,5 @@
+require 'logger'
+
 module ActiveSupport
   # Wraps any standard Logger class to provide tagging capabilities. Examples:
   #
@@ -27,29 +29,12 @@ module ActiveSupport
       @logger.add(severity, "#{tags}#{message}", progname, &block)
     end
 
-
-    def fatal(progname = nil, &block)
-      add(@logger.class::FATAL, progname, &block)
-    end
-
-    def error(progname = nil, &block)
-      add(@logger.class::ERROR, progname, &block)
-    end
-
-    def warn(progname = nil, &block)
-      add(@logger.class::WARN, progname, &block)
-    end
-
-    def info(progname = nil, &block)
-      add(@logger.class::INFO, progname, &block)
-    end
-
-    def debug(progname = nil, &block)
-      add(@logger.class::DEBUG, progname, &block)
-    end
-
-    def unknown(progname = nil, &block)
-      add(@logger.class::UNKNOWN, progname, &block)
+    %w( fatal error warn info debug unkown ).each do |severity|
+      eval <<-EOM, nil, __FILE__, __LINE__ + 1
+        def #{severity}(progname = nil, &block)
+          add(Logger::#{severity.upcase}, progname, &block)
+        end
+      EOM
     end
 
 
-- 
cgit v1.2.3


From 5bc23e4fb503e038c8e24a3a58d4eb1c323e94c8 Mon Sep 17 00:00:00 2001
From: Yasuo Honda <yasuo.honda@gmail.com>
Date: Wed, 19 Oct 2011 15:56:25 -0400
Subject: Fix ORA-00932 error when trying to insert 0 to DATE type columns.

---
 activerecord/test/cases/migration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index b3f1785f44..47ab5d5f9d 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -471,7 +471,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       # Do a manual insertion
       if current_adapter?(:OracleAdapter)
-        Person.connection.execute "insert into people (id, wealth, created_at, updated_at) values (people_seq.nextval, 12345678901234567890.0123456789, 0, 0)"
+        Person.connection.execute "insert into people (id, wealth, created_at, updated_at) values (people_seq.nextval, 12345678901234567890.0123456789, sysdate, sysdate)"
       elsif current_adapter?(:OpenBaseAdapter) || (current_adapter?(:MysqlAdapter) && Mysql.client_version < 50003) #before mysql 5.0.3 decimals stored as strings
         Person.connection.execute "insert into people (wealth, created_at, updated_at) values ('12345678901234567890.0123456789', 0, 0)"
       elsif current_adapter?(:PostgreSQLAdapter)
-- 
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(-)

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(-)

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 6c126015a676c376f1646713fbb739049a783238 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:26:56 +0200
Subject: Ensure TaggegLogging is thread safe.

---
 activesupport/lib/active_support/tagged_logging.rb | 35 ++++++++++++++--------
 activesupport/test/tagged_logging_test.rb          | 30 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 0cabb528ef..aff416a9eb 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -13,20 +13,20 @@ module ActiveSupport
   class TaggedLogging
     def initialize(logger)
       @logger = logger
-      @tags   = []
+      @tags   = Hash.new { |h,k| h[k] = [] }
     end
 
-    def tagged(*tags)
-      new_tags = Array.wrap(tags).flatten
-      @tags += new_tags
+    def tagged(*new_tags)
+      tags     = current_tags
+      new_tags = Array.wrap(new_tags).flatten
+      tags.concat new_tags
       yield
     ensure
-      new_tags.size.times { @tags.pop }
+      new_tags.size.times { tags.pop }
     end
 
-
     def add(severity, message = nil, progname = nil, &block)
-      @logger.add(severity, "#{tags}#{message}", progname, &block)
+      @logger.add(severity, "#{tags_text}#{message}", progname, &block)
     end
 
     %w( fatal error warn info debug unkown ).each do |severity|
@@ -37,17 +37,26 @@ module ActiveSupport
       EOM
     end
 
+    def flush(*args)
+      @tags.delete(Thread.current)
+      @logger.flush(*args) if @logger.respond_to?(:flush)
+    end
 
     def method_missing(method, *args)
       @logger.send(method, *args)
     end
-    
 
-    private
-      def tags
-        if @tags.any?
-          @tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
-        end
+    protected
+
+    def tags_text
+      tags = current_tags
+      if tags.any?
+        tags.collect { |tag| "[#{tag}]" }.join(" ") + " "
       end
+    end
+
+    def current_tags
+      @tags[Thread.current]
+    end
   end
 end
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index a1504c6ce4..b12b12f32c 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -3,9 +3,15 @@ require 'active_support/core_ext/logger'
 require 'active_support/tagged_logging'
 
 class TaggedLoggingTest < ActiveSupport::TestCase
+  class MyLogger < ::Logger
+    def flush(*)
+      info "[FLUSHED]"
+    end
+  end
+
   setup do
     @output = StringIO.new
-    @logger = ActiveSupport::TaggedLogging.new(Logger.new(@output))
+    @logger = ActiveSupport::TaggedLogging.new(MyLogger.new(@output))
   end
 
   test "tagged once" do
@@ -23,6 +29,28 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     assert_equal "[BCX] [Jason] [New] Funky time\n", @output.string
   end
 
+  test "keeps each tag in their own thread" do
+    @logger.tagged("BCX") do
+      Thread.new do
+        @logger.tagged("OMG") { @logger.info "Cool story bro" }
+      end.join
+      @logger.info "Funky time"
+    end
+    assert_equal "[OMG] Cool story bro\n[BCX] Funky time\n", @output.string
+  end
+
+  test "cleans up the taggings on flush" do
+    @logger.tagged("BCX") do
+      Thread.new do
+        @logger.tagged("OMG") do
+          @logger.flush
+          @logger.info "Cool story bro"
+        end
+      end.join
+    end
+    assert_equal "[FLUSHED]\nCool story bro\n", @output.string
+  end
+
   test "mixed levels of tagging" do
     @logger.tagged("BCX") do
       @logger.tagged("Jason") { @logger.info "Funky time" }
-- 
cgit v1.2.3


From c83d9a11c00bc13e1f8f0fa0e8fb6185cacd5fc9 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:39:11 +0200
Subject: Unify logger and taggedlogging middleware as both address logging
 concerns.

---
 railties/CHANGELOG                        |  2 +-
 railties/lib/rails/application.rb         |  3 +--
 railties/lib/rails/rack.rb                |  1 -
 railties/lib/rails/rack/logger.rb         | 38 +++++++++++++++++++++----------
 railties/lib/rails/rack/tagged_logging.rb | 36 -----------------------------
 5 files changed, 28 insertions(+), 52 deletions(-)
 delete mode 100644 railties/lib/rails/rack/tagged_logging.rb

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 181019f851..7f7b24804d 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,6 +1,6 @@
 *Rails 3.2.0 (unreleased)*
 
-* Added Rails::Rack::TaggedLogging middleware by default that will apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications [DHH]
+* Updated Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications [DHH]
 
 * Default options to `rails new` can be set in ~/.railsrc [Guillermo Iguaran]
 
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index a097cfd1be..82fffe86bb 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -165,8 +165,7 @@ module Rails
         middleware.use ::Rack::Runtime
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::RequestId
-        middleware.use ::Rails::Rack::TaggedLogging, config.log_tags
-        middleware.use ::Rails::Rack::Logger # must come after Rack::MethodOverride to properly log overridden methods
+        middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
         middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         if config.action_dispatch.x_sendfile_header.present?
diff --git a/railties/lib/rails/rack.rb b/railties/lib/rails/rack.rb
index b78293e570..d1ee96f7fd 100644
--- a/railties/lib/rails/rack.rb
+++ b/railties/lib/rails/rack.rb
@@ -3,6 +3,5 @@ module Rails
     autoload :Debugger,      "rails/rack/debugger"
     autoload :Logger,        "rails/rack/logger"
     autoload :LogTailer,     "rails/rack/log_tailer"
-    autoload :TaggedLogging, "rails/rack/tagged_logging"
   end
 end
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 4d388c4d10..89de10c83d 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -1,32 +1,46 @@
 require 'active_support/core_ext/time/conversions'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
     class Logger < ActiveSupport::LogSubscriber
-      def initialize(app)
-        @app = app
+      def initialize(app, tags=nil)
+        @app, @tags = app, tags.presence
       end
 
       def call(env)
-        before_dispatch(env)
-        @app.call(env)
-      ensure
-        after_dispatch(env)
+        if @tags
+          Rails.logger.tagged(compute_tags(env)) { call_app(env) }
+        else
+          call_app(env)
+        end
       end
 
     protected
 
-      def before_dispatch(env)
+      def call_app(env)
         request = ActionDispatch::Request.new(env)
         path = request.filtered_path
-
-        info "\n\n"
-        info "Started #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        Rails.logger.info "\n\nStarted #{request.request_method} \"#{path}\" for #{request.ip} at #{Time.now.to_default_s}"
+        @app.call(env)
+      ensure
+        ActiveSupport::LogSubscriber.flush_all!
       end
 
-      def after_dispatch(env)
-        ActiveSupport::LogSubscriber.flush_all!
+      def compute_tags(env)
+        request = ActionDispatch::Request.new(env)
+
+        @tags.collect do |tag|
+          case tag
+          when Proc
+            tag.call(request)
+          when Symbol
+            request.send(tag)
+          else
+            tag
+          end
+        end
       end
     end
   end
diff --git a/railties/lib/rails/rack/tagged_logging.rb b/railties/lib/rails/rack/tagged_logging.rb
deleted file mode 100644
index c519d7c3e6..0000000000
--- a/railties/lib/rails/rack/tagged_logging.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-module Rails
-  module Rack
-    # Enables easy tagging of any logging activity that occurs within the Rails request cycle. The tags are configured via the
-    # config.log_tags setting. The tags can either be strings, procs taking a request argument, or symbols representing method
-    # names on request (so :uuid will result in request.uuid being added as a tag).
-    class TaggedLogging
-      def initialize(app, tags = nil)
-        @app, @tags = app, tags
-      end
-
-      def call(env)
-        if @tags
-          Rails.logger.tagged(compute_tags(env)) { @app.call(env) }
-        else
-          @app.call(env)
-        end
-      end
-      
-      private
-        def compute_tags(env)
-          request = ActionDispatch::Request.new(env)
-
-          @tags.collect do |tag|
-            case tag
-            when Proc
-              tag.call(request)
-            when Symbol
-              request.send(tag)
-            else
-              tag
-            end
-          end
-        end
-    end
-  end
-end
-- 
cgit v1.2.3


From 930dc335d7067b17191257faf03fcecba3351caa Mon Sep 17 00:00:00 2001
From: Martin Svalin <martin@lite.nu>
Date: Wed, 19 Oct 2011 23:06:08 +0200
Subject: Removed mention of deprecated ActiveModel::Errors#on

---
 activemodel/lib/active_model/errors.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index d91e4a2b6a..6db3ca7340 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -205,9 +205,8 @@ module ActiveModel
       messages.dup
     end
 
-    # Adds +message+ to the error messages on +attribute+, which will be returned on a call to
-    # <tt>on(attribute)</tt> for the same attribute. More than one error can be added to the same
-    # +attribute+ in which case an array will be returned on a call to <tt>on(attribute)</tt>.
+    # Adds +message+ to the error messages on +attribute+. More than one error can be added to the same
+    # +attribute+.
     # If no +message+ is supplied, <tt>:invalid</tt> is assumed.
     #
     # If +message+ is a symbol, it will be translated using the appropriate scope (see +translate_error+).
-- 
cgit v1.2.3


From 1359152345e84b951becf687ab6f26e30a9af3ce Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 16:16:44 -0500
Subject: Encourage use of tagged logging even when using a different logger

---
 railties/guides/code/getting_started/config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/code/getting_started/config/environments/production.rb b/railties/guides/code/getting_started/config/environments/production.rb
index 4618191d6b..dee8acfdfe 100644
--- a/railties/guides/code/getting_started/config/environments/production.rb
+++ b/railties/guides/code/getting_started/config/environments/production.rb
@@ -37,7 +37,7 @@ Blog::Application.configure do
   # config.log_tags = [ :subdomain, :uuid ]
 
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
-- 
cgit v1.2.3


From be27bf17e309fcb43fab45cfa1d31cea074a6a72 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 19 Oct 2011 16:24:00 -0500
Subject: Fix the proper production.rb

---
 .../rails/app/templates/config/environments/production.rb.tt         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
index 64e2c09467..50f2df3d35 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
@@ -33,8 +33,11 @@
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
-- 
cgit v1.2.3


From 9694ca1a3bd070886802a6b9f7532adfe5b60cc4 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 19 Oct 2011 18:26:19 +1100
Subject: [engines guide] mention that we cover similar ground to the Getting
 Started Guide

---
 railties/guides/source/engines.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 6e27d823a7..73bbe486e5 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -98,7 +98,7 @@ Also in the test directory is the +test/integration+ directory, where integratio
 
 h3. Providing engine functionality
 
-The engine that this guide covers will provide posting and commenting functionality.
+The engine that this guide covers will provide posting and commenting functionality and follows a similar thread to the "Getting Started Guide":getting-started.html, with some new twists.
 
 h4. Generating a post resource
 
-- 
cgit v1.2.3


From 8ede74e73a45b16a81064a175b3174848469498b Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Thu, 20 Oct 2011 08:46:20 +1100
Subject: [engines guide] Rather than calling name, require a to_s method to be
 defined on the 'User' class

---
 railties/guides/source/engines.textile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 73bbe486e5..02054c972a 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -476,11 +476,26 @@ Finally, the author's name should be displayed on the post's page. Add this code
 <erb>
 <p>
   <b>Author:</b>
-  <%= @post.author.name %>
+  <%= @post.author %>
 </p>
 </erb>
 
-NOTE: For posts created previously, this will break the +show+ page for them. We recommend deleting these posts and starting again, or manually assigning an author using +rails c+. 
+WARNING: For posts created previously, this will break the +show+ page for them. We recommend deleting these posts and starting again, or manually assigning an author using +rails c+.
+
+By outputting +@post.author+ using the +<%=+ tag the +to_s+ method will be called on the object. By default, this will look quite ugly:
+
+<text>
+#<User:0x00000100ccb3b0>
+</text>
+
+This is undesirable and it would be much better to have the user's name there. To do this, add a +to_s+ method to the +User+ class within the application:
+
+<ruby>
+def to_s
+  name
+</ruby>
+
+Now instead of the ugly Ruby object output the author's name will be displayed.
 
 h4. Configuring an engine
 
-- 
cgit v1.2.3


From 1cc6105d4dd088e3f2b8026e7e49f4e9d8d7d6ea Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Thu, 20 Oct 2011 08:46:41 +1100
Subject: [engines guide] wrap up 'Configuring an Engine' section

---
 railties/guides/source/engines.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 02054c972a..f0d8f1a165 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -531,7 +531,9 @@ Blorgh.user_class = "User"
 
 WARNING: It's very important here to use the +String+ version of the class, rather than the class itself. If you were to use the class, Rails would attempt to load that class and then reference the related table, which could lead to problems if the table wasn't already existing. Therefore, a +String+ should be used and then converted to a class using +constantize+ in the engine later on.
 
+Go ahead and try to create a new post. You will see that it works exactly in the same way as before, except this time the engine is using the configuration setting in +config/initializers/blorgh.rb+ to learn what the class is.
 
+There are now no strict dependencies on what the class is, only what the class's API must be. The engine simply requires this class to define a +find_or_create_by_name+ method which returns an object of that class to be associated with a post when it's created.
 
 h3. Overriding engine functionality
 
-- 
cgit v1.2.3


From 4e9729df3f03ee16445082b7d386ee14b4370461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 20 Oct 2011 00:38:20 +0200
Subject: Don't use :path in Gemfile for --dev except for Rails.

---
 railties/lib/rails/generators/app_base.rb                | 2 +-
 railties/lib/rails/generators/rails/app/app_generator.rb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 134d86fab0..40961f0c3e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -138,7 +138,7 @@ module Rails
         if options.dev?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
-            gem 'journey',   :path => '#{Rails::Generators::JOURNEY_DEV_PATH}'
+            gem 'journey',   :git => 'git://github.com/rails/journey.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
index c8648d19f8..3e32f758a4 100644
--- a/railties/lib/rails/generators/rails/app/app_generator.rb
+++ b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -144,8 +144,6 @@ module Rails
     # We need to store the RAILS_DEV_PATH in a constant, otherwise the path
     # can change in Ruby 1.8.7 when we FileUtils.cd.
     RAILS_DEV_PATH = File.expand_path("../../../../../..", File.dirname(__FILE__))
-    JOURNEY_DEV_PATH = File.expand_path("../../../../../../../journey", File.dirname(__FILE__))
-
     RESERVED_NAMES = %w[application destroy benchmarker profiler plugin runner test]
 
     class AppGenerator < AppBase
-- 
cgit v1.2.3


From 3e2d35b05006099163f6492019536bbfa1d82509 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Thu, 20 Oct 2011 17:10:46 +1100
Subject: [engines guide] add missing end for to_s method

---
 railties/guides/source/engines.textile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index f0d8f1a165..5a12896b8e 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -493,6 +493,7 @@ This is undesirable and it would be much better to have the user's name there. T
 <ruby>
 def to_s
   name
+end
 </ruby>
 
 Now instead of the ugly Ruby object output the author's name will be displayed.
-- 
cgit v1.2.3


From 13e6f0cea83b2699e76b4f21ff87b267514d18d6 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Thu, 20 Oct 2011 17:32:34 +1100
Subject: [engines guide] some fixes for the author id migration including
 proof of not copying over other migrations again

---
 railties/guides/source/engines.textile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 5a12896b8e..0688dc4c99 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -450,10 +450,10 @@ By defining that the +author+ association's object is represented by the +User+
 To generate this new column, run this command within the engine:
 
 <shell>
-$ rails g migration add_author_to_blorgh_posts author:references 
+$ rails g migration add_author_id_to_blorgh_posts author_id:integer 
 </shell>
 
-NOTE: Due to the migration's name, Rails will automatically know that you want to add a column to a specific table and write that into the migration for you. You don't need to tell it any more than this.
+NOTE: Due to the migration's name and the column specification after it, Rails will automatically know that you want to add a column to a specific table and write that into the migration for you. You don't need to tell it any more than this.
 
 This migration will need to be run on the application. To do that, it must first be copied using this command:
 
@@ -461,9 +461,15 @@ This migration will need to be run on the application. To do that, it must first
 $ rake blorgh:install:migrations
 </shell>
 
-NOTE: Notice here that only _one_ migration was copied over here. This is because the first two migrations were copied over the first time this command was run.
+Notice here that only _one_ migration was copied over here. This is because the first two migrations were copied over the first time this command was run.
 
-And then migrated using this command:
+<shell>
+  NOTE: Migration [timestamp]_create_blorgh_posts.rb from blorgh has been skipped. Migration with the same name already exists.
+  NOTE: Migration [timestamp]_create_blorgh_comments.rb from blorgh has been skipped. Migration with the same name already exists.
+  Copied migration [timestamp]_add_author_id_to_blorgh_posts.rb from blorgh
+</shell>
+
+Run this migration using this command:
 
 <shell>
 $ rake db:migrate
-- 
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(-)

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 5c5d5b3d2510d20998eafdd87a4458e0406e1690 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 20 Oct 2011 12:59:27 +0530
Subject: Adding ActionDispatch::RequestId in middleware test

---
 railties/test/application/middleware_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 093cb6ca2a..4703a59326 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -30,6 +30,7 @@ module ApplicationTests
         "ActiveSupport::Cache::Strategy::LocalCache",
         "Rack::Runtime",
         "Rack::MethodOverride",
+        "ActionDispatch::RequestId",
         "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
         "ActionDispatch::ShowExceptions",
         "ActionDispatch::RemoteIp",
-- 
cgit v1.2.3


From ee1223c1ee90899819a88c39db3e77b3692c68ee Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Thu, 20 Oct 2011 18:30:50 +1100
Subject: [engines guide] explanation of overriding views + referencing routes
 from an engine within an application

---
 railties/guides/source/engines.textile | 59 ++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index 0688dc4c99..da56f3d0ed 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -542,10 +542,65 @@ Go ahead and try to create a new post. You will see that it works exactly in the
 
 There are now no strict dependencies on what the class is, only what the class's API must be. The engine simply requires this class to define a +find_or_create_by_name+ method which returns an object of that class to be associated with a post when it's created.
 
-h3. Overriding engine functionality
+h3. Extending engine functionality
 
-TODO: Cover how to override engine functionality in the engine, such as controllers and views.
+This section looks at overriding or adding functionality to the views, controllers and models provided by an engine.
 
+h4. Overriding views
+
+When Rails looks for a view to render, it will first look in the +app/views+ directory of the application. If it cannot find the view there, then it will check in the +app/views+ directories of all engines which have this directory. 
+
+In the +blorgh+ engine, there is a currently a file at +app/views/blorgh/posts/index.html.erb+. When the engine is asked to render the view for +Blorgh::PostsController+'s +index+ action, it will first see if it can find it at +app/views/blorgh/posts/index.html.erb+ within the application and then if it cannot it will look inside the engine.
+
+By overriding this view in the application, by simply creating a new file at +app/views/blorgh/posts/index.html.erb+, you can completely change what this view would normally output.
+
+Try this now by creating a new file at +app/views/blorgh/posts/index.html.erb+ and put this content in it:
+
+<erb>
+<h1>Posts</h1>
+<%= link_to "New Post", new_post_path %>
+<% @posts.each do |post| %>
+  <h2><%= post.title %></h2>
+  <small>By <%= post.author %></small>
+  <%= simple_format(post.text) %>
+  <hr>
+<% end %>
+</erb>
+
+Rather than looking like the default scaffold, the page will now look like this:
+
+!images/engines_post_override.png(Engine scaffold overriden)!
+
+h4. Controllers
+
+TODO: Explain how to extend a controller.
 IDEA: I like Devise's +devise :controllers => { "sessions" => "sessions" }+ idea. Perhaps we could incorporate that into the guide?
+
+h4. Models
+
+TODO: Explain how to extend models provided by an engine.
+
+h4. Routes
+
+Within the application, you may wish to link to some area within the engine. Due to the fact that the engine's routes are isolated (by the +isolate_namespace+ call within the +lib/blorgh/engine.rb+ file), you will need to prefix these routes with the engine name. This means rather than having something such as:
+
+<erb>
+<%= link_to "Blog posts", posts_path %>
+</erb>
+
+It needs to be written as:
+
+<erb>
+<%= link_to "Blog posts", blorgh.posts_path %>
+</erb>
+
+This allows for the engine _and_ the application to both have a +posts_path+ routing helper and to not interfere with each other. You may also reference another engine's routes from inside an engine using this same syntax.
+
+If you wish to reference the application inside the engine in a similar way, use the +main_app+ helper:
+
+<erb>
+<%= link_to "Home", main_app.root_path %>
+</erb>
+
 TODO: Mention how to use assets within an engine?
 TODO: Mention how to depend on external gems, like RedCarpet.
-- 
cgit v1.2.3


From 66880cfe416b75f472762f2c6b485bad9759c751 Mon Sep 17 00:00:00 2001
From: Andrew France <andrew@avito.co.uk>
Date: Thu, 20 Oct 2011 12:32:11 +0200
Subject: Correct ActionMailer subject i18n lookup scope.

The :actionmailer i18n scope part is not used and according to https://github.com/rails/rails/pull/2542 the implementation is correct.
---
 actionmailer/lib/action_mailer/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index ac49702ced..8f2c567e3e 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -524,7 +524,7 @@ module ActionMailer #:nodoc:
     #
     # * <tt>:subject</tt> - The subject of the message, if this is omitted, Action Mailer will
     #   ask the Rails I18n class for a translated <tt>:subject</tt> in the scope of
-    #   <tt>[:actionmailer, mailer_scope, action_name]</tt> or if this is missing, will translate the
+    #   <tt>[mailer_scope, action_name]</tt> or if this is missing, will translate the
     #   humanized version of the <tt>action_name</tt>
     # * <tt>:to</tt> - Who the message is destined for, can be a string of addresses, or an array
     #   of addresses.
-- 
cgit v1.2.3


From 274c3fad5087306a64ca91d044756221f5ff862c Mon Sep 17 00:00:00 2001
From: Martin Svalin <martin@lite.nu>
Date: Thu, 20 Oct 2011 16:31:10 +0200
Subject: Fixed misleading docs for String#to_formatted_s(:db)

---
 activesupport/lib/active_support/core_ext/array/conversions.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 3b22e8b4f9..f3d06ecb2f 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -39,10 +39,10 @@ class Array
   #
   #   Blog.all.to_formatted_s # => "First PostSecond PostThird Post"
   #
-  # Adding in the <tt>:db</tt> argument as the format yields a prettier
-  # output:
+  # Adding in the <tt>:db</tt> argument as the format yields a comma separated
+  # id list:
   #
-  #   Blog.all.to_formatted_s(:db) # => "First Post,Second Post,Third Post"
+  #   Blog.all.to_formatted_s(:db) # => "1,2,3"
   def to_formatted_s(format = :default)
     case format
       when :db
-- 
cgit v1.2.3


From ee9d9fb5fab3cfaa5055e5fb4225b720d3818c94 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 20 Oct 2011 08:44:55 -0700
Subject: Merge pull request #3258 from ileitch/3-1-stable

Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
---
 .../connection_adapters/postgresql_adapter.rb            |  8 +++++++-
 .../cases/adapters/postgresql/statement_pool_test.rb     | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index b7f346e050..3d084bb178 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -289,7 +289,13 @@ module ActiveRecord
         end
 
         def dealloc(key)
-          @connection.query "DEALLOCATE #{key}"
+          @connection.query "DEALLOCATE #{key}" if connection_active?
+        end
+
+        def connection_active?
+          @connection.status == PGconn::CONNECTION_OK
+        rescue PGError
+          false
         end
       end
 
diff --git a/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb b/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb
index a82c6f67d6..f1c4b85126 100644
--- a/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/statement_pool_test.rb
@@ -2,6 +2,16 @@ require 'cases/helper'
 
 module ActiveRecord::ConnectionAdapters
   class PostgreSQLAdapter < AbstractAdapter
+    class InactivePGconn
+      def query(*args)
+        raise PGError
+      end
+
+      def status
+        PGconn::CONNECTION_BAD
+      end
+    end
+
     class StatementPoolTest < ActiveRecord::TestCase
       def test_cache_is_per_pid
         return skip('must support fork') unless Process.respond_to?(:fork)
@@ -18,6 +28,12 @@ module ActiveRecord::ConnectionAdapters
         Process.waitpid pid
         assert $?.success?, 'process should exit successfully'
       end
+
+      def test_dealloc_does_not_raise_on_inactive_connection
+        cache = StatementPool.new InactivePGconn.new, 10
+        cache['foo'] = 'bar'
+        assert_nothing_raised { cache.clear }
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 48e1f8ba4c02ed81ba70fee459de8bc569197fc4 Mon Sep 17 00:00:00 2001
From: Pepe Hipolito <jose.hipolito@gfi.com>
Date: Thu, 20 Oct 2011 15:37:35 -0400
Subject: Fixed typo.

a long the way => along the way
---
 railties/guides/source/initialization.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
index 32b41fdd2c..2299573a9f 100644
--- a/railties/guides/source/initialization.textile
+++ b/railties/guides/source/initialization.textile
@@ -7,7 +7,7 @@ This guide explains the internals of the initialization process in Rails as of R
 
 endprologue.
 
-This guide goes through every single file, class and method call that is required to boot up the Ruby on Rails stack for a default Rails 3.1 application, explaining each part in detail a long the way. For this guide, we will be focusing on how the two most common methods (+rails server+ and Passenger) boot a Rails application.
+This guide goes through every single file, class and method call that is required to boot up the Ruby on Rails stack for a default Rails 3.1 application, explaining each part in detail along the way. For this guide, we will be focusing on how the two most common methods (+rails server+ and Passenger) boot a Rails application.
 
 NOTE: Paths in this guide are relative to Rails or a Rails application unless otherwise specified.
 
-- 
cgit v1.2.3


From 0cd93a6e2bbcdd2ead0d6e4b739dfd8def04d8d5 Mon Sep 17 00:00:00 2001
From: Pepe Hipolito <jose.hipolito@gfi.com>
Date: Thu, 20 Oct 2011 15:58:51 -0400
Subject: Fixed typo.

Ruby will know to look for this file at => Ruby will know how to look for this file at
---
 railties/guides/source/initialization.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
index 2299573a9f..f88405a2fd 100644
--- a/railties/guides/source/initialization.textile
+++ b/railties/guides/source/initialization.textile
@@ -243,7 +243,7 @@ In this file there are a lot of lines such as this inside the +ActiveSupport+ mo
 autoload :Inflector
 </ruby>
 
-Due to the overriding of the +autoload+ method, Ruby will know to look for this file at +activesupport/lib/active_support/inflector.rb+ when the +Inflector+ class is first referenced.
+Due to the overriding of the +autoload+ method, Ruby will know how to look for this file at +activesupport/lib/active_support/inflector.rb+ when the +Inflector+ class is first referenced.
 
 The +active_support/lib/active_support/version.rb+ that is also required here simply defines an +ActiveSupport::VERSION+ constant which defines a couple of constants inside this module, the main constant of this is +ActiveSupport::VERSION::STRING+ which returns the current version of ActiveSupport.
 
-- 
cgit v1.2.3


From d64e0955d04a40355e312ca4ee57b2c9a8e248cc Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Thu, 20 Oct 2011 17:13:01 -0400
Subject: Use new migration style in HABTM join table

Yes, we're on Rails 3.1 now.
---
 activerecord/lib/active_record/associations.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 0952ea2829..2449df079a 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1424,16 +1424,12 @@ module ActiveRecord
       # join table with a migration such as this:
       #
       #   class CreateDevelopersProjectsJoinTable < ActiveRecord::Migration
-      #     def self.up
+      #     def change
       #       create_table :developers_projects, :id => false do |t|
       #         t.integer :developer_id
       #         t.integer :project_id
       #       end
       #     end
-      #
-      #     def self.down
-      #       drop_table :developers_projects
-      #     end
       #   end
       #
       # Adds the following methods for retrieval and query:
-- 
cgit v1.2.3


From f0be2cb19274bb6029f84ca274a72c4d7fbee2d3 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Thu, 20 Oct 2011 17:15:28 -0400
Subject: Add some note on adding index to HABTM table

---
 activerecord/lib/active_record/associations.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 2449df079a..34684ad2f5 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1432,6 +1432,10 @@ module ActiveRecord
       #     end
       #   end
       #
+      # It's also a good idea to add indexes to each of those columns to speed up the joins process.
+      # However, in MySQL it is advised to add a compound index for both of the columns as MySQL only
+      # uses one index per table during the lookup.
+      #
       # Adds the following methods for retrieval and query:
       #
       # [collection(force_reload = false)]
-- 
cgit v1.2.3


From c495cbcda94bec7a49a88631fc575cc04bde8e88 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 21 Oct 2011 15:12:00 +0530
Subject: Checking blank if tag might coming nil or blank

In log it should not show the empty array.
---
 activesupport/lib/active_support/tagged_logging.rb | 3 ++-
 activesupport/test/tagged_logging_test.rb          | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index aff416a9eb..a59fc26d5d 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'logger'
 
 module ActiveSupport
@@ -18,7 +19,7 @@ module ActiveSupport
 
     def tagged(*new_tags)
       tags     = current_tags
-      new_tags = Array.wrap(new_tags).flatten
+      new_tags = Array.wrap(new_tags).flatten.reject(&:blank?)
       tags.concat new_tags
       yield
     ensure
diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb
index b12b12f32c..17c4214dfc 100644
--- a/activesupport/test/tagged_logging_test.rb
+++ b/activesupport/test/tagged_logging_test.rb
@@ -29,6 +29,11 @@ class TaggedLoggingTest < ActiveSupport::TestCase
     assert_equal "[BCX] [Jason] [New] Funky time\n", @output.string
   end
 
+  test "tagged once with blank and nil" do
+    @logger.tagged(nil, "", "New") { @logger.info "Funky time" }
+    assert_equal "[New] Funky time\n", @output.string
+  end
+
   test "keeps each tag in their own thread" do
     @logger.tagged("BCX") do
       Thread.new do
-- 
cgit v1.2.3


From d565fda5f27abf0097adf7b3e232a52f7ae5c1e9 Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Fri, 21 Oct 2011 12:43:52 -0500
Subject: Fix threading issues with BufferedLogger.

---
 .../lib/active_support/buffered_logger.rb          | 44 ++++++++++++++----
 activesupport/test/buffered_logger_test.rb         | 53 ++++++++++++++++++++++
 2 files changed, 89 insertions(+), 8 deletions(-)

diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index 26412cd7f4..136e245859 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -25,22 +25,28 @@ module ActiveSupport
     # Silences the logger for the duration of the block.
     def silence(temporary_level = ERROR)
       if silencer
+        old_logger_level = @tmp_levels[Thread.current]
         begin
-          old_logger_level, self.level = level, temporary_level
+          @tmp_levels[Thread.current] = temporary_level
           yield self
         ensure
-          self.level = old_logger_level
+          if old_logger_level
+            @tmp_levels[Thread.current] = old_logger_level
+          else
+            @tmp_levels.delete(Thread.current)
+          end
         end
       else
         yield self
       end
     end
 
-    attr_accessor :level
+    attr_writer :level
     attr_reader :auto_flushing
 
     def initialize(log, level = DEBUG)
       @level         = level
+      @tmp_levels    = {}
       @buffer        = Hash.new { |h,k| h[k] = [] }
       @auto_flushing = 1
       @guard = Mutex.new
@@ -62,8 +68,12 @@ module ActiveSupport
       end
     end
 
+    def level
+      @tmp_levels[Thread.current] || @level
+    end
+
     def add(severity, message = nil, progname = nil, &block)
-      return if @level > severity
+      return if level > severity
       message = (message || (block && block.call) || progname).to_s
       # If a newline is necessary then create a new message ending with a newline.
       # Ensures that the original message is not mutated.
@@ -84,7 +94,7 @@ module ActiveSupport
         end                                                             # end
 
         def #{severity.downcase}?                                       # def debug?
-          #{severity} >= @level                                         #   DEBUG >= @level
+          #{severity} >= level                                         #   DEBUG >= @level
         end                                                             # end
       EOT
     end
@@ -105,13 +115,15 @@ module ActiveSupport
 
     def flush
       @guard.synchronize do
-        buffer.each do |content|
-          @log.write(content)
-        end
+        write_buffer(buffer)
 
         # Important to do this even if buffer was empty or else @buffer will
         # accumulate empty arrays for each request where nothing was logged.
         clear_buffer
+
+        # Clear buffers associated with dead threads or else spawned threads
+        # that don't call flush will result in a memory leak.
+        flush_dead_buffers
       end
     end
 
@@ -133,5 +145,21 @@ module ActiveSupport
       def clear_buffer
         @buffer.delete(Thread.current)
       end
+
+      # Find buffers created by threads that are no longer alive and flush them to the log
+      # in order to prevent memory leaks from spawned threads.
+      def flush_dead_buffers #:nodoc:
+        @buffer.keys.reject{|thread| thread.alive?}.each do |thread|
+          buffer = @buffer[thread]
+          write_buffer(buffer)
+          @buffer.delete(thread)
+        end
+      end
+
+      def write_buffer(buffer)
+        buffer.each do |content|
+          @log.write(content)
+        end
+      end
   end
 end
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index 21049d685b..8699862d9e 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -198,4 +198,57 @@ class BufferedLoggerTest < Test::Unit::TestCase
     end
     assert byte_string.include?(BYTE_STRING)
   end
+
+  def test_silence_only_current_thread
+    @logger.auto_flushing = true
+    run_thread_a = false
+
+    a = Thread.new do
+      while !run_thread_a do
+        sleep(0.001)
+      end
+      @logger.info("x")
+      run_thread_a = false
+    end
+
+    @logger.silence do
+      run_thread_a = true
+      @logger.info("a")
+      while run_thread_a do
+        sleep(0.001)
+      end
+    end
+
+    a.join
+
+    assert @output.string.include?("x")
+    assert !@output.string.include?("a")
+  end
+
+  def test_flush_dead_buffers
+    @logger.auto_flushing = false
+
+    a = Thread.new do
+      @logger.info("a")
+    end
+    
+    keep_running = true
+    b = Thread.new do
+      @logger.info("b")
+      while keep_running
+        sleep(0.001)
+      end
+    end
+
+    @logger.info("x")
+    a.join
+    @logger.flush
+
+
+    assert @output.string.include?("x")
+    assert @output.string.include?("a")
+    assert !@output.string.include?("b")
+    
+    keep_running = false
+  end
 end
-- 
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 +++++++++++++++++++++
 .../source/action_controller_overview.textile      |  10 +-
 railties/guides/source/rails_on_rack.textile       |   5 +-
 railties/guides/source/security.textile            |   4 +-
 6 files changed, 243 insertions(+), 8 deletions(-)
 create mode 100644 actionpack/lib/action_dispatch/middleware/session/cache_store.rb
 create mode 100644 actionpack/test/dispatch/session/cache_store_test.rb

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
diff --git a/railties/guides/source/action_controller_overview.textile b/railties/guides/source/action_controller_overview.textile
index 5019d49686..b34c223b31 100644
--- a/railties/guides/source/action_controller_overview.textile
+++ b/railties/guides/source/action_controller_overview.textile
@@ -166,10 +166,10 @@ h3. Session
 
 Your application has a session for each user in which you can store small amounts of data that will be persisted between requests. The session is only available in the controller and the view and can use one of a number of different storage mechanisms:
 
-* CookieStore - Stores everything on the client.
-* DRbStore - Stores the data on a DRb server.
-* MemCacheStore - Stores the data in a memcache.
-* ActiveRecordStore - Stores the data in a database using Active Record.
+* ActionDispatch::Session::CookieStore - Stores everything on the client.
+* ActiveRecord::SessionStore - Stores the data in a database using Active Record.
+* ActionDispatch::Session::CacheStore - Stores the data in the Rails cache.
+* ActionDispatch::Session::MemCacheStore - Stores the data in a memcached cluster (this is a legacy implementation; consider using CacheStore instead).
 
 All session stores use a cookie to store a unique ID for each session (you must use a cookie, Rails will not allow you to pass the session ID in the URL as this is less secure).
 
@@ -177,6 +177,8 @@ For most stores this ID is used to look up the session data on the server, e.g.
 
 The CookieStore can store around 4kB of data -- much less than the others -- but this is usually enough. Storing large amounts of data in the session is discouraged no matter which session store your application uses. You should especially avoid storing complex objects (anything other than basic Ruby objects, the most common example being model instances) in the session, as the server might not be able to reassemble them between requests, which will result in an error.
 
+If your user sessions don't store critical data or don't need to be around for long periods (for instance if you just use the flash for messaging), you can consider using ActionDispatch::Session::CacheStore. This will store sessions using the cache implementation you have configured for your application. The advantage of this is that you can use your existing cache infrastructure for storing sessions without requiring any additional setup or administration. The downside, of course, is that the sessions will be ephemeral and could disappear at any time.
+
 Read more about session storage in the "Security Guide":security.html.
 
 If you need a different session storage mechanism, you can change it in the +config/initializers/session_store.rb+ file:
diff --git a/railties/guides/source/rails_on_rack.textile b/railties/guides/source/rails_on_rack.textile
index 57c03b54dc..d6cbd84b1f 100644
--- a/railties/guides/source/rails_on_rack.textile
+++ b/railties/guides/source/rails_on_rack.textile
@@ -166,8 +166,9 @@ Much of Action Controller's functionality is implemented as Middlewares. The fol
 |+Rack::Lock+|Sets <tt>env["rack.multithread"]</tt> flag to +true+ and wraps the application within a Mutex.|
 |+ActionController::Failsafe+|Returns HTTP Status +500+ to the client if an exception gets raised while dispatching.|
 |+ActiveRecord::QueryCache+|Enables the Active Record query cache.|
-|+ActionController::Session::CookieStore+|Uses the cookie based session store.|
-|+ActionController::Session::MemCacheStore+|Uses the memcached based session store.|
+|+ActionDispatch::Session::CookieStore+|Uses the cookie based session store.|
+|+ActionDispatch::Session::CacheStore+|Uses the Rails cache based session store.|
+|+ActionDispatch::Session::MemCacheStore+|Uses the memcached based session store.|
 |+ActiveRecord::SessionStore+|Uses the database based session store.|
 |+Rack::MethodOverride+|Sets HTTP method based on +_method+ parameter or <tt>env["HTTP_X_HTTP_METHOD_OVERRIDE"]</tt>.|
 |+Rack::Head+|Discards the response body if the client sends a +HEAD+ request.|
diff --git a/railties/guides/source/security.textile b/railties/guides/source/security.textile
index 8837e06de5..a499ef3d39 100644
--- a/railties/guides/source/security.textile
+++ b/railties/guides/source/security.textile
@@ -82,9 +82,9 @@ This will also be a good idea, if you modify the structure of an object and old
 
 h4. Session Storage
 
--- _Rails provides several storage mechanisms for the session hashes. The most important are SessionStore and CookieStore._
+-- _Rails provides several storage mechanisms for the session hashes. The most important are ActiveRecord::SessionStore and ActionDispatch::Session::CookieStore._
 
-There are a number of session storages, i.e. where Rails saves the session hash and session id. Most real-live applications choose SessionStore (or one of its derivatives) over file storage due to performance and maintenance reasons. SessionStore keeps the session id and hash in a database table and saves and retrieves the hash on every request.
+There are a number of session storages, i.e. where Rails saves the session hash and session id. Most real-live applications choose ActiveRecord::SessionStore (or one of its derivatives) over file storage due to performance and maintenance reasons. ActiveRecord::SessionStore keeps the session id and hash in a database table and saves and retrieves the hash on every request.
 
 Rails 2 introduced a new default session storage, CookieStore. CookieStore saves the session hash directly in a cookie on the client-side. The server retrieves the session hash from the cookie and eliminates the need for a session id. That will greatly increase the speed of the application, but it is a controversial storage option and you have to think about the security implications of it:
 
-- 
cgit v1.2.3


From ec93f363cab7270c1469b420a52a21e306a89c30 Mon Sep 17 00:00:00 2001
From: Brian Durand <brian@embellishedvisions.com>
Date: Fri, 21 Oct 2011 13:28:24 -0500
Subject: Fix ActiveSupport::Cache::FileStore.cleanup to actually work.

---
 .../lib/active_support/cache/file_store.rb         | 21 +++++++++++--
 activesupport/test/caching_test.rb                 | 34 ++++++++++++++++++++++
 railties/guides/source/caching_with_rails.textile  |  6 +++-
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index b431041b76..bc5d94b5a7 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -26,11 +26,26 @@ module ActiveSupport
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
+      # Cleanup the cache by removing old entries. By default this will delete entries
+      # that haven't been accessed in one day. You can change this behavior by passing
+      # in a +not_accessed_in+ option. Any entry not accessed in that number of seconds
+      # in the past will be deleted. Alternatively, you can pass in +:expired_only+ with
+      # +true+ to only delete expired entries.
       def cleanup(options = nil)
         options = merged_options(options)
-        each_key(options) do |key|
-          entry = read_entry(key, options)
-          delete_entry(key, options) if entry && entry.expired?
+        expired_only = options[:expired_only]
+        timestamp = Time.now - (options[:not_accessed_in] || 1.day.to_i)
+        search_dir(cache_path) do |fname|
+          if expired_only
+            key = file_path_key(fname)
+            entry = read_entry(key, options)
+            delete_entry(key, options) if entry && entry.expired?
+          else
+            if File.atime(fname) <= timestamp
+              key = file_path_key(fname)
+              delete_entry(key, options)
+            end
+          end
         end
       end
 
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index cb5362525f..1b2f6d061c 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -557,6 +557,29 @@ class FileStoreTest < ActiveSupport::TestCase
     key = @cache_with_pathname.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache_with_pathname.send(:file_path_key, key)
   end
+
+  def test_cleanup_with_not_accessed_in
+    @cache.write(1, "aaaaaaaaaa")
+    @cache.write(2, "bbbbbbbbbb")
+    @cache.write(3, "cccccccccc")
+    sleep(2)
+    @cache.read(2)
+    @cache.cleanup(:not_accessed_in => 1)
+    assert_equal false, @cache.exist?(1)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(3)
+  end
+
+  def test_cleanup_with_expired_only
+    @cache.write(1, "aaaaaaaaaa", :expires_in => 0.001)
+    @cache.write(2, "bbbbbbbbbb")
+    @cache.write(3, "cccccccccc", :expires_in => 0.001)
+    sleep(0.002)
+    @cache.cleanup(:expired_only => 0.001)
+    assert_equal false, @cache.exist?(1)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(3)
+  end
   
   # Because file systems have a maximum filename size, filenames > max size should be split in to directories
   # If filename is 'AAAAB', where max size is 4, the returned path should be AAAA/B
@@ -646,6 +669,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     assert_equal true, @cache.exist?(2)
     assert_equal false, @cache.exist?(1)
   end
+
+  def test_cleanup_removes_expired_entries
+    @cache.write(1, "aaaaaaaaaa", :expires_in => 0.001)
+    @cache.write(2, "bbbbbbbbbb")
+    @cache.write(3, "cccccccccc", :expires_in => 0.001)
+    sleep(0.002)
+    @cache.cleanup
+    assert_equal false, @cache.exist?(1)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(3)
+  end
 end
 
 uses_memcached 'memcached backed store' do
diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index 4273d0dd64..721c791a33 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -289,7 +289,11 @@ ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
 
 With this cache store, multiple server processes on the same host can share a cache. Servers processes running on different hosts could share a cache by using a shared file system, but that set up would not be ideal and is not recommended. The cache store is appropriate for low to medium traffic sites that are served off one or two hosts.
 
-Note that the cache will grow until the disk is full unless you periodically clear out old entries.
+Note that the cache will grow until the disk is full unless you periodically clear out old entries. You can call +ActiveSupport::Cache::FileStore#cleanup+ to remove entries older than a specified time.
+
+<ruby>
+Rails.cache.cleanup(:not_accessed_in => 2.days)
+</ruby>
 
 h4. ActiveSupport::Cache::MemCacheStore
 
-- 
cgit v1.2.3


From f092be821db4a2e8f142e8f0b9d08e497ccf2eb2 Mon Sep 17 00:00:00 2001
From: Greg Reinacker <gregr@rassoc.com>
Date: Fri, 21 Oct 2011 17:30:39 -0600
Subject: preserve decimal column attributes after migration

---
 .../connection_adapters/sqlite_adapter.rb          |  3 ++
 activerecord/test/cases/migration_test.rb          | 36 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 1932a849ee..e0e957a12c 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -413,6 +413,8 @@ module ActiveRecord
             self.limit   = options[:limit] if options.include?(:limit)
             self.default = options[:default] if include_default
             self.null    = options[:null] if options.include?(:null)
+            self.precision = options[:precision] if options.include?(:precision)
+            self.scale   = options[:scale] if options.include?(:scale)
           end
         end
       end
@@ -467,6 +469,7 @@ module ActiveRecord
 
               @definition.column(column_name, column.type,
                 :limit => column.limit, :default => column.default,
+                :precision => column.precision, :scale => column.scale,
                 :null => column.null)
             end
             @definition.primary_key(primary_key(from)) if primary_key(from)
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index b3f1785f44..49944eced9 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -518,6 +518,42 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal 7, wealth_column.scale
     end
 
+    # Test SQLite adapter specifically for decimal types with precision and scale
+    # attributes, since these need to be maintained in schema but aren't actually
+    # used in SQLite itself
+    if current_adapter?(:SQLite3Adapter)
+      def test_change_column_with_new_precision_and_scale
+        Person.delete_all
+        Person.connection.add_column 'people', 'wealth', :decimal, :precision => 9, :scale => 7
+        Person.reset_column_information
+
+        Person.connection.change_column 'people', 'wealth', :decimal, :precision => 12, :scale => 8
+        Person.reset_column_information
+
+        wealth_column = Person.columns_hash['wealth']
+        assert_equal 12, wealth_column.precision
+        assert_equal 8, wealth_column.scale
+      end
+
+      def test_change_column_preserve_other_column_precision_and_scale
+        Person.delete_all
+        Person.connection.add_column 'people', 'last_name', :string
+        Person.connection.add_column 'people', 'wealth', :decimal, :precision => 9, :scale => 7
+        Person.reset_column_information
+
+        wealth_column = Person.columns_hash['wealth']
+        assert_equal 9, wealth_column.precision
+        assert_equal 7, wealth_column.scale
+
+        Person.connection.change_column 'people', 'last_name', :string, :null => false
+        Person.reset_column_information
+
+        wealth_column = Person.columns_hash['wealth']
+        assert_equal 9, wealth_column.precision
+        assert_equal 7, wealth_column.scale
+      end
+    end
+
     def test_native_types
       Person.delete_all
       Person.connection.add_column "people", "last_name", :string
-- 
cgit v1.2.3


From 50be4231e9bd475cda905ab489d4bfc9ebd887f7 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 15:51:55 +0530
Subject: Middleware details updated for 3.2

---
 railties/guides/source/command_line.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/command_line.textile b/railties/guides/source/command_line.textile
index f6b33d283c..d3f73e06e0 100644
--- a/railties/guides/source/command_line.textile
+++ b/railties/guides/source/command_line.textile
@@ -389,7 +389,7 @@ Action Pack version       3.1.0
 Active Resource version   3.1.0
 Action Mailer version     3.1.0
 Active Support version    3.1.0
-Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::RemoteIp, ActionDispatch::Callbacks, ActionDispatch::Cookies, ActionDispatch::Session::CookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, Rack::MethodOverride, ActionDispatch::Head
+Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::CookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, ActionDispatch::Head, Rack::ConditionalGet, Rack::ETag, ActionDispatch::BestStandardsSupport
 Application root          /home/foobar/commandsapp
 Environment               development
 Database adapter          sqlite3
-- 
cgit v1.2.3


From 6d5b92c735130a99186ef6f2ce6abe3f8745a8a5 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 15:53:11 +0530
Subject: Rails version to 3.2.0.beta in docs

---
 railties/guides/source/command_line.textile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/railties/guides/source/command_line.textile b/railties/guides/source/command_line.textile
index d3f73e06e0..ffa198891a 100644
--- a/railties/guides/source/command_line.textile
+++ b/railties/guides/source/command_line.textile
@@ -382,13 +382,13 @@ About your application's environment
 Ruby version              1.8.7 (x86_64-linux)
 RubyGems version          1.3.6
 Rack version              1.1
-Rails version             3.1.0
+Rails version             3.2.0.beta
 JavaScript Runtime        Node.js (V8)
-Active Record version     3.1.0
-Action Pack version       3.1.0
-Active Resource version   3.1.0
-Action Mailer version     3.1.0
-Active Support version    3.1.0
+Active Record version     3.2.0.beta
+Action Pack version       3.2.0.beta
+Active Resource version   3.2.0.beta
+Action Mailer version     3.2.0.beta
+Active Support version    3.2.0.beta
 Middleware                ActionDispatch::Static, Rack::Lock, Rack::Runtime, Rack::MethodOverride, ActionDispatch::RequestId, Rails::Rack::Logger, ActionDispatch::ShowExceptions, ActionDispatch::RemoteIp, ActionDispatch::Reloader, ActionDispatch::Callbacks, ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActionDispatch::Cookies, ActionDispatch::Session::CookieStore, ActionDispatch::Flash, ActionDispatch::ParamsParser, ActionDispatch::Head, Rack::ConditionalGet, Rack::ETag, ActionDispatch::BestStandardsSupport
 Application root          /home/foobar/commandsapp
 Environment               development
-- 
cgit v1.2.3


From 4ea21b6de260dd4cd610f88ae8d19a04977b5c2a Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 15:54:55 +0530
Subject: Updated rack version in docs for 3.2

---
 railties/guides/source/command_line.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/command_line.textile b/railties/guides/source/command_line.textile
index ffa198891a..3f8643eca3 100644
--- a/railties/guides/source/command_line.textile
+++ b/railties/guides/source/command_line.textile
@@ -381,7 +381,7 @@ $ rake about
 About your application's environment
 Ruby version              1.8.7 (x86_64-linux)
 RubyGems version          1.3.6
-Rack version              1.1
+Rack version              1.3
 Rails version             3.2.0.beta
 JavaScript Runtime        Node.js (V8)
 Active Record version     3.2.0.beta
-- 
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(-)

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 bc5d334c7a340c29a4f9a594101832e1abe831a5 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 19:16:43 +0530
Subject: Using middleware name to show proper name in the info

---
 railties/lib/rails/info.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index a1e15092b2..2ba09d7b90 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -91,7 +91,7 @@ module Rails
     end
 
     property 'Middleware' do
-      Rails.configuration.middleware.map(&:inspect)
+      Rails.configuration.middleware.map(&:name)
     end
 
     # The application's location on the filesystem.
-- 
cgit v1.2.3


From c930170581ac10acf8c3d9433f3ccd5f72b4e6bf Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 22 Oct 2011 21:47:33 +0530
Subject: No need to check ruby version here

As rake 0.9.2.2 is out with the same
fix as 0.9.3.beta having
---
 Gemfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index f63260a260..4ac6bf764d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,12 +19,7 @@ end
 # it being automatically loaded by sprockets
 gem "uglifier", ">= 1.0.3", :require => false
 
-# Temp fix until rake 0.9.3 is out
-if RUBY_VERSION >= "1.9.3"
-  gem "rake", "0.9.3.beta.1"
-else
-  gem "rake", ">= 0.8.7"
-end
+gem "rake", ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
 
 group :doc do
-- 
cgit v1.2.3


From 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 22 Oct 2011 23:53:52 +0530
Subject: minor fixes in the composed_of doc

---
 activerecord/lib/active_record/aggregations.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/aggregations.rb b/activerecord/lib/active_record/aggregations.rb
index 81ddbba51e..5a8addc4e4 100644
--- a/activerecord/lib/active_record/aggregations.rb
+++ b/activerecord/lib/active_record/aggregations.rb
@@ -172,8 +172,8 @@ module ActiveRecord
       #   with this option.
       # * <tt>:mapping</tt> - Specifies the mapping of entity attributes to attributes of the value
       #   object. Each mapping is represented as an array where the first item is the name of the
-      #   entity attribute and the second item is the name the attribute in the value object. The
-      #   order in which mappings are defined determine the order in which attributes are sent to the
+      #   entity attribute and the second item is the name of the attribute in the value object. The
+      #   order in which mappings are defined determines the order in which attributes are sent to the
       #   value class constructor.
       # * <tt>:allow_nil</tt> - Specifies that the value object will not be instantiated when all mapped
       #   attributes are +nil+. Setting the value object to +nil+ has the effect of writing +nil+ to all
@@ -191,7 +191,8 @@ module ActiveRecord
       #
       # Option examples:
       #   composed_of :temperature, :mapping => %w(reading celsius)
-      #   composed_of :balance, :class_name => "Money", :mapping => %w(balance amount), :converter => Proc.new { |balance| balance.to_money }
+      #   composed_of :balance, :class_name => "Money", :mapping => %w(balance amount),
+      #                         :converter => Proc.new { |balance| balance.to_money }
       #   composed_of :address, :mapping => [ %w(address_street street), %w(address_city city) ]
       #   composed_of :gps_location
       #   composed_of :gps_location, :allow_nil => true
-- 
cgit v1.2.3


From 259741ae7324c18782bf97f236230c496bccf948 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 22 Oct 2011 12:28:06 -0700
Subject: Revert "Merge pull request #3405 from arunagw/middleware_name"

This reverts commit c33090523c3504a2a125d7f725a7f2a4b99ff3c0, reversing
changes made to 1c1c3fc2c06fc02e67a8272adf2c2d2381e005b4.
---
 railties/lib/rails/info.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/info.rb b/railties/lib/rails/info.rb
index 2ba09d7b90..a1e15092b2 100644
--- a/railties/lib/rails/info.rb
+++ b/railties/lib/rails/info.rb
@@ -91,7 +91,7 @@ module Rails
     end
 
     property 'Middleware' do
-      Rails.configuration.middleware.map(&:name)
+      Rails.configuration.middleware.map(&:inspect)
     end
 
     # The application's location on the filesystem.
-- 
cgit v1.2.3


From a458833705cd3e9a0909d0710da84e2009f097ba Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 22 Oct 2011 14:34:05 -0500
Subject: Remove Turn from default Gemfile.

We still looking for a best presentation for tests output.
---
 railties/lib/rails/generators/app_base.rb                 | 11 -----------
 railties/lib/rails/generators/rails/app/templates/Gemfile |  2 --
 railties/test/generators/app_generator_test.rb            | 15 ---------------
 3 files changed, 28 deletions(-)

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 40961f0c3e..10fdfdd8a9 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -190,17 +190,6 @@ module Rails
         end
       end
 
-      def turn_gemfile_entry
-        unless RUBY_VERSION < "1.9.2" || options[:skip_test_unit]
-          <<-GEMFILE.strip_heredoc
-            group :test do
-              # Pretty printed test output
-              gem 'turn', :require => false
-            end
-          GEMFILE
-        end
-      end
-
       def assets_gemfile_entry
         <<-GEMFILE.strip_heredoc
           # Gems used only for assets and not required
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile
index 910cd16950..d3b8f4d595 100644
--- a/railties/lib/rails/generators/rails/app/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/app/templates/Gemfile
@@ -21,5 +21,3 @@ source 'http://rubygems.org'
 
 # To use debugger
 # <%= ruby_debugger_gemfile_entry %>
-
-<%= turn_gemfile_entry -%>
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 133efb872f..4b74bd6a4b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -242,21 +242,6 @@ class AppGeneratorTest < Rails::Generators::TestCase
     end
   end
 
-  def test_inclusion_of_turn_gem_in_gemfile
-    run_generator
-    assert_file "Gemfile" do |contents|
-      assert_match(/gem 'turn'/, contents) unless RUBY_VERSION < '1.9.2'
-      assert_no_match(/gem 'turn'/, contents) if RUBY_VERSION < '1.9.2'
-    end
-  end
-
-  def test_turn_gem_is_not_included_in_gemfile_if_skipping_test_unit
-    run_generator [destination_root, "--skip-test-unit"]
-    assert_file "Gemfile" do |contents|
-      assert_no_match(/gem 'turn'/, contents) unless RUBY_VERSION < '1.9.2'
-    end
-  end
-
   def test_inclusion_of_ruby_debug
     run_generator
     assert_file "Gemfile" do |contents|
-- 
cgit v1.2.3


From 227c31f7b6b13fcfc187d20618ed14d2970314c7 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 23 Oct 2011 01:34:02 +0530
Subject: edge doesnt provide turn gem in the gemfile anymore

---
 railties/guides/code/getting_started/Gemfile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/railties/guides/code/getting_started/Gemfile b/railties/guides/code/getting_started/Gemfile
index 51774934cd..898510dcaa 100644
--- a/railties/guides/code/getting_started/Gemfile
+++ b/railties/guides/code/getting_started/Gemfile
@@ -25,8 +25,3 @@ gem 'jquery-rails'
 
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
-
-group :test do
-  # Pretty printed test output
-  gem 'turn', :require => false
-end
-- 
cgit v1.2.3


From e75c18bff811b95e12634cdbf04df244a227d46d Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 23 Oct 2011 18:07:00 +0300
Subject: Ignore .rbx directories (rbx compiled bytecode files)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ab0950d7dd..437a1067f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ railties/tmp
 .rvmrc
 .rbenv-version
 RDOC_MAIN.rdoc
+.rbx
-- 
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(-)

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 17bf04ff0dbb2f11dd7bc1a87df035a96f9432ef Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 24 Oct 2011 14:43:46 +0200
Subject: registers PR #2419 in the CHANGELOG

---
 activerecord/CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 46076dac61..798d875034 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,8 @@
 *Rails 3.2.0 (unreleased)*
 
+* In development mode the db:drop task also drops the test database. For symmetry with
+  the db:create task. [Dmitriy Kiriyenko]
+
 * Added ActiveRecord::Base.store for declaring simple single-column key/value stores [DHH]
 
     class User < ActiveRecord::Base
-- 
cgit v1.2.3


From 9dd168c40262e850885fcb3dd0028b9067bb627f Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 24 Oct 2011 14:46:28 +0200
Subject: minor revision to some new code in databases.rake

---
 activerecord/lib/active_record/railties/databases.rake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 705ffe9dd7..f8fa65ea87 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -548,8 +548,9 @@ def drop_database_and_rescue(config)
 end
 
 def configs_for_environment
-  environments = [Rails.env, ("test" if Rails.env.development?)]
-  ActiveRecord::Base.configurations.values_at(*environments).compact
+  environments = [Rails.env]
+  environments << 'test' if Rails.env.development?
+  ActiveRecord::Base.configurations.values_at(*environments)
 end
 
 def session_table_name
-- 
cgit v1.2.3


From b6fc41275c2e300c9e4ce55e48eedaac811c5fac Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Mon, 24 Oct 2011 21:56:27 +0530
Subject: Unused variable removed

---
 activesupport/test/buffered_logger_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index 8699862d9e..386006677b 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -233,7 +233,7 @@ class BufferedLoggerTest < Test::Unit::TestCase
     end
     
     keep_running = true
-    b = Thread.new do
+    Thread.new do
       @logger.info("b")
       while keep_running
         sleep(0.001)
-- 
cgit v1.2.3


From 98fbb50ebf531af28deb1312baf943c24990ad25 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Mon, 24 Oct 2011 22:38:10 +0400
Subject: Remove needless to_param in scaffold functional test

---
 .../generators/test_unit/scaffold/templates/functional_test.rb    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
index 01fe6dda7a..9ec2e34545 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb
@@ -26,23 +26,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   test "should show <%= singular_table_name %>" do
-    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :show, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    get :edit, <%= key_value :id, "@#{singular_table_name}" %>
     assert_response :success
   end
 
   test "should update <%= singular_table_name %>" do
-    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    put :update, <%= key_value :id, "@#{singular_table_name}" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
   test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}" %>
     end
 
     assert_redirected_to <%= index_helper %>_path
-- 
cgit v1.2.3


From 7c6d4377b85a4e534f627a8b6ea126d74a7bb039 Mon Sep 17 00:00:00 2001
From: Bruce Adams <bruce.adams@acm.org>
Date: Mon, 24 Oct 2011 16:18:42 -0400
Subject: note that after_initialize is run for rake tasks

---
 railties/guides/source/configuring.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index 58b92e7f9e..bb494fbd33 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -40,7 +40,7 @@ Rails will use that particular setting to configure Active Record.
 
 h4. Rails General Configuration
 
-* +config.after_initialize+ takes a block which will be ran _after_ Rails has finished initializing the application. That includes the initialization of the framework itself, plugins, engines, and all the application's initializers in +config/initializers+. Useful for configuring values set up by other initializers:
+* +config.after_initialize+ takes a block which will be run _after_ Rails has finished initializing the application. That includes the initialization of the framework itself, plugins, engines, and all the application's initializers in +config/initializers+. Note that this block _will_ be run for rake tasks. Useful for configuring values set up by other initializers:
 
 <ruby>
 config.after_initialize do
-- 
cgit v1.2.3


From 80bcfb00f71dbacd6af0a76429faa5d104ae3a36 Mon Sep 17 00:00:00 2001
From: Joost Baaij <joost@spacebabies.nl>
Date: Tue, 25 Oct 2011 13:57:24 +0300
Subject: Added a note that optimistic locking also needs a hidden field to
 function across web workers.

---
 activerecord/lib/active_record/locking/optimistic.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb
index 2df3309648..1a29ded787 100644
--- a/activerecord/lib/active_record/locking/optimistic.rb
+++ b/activerecord/lib/active_record/locking/optimistic.rb
@@ -37,6 +37,9 @@ module ActiveRecord
     # You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging,
     # or otherwise apply the business logic needed to resolve the conflict.
     #
+    # This locking mechanism will function inside a single Ruby process. To make it work across all
+    # web requests, the recommended approach is to add +lock_version+ as a hidden field to your form.
+    #
     # You must ensure that your database schema defaults the +lock_version+ column to 0.
     #
     # This behavior can be turned off by setting <tt>ActiveRecord::Base.lock_optimistically = false</tt>.
-- 
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(-)

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(-)

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 ddce29bfa12462fde2342a0c2bd0eefd420c0eab Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 26 Oct 2011 00:41:41 +0530
Subject: safeguard against configs missing environment or the database key

---
 activerecord/lib/active_record/railties/databases.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index f8fa65ea87..44848b3391 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -550,7 +550,7 @@ end
 def configs_for_environment
   environments = [Rails.env]
   environments << 'test' if Rails.env.development?
-  ActiveRecord::Base.configurations.values_at(*environments)
+  ActiveRecord::Base.configurations.values_at(*environments).compact.reject { |config| config['database'].blank? }
 end
 
 def session_table_name
-- 
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(-)

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 771ca79f74db1e5a19703ad92472515dbebb70c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 25 Oct 2011 22:22:43 +0200
Subject: Revert "Merge pull request #3395 from bdurand/fix_file_store_cleanup"

Tests were failing on Travis-CI.

This reverts commit 79d01a8f16e20c556a086a2f07e3ccb4400f9819, reversing
changes made to b838570bd69ff13d677fb43e79f10d6f3168c696.
---
 .../lib/active_support/cache/file_store.rb         | 21 ++-----------
 activesupport/test/caching_test.rb                 | 34 ----------------------
 railties/guides/source/caching_with_rails.textile  |  6 +---
 3 files changed, 4 insertions(+), 57 deletions(-)

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index bc5d94b5a7..b431041b76 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -26,26 +26,11 @@ module ActiveSupport
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
-      # Cleanup the cache by removing old entries. By default this will delete entries
-      # that haven't been accessed in one day. You can change this behavior by passing
-      # in a +not_accessed_in+ option. Any entry not accessed in that number of seconds
-      # in the past will be deleted. Alternatively, you can pass in +:expired_only+ with
-      # +true+ to only delete expired entries.
       def cleanup(options = nil)
         options = merged_options(options)
-        expired_only = options[:expired_only]
-        timestamp = Time.now - (options[:not_accessed_in] || 1.day.to_i)
-        search_dir(cache_path) do |fname|
-          if expired_only
-            key = file_path_key(fname)
-            entry = read_entry(key, options)
-            delete_entry(key, options) if entry && entry.expired?
-          else
-            if File.atime(fname) <= timestamp
-              key = file_path_key(fname)
-              delete_entry(key, options)
-            end
-          end
+        each_key(options) do |key|
+          entry = read_entry(key, options)
+          delete_entry(key, options) if entry && entry.expired?
         end
       end
 
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 1b2f6d061c..cb5362525f 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -557,29 +557,6 @@ class FileStoreTest < ActiveSupport::TestCase
     key = @cache_with_pathname.send(:key_file_path, "views/index?id=1")
     assert_equal "views/index?id=1", @cache_with_pathname.send(:file_path_key, key)
   end
-
-  def test_cleanup_with_not_accessed_in
-    @cache.write(1, "aaaaaaaaaa")
-    @cache.write(2, "bbbbbbbbbb")
-    @cache.write(3, "cccccccccc")
-    sleep(2)
-    @cache.read(2)
-    @cache.cleanup(:not_accessed_in => 1)
-    assert_equal false, @cache.exist?(1)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(3)
-  end
-
-  def test_cleanup_with_expired_only
-    @cache.write(1, "aaaaaaaaaa", :expires_in => 0.001)
-    @cache.write(2, "bbbbbbbbbb")
-    @cache.write(3, "cccccccccc", :expires_in => 0.001)
-    sleep(0.002)
-    @cache.cleanup(:expired_only => 0.001)
-    assert_equal false, @cache.exist?(1)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(3)
-  end
   
   # Because file systems have a maximum filename size, filenames > max size should be split in to directories
   # If filename is 'AAAAB', where max size is 4, the returned path should be AAAA/B
@@ -669,17 +646,6 @@ class MemoryStoreTest < ActiveSupport::TestCase
     assert_equal true, @cache.exist?(2)
     assert_equal false, @cache.exist?(1)
   end
-
-  def test_cleanup_removes_expired_entries
-    @cache.write(1, "aaaaaaaaaa", :expires_in => 0.001)
-    @cache.write(2, "bbbbbbbbbb")
-    @cache.write(3, "cccccccccc", :expires_in => 0.001)
-    sleep(0.002)
-    @cache.cleanup
-    assert_equal false, @cache.exist?(1)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(3)
-  end
 end
 
 uses_memcached 'memcached backed store' do
diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index 721c791a33..4273d0dd64 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -289,11 +289,7 @@ ActionController::Base.cache_store = :file_store, "/path/to/cache/directory"
 
 With this cache store, multiple server processes on the same host can share a cache. Servers processes running on different hosts could share a cache by using a shared file system, but that set up would not be ideal and is not recommended. The cache store is appropriate for low to medium traffic sites that are served off one or two hosts.
 
-Note that the cache will grow until the disk is full unless you periodically clear out old entries. You can call +ActiveSupport::Cache::FileStore#cleanup+ to remove entries older than a specified time.
-
-<ruby>
-Rails.cache.cleanup(:not_accessed_in => 2.days)
-</ruby>
+Note that the cache will grow until the disk is full unless you periodically clear out old entries.
 
 h4. ActiveSupport::Cache::MemCacheStore
 
-- 
cgit v1.2.3


From 057a268d45e8432341bd73ae4c141bb926381f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 25 Oct 2011 22:23:55 +0200
Subject: Revert "Ignore .rbx directories (rbx compiled bytecode files)"

This should go in your ~/.gitignore.

This reverts commit e75c18bff811b95e12634cdbf04df244a227d46d.
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 437a1067f8..ab0950d7dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,3 @@ railties/tmp
 .rvmrc
 .rbenv-version
 RDOC_MAIN.rdoc
-.rbx
-- 
cgit v1.2.3


From 139562f241136ca89209ddaffaf10b0b3a599b39 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 25 Oct 2011 13:30:50 -0700
Subject: Clean up .gitignore and make a note about using global ignores

---
 .gitignore | 47 ++++++++++++++++++++++-------------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

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


From 5daf07704ad21d885661216281ffc48b6ea6adfb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 25 Oct 2011 17:22:52 -0500
Subject: Fix that changing a store should mark the store attribute as changed

---
 activerecord/lib/active_record/store.rb | 1 +
 activerecord/test/cases/store_test.rb   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/activerecord/lib/active_record/store.rb b/activerecord/lib/active_record/store.rb
index d5910df891..8cc84f81d0 100644
--- a/activerecord/lib/active_record/store.rb
+++ b/activerecord/lib/active_record/store.rb
@@ -37,6 +37,7 @@ module ActiveRecord
         Array(keys).flatten.each do |key|
           define_method("#{key}=") do |value|
             send(store_attribute)[key] = value
+            send("#{store_attribute}_will_change!")
           end
     
           define_method(key) do
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 3d056d93b6..3f7a965cfb 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -26,4 +26,9 @@ class StoreTest < ActiveRecord::TestCase
 
     assert 'graeters', @john.reload.settings[:icecream]
   end
+  
+  test "updating the store will mark it as changed" do
+    @john.color = 'red'
+    assert @john.settings_changed?
+  end
 end
-- 
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(-)

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 df5f88c7c0fce0d3b7a994ae376e626cd6d47d34 Mon Sep 17 00:00:00 2001
From: Henare Degan <henare.degan@gmail.com>
Date: Wed, 26 Oct 2011 19:03:53 +1200
Subject: Fix a little typo

---
 railties/guides/source/asset_pipeline.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index 6eb4ae49e3..6ff5e87b6d 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -438,7 +438,7 @@ location ~ ^/assets/ {
 }
 </plain>
 
-When files are precompiled, Sprockets also creates a "gzipped":http://en.wikipedia.org/wiki/Gzip (.gz) version of your assets. Web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once Sprockets uses the maximum compression ratio, thus reducing the size of the data transfer to the minimum. One the other hand, web servers can be configured to serve compressed content directly from disk, rather than deflating non-compressed files themselves.
+When files are precompiled, Sprockets also creates a "gzipped":http://en.wikipedia.org/wiki/Gzip (.gz) version of your assets. Web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once Sprockets uses the maximum compression ratio, thus reducing the size of the data transfer to the minimum. On the other hand, web servers can be configured to serve compressed content directly from disk, rather than deflating non-compressed files themselves.
 
 Nginx is able to do this automatically enabling +gzip_static+:
 
-- 
cgit v1.2.3


From 20c59dd214b771efd978c7b35b314a785ffc176a 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:17:14 +0200
Subject: Fix failing tests.

---
 railties/test/application/rack/logger_test.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 8b2b2f1802..387eb25525 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -12,6 +12,8 @@ module ApplicationTests
         build_app
         require "#{app_path}/config/environment"
         super
+        @logger = MockLogger.new
+        Rails.stubs(:logger).returns(@logger)
       end
 
       def teardown
-- 
cgit v1.2.3


From aef62c4b4e89e7fa91973c188c9e7f281a44ecd0 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:29:38 +0200
Subject: Scaffold returns 204 No Content for API requests without content.
 This makes scaffold work with jQuery out of the box.

---
 railties/CHANGELOG                                                    | 2 ++
 .../generators/rails/scaffold_controller/templates/controller.rb      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 7f7b24804d..404bc73b0b 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.2.0 (unreleased)*
 
+* Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box. [José Valim]
+
 * Updated Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications [DHH]
 
 * Default options to `rails new` can be set in ~/.railsrc [Guillermo Iguaran]
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
index 32b961d9fc..4ff15fd288 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
@@ -62,7 +62,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[:#{singular_table_name}]") %>
         format.html { redirect_to @<%= singular_table_name %>, <%= key_value :notice, "'#{human_name} was successfully updated.'" %> }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
         format.json { render <%= key_value :json, "@#{orm_instance.errors}" %>, <%= key_value :status, ':unprocessable_entity' %> }
@@ -78,7 +78,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to <%= index_helper %>_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end
-- 
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(-)

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 2e62af310d98fba78f338d916f7c17996446bc40 Mon Sep 17 00:00:00 2001
From: bradrobertson <brad@influitive.com>
Date: Wed, 26 Oct 2011 09:31:37 -0400
Subject: correct documentation on initialize method to accept a single
 parameter

---
 activemodel/lib/active_model/validator.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index 0e444738ba..35ec98c822 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -57,7 +57,7 @@ module ActiveModel #:nodoc:
   # To add behavior to the initialize method, use the following signature:
   #
   #   class MyValidator < ActiveModel::Validator
-  #     def initialize(record, options)
+  #     def initialize(options)
   #       super
   #       @my_custom_field = options[:field_name] || :first_name
   #     end
-- 
cgit v1.2.3


From 0d0176c4ffe5c58fd1002efbd8f7bd45a8872e33 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Wed, 26 Oct 2011 18:20:12 +0100
Subject: Allow instances to disable record_timestamps

---
 activerecord/lib/active_record/timestamp.rb |  2 +-
 activerecord/test/cases/timestamp_test.rb   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index 4d5e469a7f..0c760e9850 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -33,7 +33,7 @@ module ActiveRecord
     extend ActiveSupport::Concern
 
     included do
-      class_attribute :record_timestamps, :instance_writer => false
+      class_attribute :record_timestamps
       self.record_timestamps = true
     end
 
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 4445a12e1d..447aa29ffe 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -60,6 +60,16 @@ class TimestampTest < ActiveRecord::TestCase
     Developer.record_timestamps = true
   end
 
+  def test_saving_when_instance_record_timestamps_is_false_doesnt_update_its_timestamp
+    @developer.record_timestamps = false
+    assert Developer.record_timestamps
+
+    @developer.name = "John Smith"
+    @developer.save!
+
+    assert_equal @previously_updated_at, @developer.updated_at
+  end
+
   def test_touching_an_attribute_updates_timestamp
     previously_created_at = @developer.created_at
     @developer.touch(:created_at)
-- 
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(-)

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 177f893a28ca2bdf2bdb204e8af139ed90f3266d Mon Sep 17 00:00:00 2001
From: Denis Odorcic <denis.odorcic@jadedpixel.com>
Date: Thu, 27 Oct 2011 02:16:59 -0400
Subject: Fix railtie configuration test calling PostsController#create which
 didn't exist

---
 railties/test/application/configuration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 97ad47ac14..f356805d6e 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -476,7 +476,7 @@ module ApplicationTests
 
       app_file 'app/controllers/posts_controller.rb', <<-RUBY
       class PostsController < ApplicationController
-        def index
+        def create
           render :text => params[:post].inspect
         end
       end
-- 
cgit v1.2.3


From 485b99611b22bb77cbc476ecd65d19b59fa719a8 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 27 Oct 2011 15:41:15 +0530
Subject: Test fix Allow instances to disable record_timestamps

Removed here 0d0176c4ffe5c58fd1002efbd8f7bd45a8872e33
---
 activerecord/test/cases/mass_assignment_security_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index ef35f3341e..a47842f5e0 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -231,7 +231,7 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
 
   def test_protection_against_class_attribute_writers
     [:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names,
-     :default_timezone, :schema_format, :lock_optimistically, :record_timestamps].each do |method|
+     :default_timezone, :schema_format, :lock_optimistically].each do |method|
       assert_respond_to  Task, method
       assert_respond_to  Task, "#{method}="
       assert_respond_to  Task.new, method
-- 
cgit v1.2.3


From 80fc29f36f0410c3beabe54c54823f1f335f96f3 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 27 Oct 2011 15:47:56 +0530
Subject: Adding more checks for instance_writer false

---
 activerecord/test/cases/mass_assignment_security_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index a47842f5e0..23961918f4 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -231,7 +231,8 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
 
   def test_protection_against_class_attribute_writers
     [:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names,
-     :default_timezone, :schema_format, :lock_optimistically].each do |method|
+     :default_timezone, :schema_format, :lock_optimistically, :timestamped_migrations, :default_scopes,
+     :connection_handler, :nested_attributes_options].each do |method|
       assert_respond_to  Task, method
       assert_respond_to  Task, "#{method}="
       assert_respond_to  Task.new, method
-- 
cgit v1.2.3


From 95d9c120d3bdf54173a10b25bbcbf1138815ff2e Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 27 Oct 2011 16:25:50 +0530
Subject: More checks for instance writers.

---
 activerecord/test/cases/mass_assignment_security_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb
index 23961918f4..9fff50edcb 100644
--- a/activerecord/test/cases/mass_assignment_security_test.rb
+++ b/activerecord/test/cases/mass_assignment_security_test.rb
@@ -232,7 +232,8 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase
   def test_protection_against_class_attribute_writers
     [:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names,
      :default_timezone, :schema_format, :lock_optimistically, :timestamped_migrations, :default_scopes,
-     :connection_handler, :nested_attributes_options].each do |method|
+     :connection_handler, :nested_attributes_options, :_attr_readonly, :attribute_types_cached_by_default,
+     :attribute_method_matchers, :time_zone_aware_attributes, :skip_time_zone_conversion_for_attributes].each do |method|
       assert_respond_to  Task, method
       assert_respond_to  Task, "#{method}="
       assert_respond_to  Task.new, method
-- 
cgit v1.2.3


From 420f7fd507fd5868adc1e0398c2422aac16d2013 Mon Sep 17 00:00:00 2001
From: Joe Van Dyk <joe@fixieconsulting.com>
Date: Thu, 27 Oct 2011 08:25:42 -0700
Subject: Added failing test case for changing schema in migration not clearing
 the prepared statement cache

---
 activerecord/test/cases/query_cache_test.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb
index b2429d631f..9554386dcf 100644
--- a/activerecord/test/cases/query_cache_test.rb
+++ b/activerecord/test/cases/query_cache_test.rb
@@ -170,6 +170,18 @@ end
 class QueryCacheExpiryTest < ActiveRecord::TestCase
   fixtures :tasks, :posts, :categories, :categories_posts
 
+  def test_cache_gets_cleared_after_migration
+    # warm the cache
+    Post.find(1)
+
+    # change the column definition
+    Post.connection.change_column :posts, :title, :string, :limit => 80
+    assert_nothing_raised { Post.find(1) }
+
+    # restore the old definition
+    Post.connection.change_column :posts, :title, :string
+  end
+
   def test_find
     Task.connection.expects(:clear_query_cache).times(1)
 
-- 
cgit v1.2.3


From 4a065d56edcafacc99196522ea35fe28c5f45937 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 27 Oct 2011 10:55:52 -0700
Subject: clear statement cache when tables are altered

---
 .../lib/active_record/connection_adapters/postgresql_adapter.rb     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 3d084bb178..e8a43e7bce 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -922,12 +922,14 @@ module ActiveRecord
       # Example:
       #   rename_table('octopuses', 'octopi')
       def rename_table(name, new_name)
+        clear_cache!
         execute "ALTER TABLE #{quote_table_name(name)} RENAME TO #{quote_table_name(new_name)}"
       end
 
       # Adds a new column to the named table.
       # See TableDefinition#column for details of the options you can use.
       def add_column(table_name, column_name, type, options = {})
+        clear_cache!
         add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
         add_column_options!(add_column_sql, options)
 
@@ -936,6 +938,7 @@ module ActiveRecord
 
       # Changes the column of a table.
       def change_column(table_name, column_name, type, options = {})
+        clear_cache!
         quoted_table_name = quote_table_name(table_name)
 
         execute "ALTER TABLE #{quoted_table_name} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
@@ -946,10 +949,12 @@ module ActiveRecord
 
       # Changes the default value of a table column.
       def change_column_default(table_name, column_name, default)
+        clear_cache!
         execute "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{quote(default)}"
       end
 
       def change_column_null(table_name, column_name, null, default = nil)
+        clear_cache!
         unless null || default.nil?
           execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
         end
@@ -958,6 +963,7 @@ module ActiveRecord
 
       # Renames a column in a table.
       def rename_column(table_name, column_name, new_column_name)
+        clear_cache!
         execute "ALTER TABLE #{quote_table_name(table_name)} RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
       end
 
-- 
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(-)

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 f936996f69ec728b7c0d38cd30084fc74943f9c7 Mon Sep 17 00:00:00 2001
From: Joost Baaij <joost@spacebabies.nl>
Date: Fri, 28 Oct 2011 13:24:14 +0200
Subject: Updated links to authentication plugins.

Removed mention of restful_authentication.
Added devise and authlogic.
Also mention Rails 3.1 built-in logic.
---
 railties/guides/source/security.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/security.textile b/railties/guides/source/security.textile
index a499ef3d39..c2ef7bf9b5 100644
--- a/railties/guides/source/security.textile
+++ b/railties/guides/source/security.textile
@@ -474,7 +474,7 @@ h3. User Management
 
 -- _Almost every web application has to deal with authorization and authentication. Instead of rolling your own, it is advisable to use common plug-ins. But keep them up-to-date, too. A few additional precautions can make your application even more secure._
 
-There are some authorization and authentication plug-ins for Rails available. A good one saves only encrypted passwords, not plain-text passwords. The most popular plug-in is +restful_authentication+ which protects from session fixation, too. However, earlier versions allowed you to login without user name and password in certain circumstances.
+There are a number of authentication plug-ins for Rails available. Good ones, such as the popular "devise":https://github.com/plataformatec/devise and "authlogic":https://github.com/binarylogic/authlogic, store only encrypted passwords, not plain-text passwords. In Rails 3.1 you can use the built-in +has_secure_password+ method which has similar features.
 
 Every new user gets an activation code to activate his account when he gets an e-mail with a link in it. After activating the account, the activation_code columns will be set to NULL in the database. If someone requested an URL like these, he would be logged in as the first activated user found in the database (and chances are that this is the administrator):
 
-- 
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(-)

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 0fc531392d1f606054a6d6e394304c72a846d4c8 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 29 Oct 2011 01:07:54 -0700
Subject: let demodulize do less work, and add tests

This is also faster on 1.9.
---
 activesupport/lib/active_support/inflector/methods.rb | 4 +++-
 activesupport/test/inflector_test.rb                  | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 934529d496..454637191e 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -166,7 +166,9 @@ module ActiveSupport
     #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
     #   "Inflections".demodulize                                       # => "Inflections"
     def demodulize(class_name_in_module)
-      class_name_in_module.to_s.gsub(/^.*::/, '')
+      # If you remove the module part of an empty string, you get an empty string.
+      # That's why the regexp uses the * quantifier.
+      class_name_in_module.to_s[/[^:]*\z/]
     end
 
     # Creates a foreign key name from a class name.
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 5c956e0075..7d15b3c7e5 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -194,6 +194,8 @@ class InflectorTest < Test::Unit::TestCase
 
   def test_demodulize
     assert_equal "Account", ActiveSupport::Inflector.demodulize("MyApplication::Billing::Account")
+    assert_equal "Account", ActiveSupport::Inflector.demodulize("Account")
+    assert_equal "", ActiveSupport::Inflector.demodulize("")
   end
 
   def test_foreign_key
-- 
cgit v1.2.3


From 3fa8f362ad09a6f94ab012094014e31513ee36e0 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sat, 29 Oct 2011 15:45:04 +0530
Subject: method redefined warning removed!

---
 railties/lib/rails/test_unit/testing.rake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index fa01f42c5b..3d87529ad4 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -61,6 +61,7 @@ end
 
 # Recreated here from Active Support because :uncommitted needs it before Rails is available
 module Kernel
+  remove_method :silence_stderr # Removing old method to prevent method redefined warning
   def silence_stderr
     old_stderr = STDERR.dup
     STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
-- 
cgit v1.2.3


From 010622bb989cb9fa3aac600a7fa7bcb894bb081a Mon Sep 17 00:00:00 2001
From: Hendy Tanata <htanata@gmail.com>
Date: Sat, 15 Oct 2011 17:20:54 +0800
Subject: On inpsect routes, show :controller and :action to indicate dynamic.

---
 railties/lib/rails/application/route_inspector.rb | 15 ++++++++-------
 railties/test/application/route_inspect_test.rb   | 12 ++++++++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/railties/lib/rails/application/route_inspector.rb b/railties/lib/rails/application/route_inspector.rb
index 8c6911e6bb..8252f21aa7 100644
--- a/railties/lib/rails/application/route_inspector.rb
+++ b/railties/lib/rails/application/route_inspector.rb
@@ -10,20 +10,21 @@ module Rails
         end
 
         routes = all_routes.collect do |route|
+          route_reqs = route.requirements
 
-          reqs = route.requirements.dup
           rack_app = route.app unless route.app.class.name.to_s =~ /^ActionDispatch::Routing/
 
-          endpoint = rack_app ? rack_app.inspect : "#{reqs[:controller]}##{reqs[:action]}"
-          constraints = reqs.except(:controller, :action)
+          controller = route_reqs[:controller] || ':controller'
+          action     = route_reqs[:action]     || ':action'
 
-          reqs = endpoint == '#' ? '' : endpoint
+          endpoint = rack_app ? rack_app.inspect : "#{controller}##{action}"
+          constraints = route_reqs.except(:controller, :action)
 
-          unless constraints.empty?
-            reqs = reqs.empty? ? constraints.inspect : "#{reqs} #{constraints.inspect}"
-          end
+          reqs = endpoint
+          reqs += " #{constraints.inspect}" unless constraints.empty?
 
           verb = route.verb.source.gsub(/[$^]/, '')
+
           {:name => route.name.to_s, :verb => verb, :path => route.path.spec.to_s, :reqs => reqs}
         end
 
diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb
index add8256b5d..78980705ed 100644
--- a/railties/test/application/route_inspect_test.rb
+++ b/railties/test/application/route_inspect_test.rb
@@ -49,12 +49,20 @@ module ApplicationTests
       assert_equal ["root  / pages#main"], output
     end
 
+    def test_inspect_routes_shows_dynamic_action_route
+      @set.draw do
+        match 'api/:action' => 'api'
+      end
+      output = @inspector.format @set.routes
+      assert_equal ["  /api/:action(.:format) api#:action"], output
+    end
+
     def test_inspect_routes_shows_controller_and_action_only_route
       @set.draw do
         match ':controller/:action'
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller/:action(.:format) "], output
+      assert_equal ["  /:controller/:action(.:format) :controller#:action"], output
     end
 
     def test_inspect_routes_shows_controller_and_action_route_with_constraints
@@ -62,7 +70,7 @@ module ApplicationTests
         match ':controller(/:action(/:id))', :id => /\d+/
       end
       output = @inspector.format @set.routes
-      assert_equal ["  /:controller(/:action(/:id))(.:format) {:id=>/\\d+/}"], output
+      assert_equal ["  /:controller(/:action(/:id))(.:format) :controller#:action {:id=>/\\d+/}"], output
     end
 
     def test_rake_routes_shows_route_with_defaults
-- 
cgit v1.2.3


From 596d625c9b7f3a95cb8460d495b328d322d5bee6 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 01:32:02 +0900
Subject: removed reference to SynchronizedMemoryStore and
 CompressedMemCacheStore (the remaining code from 9cafc28874)

---
 activesupport/lib/active_support/cache.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 95d936b32f..8cb74b2a86 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -16,8 +16,6 @@ module ActiveSupport
     autoload :FileStore, 'active_support/cache/file_store'
     autoload :MemoryStore, 'active_support/cache/memory_store'
     autoload :MemCacheStore, 'active_support/cache/mem_cache_store'
-    autoload :SynchronizedMemoryStore, 'active_support/cache/synchronized_memory_store'
-    autoload :CompressedMemCacheStore, 'active_support/cache/compressed_mem_cache_store'
 
     # These options mean something to all cache implementations. Individual cache
     # implementations may support additional options.
-- 
cgit v1.2.3


From 7b65d12db5951682666a41fe864b53ad5ec510ac Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 01:55:09 +0900
Subject: fix a document for race_condition_ttl.
 ActiveSupport::Cache::MemoryCache isn't exist

---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 95d936b32f..b9cdd9c6b3 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -232,7 +232,7 @@ module ActiveSupport
       # <tt>:race_condition_ttl</tt> does not play any role.
       #
       #   # Set all values to expire after one minute.
-      #   cache = ActiveSupport::Cache::MemoryCache.new(:expires_in => 1.minute)
+      #   cache = ActiveSupport::Cache::MemoryStore.new(:expires_in => 1.minute)
       #
       #   cache.write("foo", "original value")
       #   val_1 = nil
-- 
cgit v1.2.3


From 3b546afd049221fd4aa407d6b99f1c4de312c704 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 03:14:35 +0900
Subject: avoided to call  twice

---
 activesupport/lib/active_support/cache.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 8cb74b2a86..df3602f860 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -559,7 +559,7 @@ module ActiveSupport
           @value = nil
         else
           @value = Marshal.dump(value)
-          if should_compress?(value, options)
+          if should_compress?(@value, options)
             @value = Zlib::Deflate.deflate(@value)
             @compressed = true
           end
@@ -613,13 +613,10 @@ module ActiveSupport
       end
 
       private
-        def should_compress?(value, options)
-          if options[:compress] && value
-            unless value.is_a?(Numeric)
-              compress_threshold = options[:compress_threshold] || DEFAULT_COMPRESS_LIMIT
-              serialized_value = value.is_a?(String) ? value : Marshal.dump(value)
-              return true if serialized_value.size >= compress_threshold
-            end
+        def should_compress?(serialized_value, options)
+          if options[:compress]
+            compress_threshold = options[:compress_threshold] || DEFAULT_COMPRESS_LIMIT
+            return true if serialized_value.size >= compress_threshold
           end
           false
         end
-- 
cgit v1.2.3


From eabda416b7c66f3b8d03237e7334bd2d14ff9190 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 29 Oct 2011 14:14:13 -0700
Subject: Removing db/seeds.rb is fine. Don't blow up.

---
 railties/lib/rails/engine.rb          | 2 +-
 railties/test/railties/engine_test.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 2d25273050..1c9627734e 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -488,7 +488,7 @@ module Rails
     # Blog::Engine.load_seed
     def load_seed
       seed_file = paths["db/seeds"].existent.first
-      load(seed_file) if File.exist?(seed_file)
+      load(seed_file) if seed_file && File.exist?(seed_file)
     end
 
     # Add configured load paths to ruby load paths and remove duplicates.
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 06a60cd858..22dbcf9644 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -455,12 +455,18 @@ module RailtiesTest
 
       Rails.application.load_seed
       assert Rails.application.config.app_seeds_loaded
-      assert_raise(NoMethodError) do  Bukkits::Engine.config.bukkits_seeds_loaded end
+      assert_raise(NoMethodError) { Bukkits::Engine.config.bukkits_seeds_loaded }
 
       Bukkits::Engine.load_seed
       assert Bukkits::Engine.config.bukkits_seeds_loaded
     end
 
+    test "skips nonexistent seed data" do
+      FileUtils.rm "#{app_path}/db/seeds.rb"
+      boot_rails
+      assert_nil Rails.application.load_seed
+    end
+
     test "using namespace more than once on one module should not overwrite _railtie method" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module AppTemplate
-- 
cgit v1.2.3


From 11f6795b238172c4a13176062bd38b83285799b7 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 29 Oct 2011 18:03:35 -0700
Subject: defines Module#qualified_const_(defined?|get|set) and
 String#deconstantize

This commit also implements a faster version of #demodulize I was unable
to isolate with git add --patch.

Not a big fan of the name #deconstantize. It complements #demodulize
getting rid of the rightmost constant, hence the name, but it is
unrelated to the well-known #constantize. So unsure. Could not come
with anything better, please feel free to rename.
---
 activesupport/CHANGELOG                            |  6 ++
 .../lib/active_support/core_ext/module.rb          |  3 +-
 .../core_ext/module/qualified_const.rb             | 64 +++++++++++++++
 .../active_support/core_ext/string/inflections.rb  | 15 ++++
 activesupport/lib/active_support/dependencies.rb   | 14 ++--
 .../lib/active_support/inflector/methods.rb        | 29 +++++--
 .../test/core_ext/module/qualified_const_test.rb   | 94 ++++++++++++++++++++++
 activesupport/test/core_ext/string_ext_test.rb     |  4 +
 activesupport/test/inflector_test.rb               | 12 +++
 .../source/active_support_core_extensions.textile  | 83 +++++++++++++++++++
 10 files changed, 311 insertions(+), 13 deletions(-)
 create mode 100644 activesupport/lib/active_support/core_ext/module/qualified_const.rb
 create mode 100644 activesupport/test/core_ext/module/qualified_const_test.rb

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index d3a838cff0..8609198641 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,11 @@
 *Rails 3.2.0 (unreleased)*
 
+* Module#qualified_const_(defined?|get|set) are analogous to the corresponding methods
+  in the standard API, but accept qualified constant names. [fxn]
+
+* Added inflection #deconstantize which complements #demodulize. This inflection
+  removes the righmost segment in a qualified constant name. [fxn]
+
 * Added ActiveSupport:TaggedLogging that can wrap any standard Logger class to provide tagging capabilities [DHH]
 
     Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
diff --git a/activesupport/lib/active_support/core_ext/module.rb b/activesupport/lib/active_support/core_ext/module.rb
index 9fed346b7c..f399fce410 100644
--- a/activesupport/lib/active_support/core_ext/module.rb
+++ b/activesupport/lib/active_support/core_ext/module.rb
@@ -8,4 +8,5 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/synchronization'
 require 'active_support/core_ext/module/deprecation'
 require 'active_support/core_ext/module/remove_method'
-require 'active_support/core_ext/module/method_names'
\ No newline at end of file
+require 'active_support/core_ext/module/method_names'
+require 'active_support/core_ext/module/qualified_const'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/core_ext/module/qualified_const.rb b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
new file mode 100644
index 0000000000..d1a0ee2f83
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/module/qualified_const.rb
@@ -0,0 +1,64 @@
+require 'active_support/core_ext/string/inflections'
+
+#--
+# Allows code reuse in the methods below without polluting Module.
+#++
+module QualifiedConstUtils
+  def self.raise_if_absolute(path)
+    raise NameError, "wrong constant name #$&" if path =~ /\A::[^:]+/
+  end
+
+  def self.names(path)
+    path.split('::')
+  end
+end
+
+##
+# Extends the API for constants to be able to deal with qualified names. Arguments
+# are assumed to be relative to the receiver.
+#
+#--
+# Qualified names are required to be relative because we are extending existing
+# methods that expect constant names, ie, relative paths of length 1. For example,
+# Object.const_get("::String") raises NameError and so does qualified_const_get.
+#++
+class Module
+  if method(:const_defined?).arity == 1
+    def qualified_const_defined?(path)
+      QualifiedConstUtils.raise_if_absolute(path)
+
+      QualifiedConstUtils.names(path).inject(self) do |mod, name|
+        return unless mod.const_defined?(name)
+        mod.const_get(name)
+      end
+      return true
+    end
+  else
+    def qualified_const_defined?(path, search_parents=true)
+      QualifiedConstUtils.raise_if_absolute(path)
+
+      QualifiedConstUtils.names(path).inject(self) do |mod, name|
+        return unless mod.const_defined?(name, search_parents)
+        mod.const_get(name)
+      end
+      return true
+    end
+  end
+
+  def qualified_const_get(path)
+    QualifiedConstUtils.raise_if_absolute(path)
+
+    QualifiedConstUtils.names(path).inject(self) do |mod, name|
+      mod.const_get(name)
+    end
+  end
+
+  def qualified_const_set(path, value)
+    QualifiedConstUtils.raise_if_absolute(path)
+
+    const_name = path.demodulize
+    mod_name = path.deconstantize
+    mod = mod_name.empty? ? self : qualified_const_get(mod_name)
+    mod.const_set(const_name, value)
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index fd91b3cacb..9356940650 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -117,10 +117,25 @@ class String
   #
   #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
   #   "Inflections".demodulize                                       # => "Inflections"
+  #
+  # See also +deconstatize+.
   def demodulize
     ActiveSupport::Inflector.demodulize(self)
   end
 
+  # Removes the rightmost segment from the constant expression in the string.
+  #
+  #   "Net::HTTP".deconstantize   # => "Net"
+  #   "::Net::HTTP".deconstantize # => "::Net"
+  #   "String".deconstantize      # => ""
+  #   "::String".deconstantize    # => ""
+  #   "".deconstantize            # => ""
+  #
+  # See also +demodulize+.
+  def deconstantize
+    ActiveSupport::Inflector.deconstantize(self)
+  end
+
   # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
   #
   # ==== Examples
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index c072a8e646..b3ac271778 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -5,6 +5,7 @@ require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/module/anonymous'
+require 'active_support/core_ext/module/qualified_const'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/name_error'
@@ -357,12 +358,13 @@ module ActiveSupport #:nodoc:
     end
 
     # Is the provided constant path defined?
-    def qualified_const_defined?(path)
-      names = path.sub(/^::/, '').to_s.split('::')
-
-      names.inject(Object) do |mod, name|
-        return false unless local_const_defined?(mod, name)
-        mod.const_get name
+    if Module.method(:const_defined?).arity == 1
+      def qualified_const_defined?(path)
+        Object.qualified_const_defined?(path.sub(/^::/, ''))
+      end
+    else
+      def qualified_const_defined?(path)
+        Object.qualified_const_defined?(path.sub(/^::/, ''), false)
       end
     end
 
diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 454637191e..e76ee60dd7 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -160,15 +160,32 @@ module ActiveSupport
       underscored_word.gsub(/_/, '-')
     end
 
-    # Removes the module part from the expression in the string.
+    # Removes the module part from the expression in the string:
     #
-    # Examples:
     #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
     #   "Inflections".demodulize                                       # => "Inflections"
-    def demodulize(class_name_in_module)
-      # If you remove the module part of an empty string, you get an empty string.
-      # That's why the regexp uses the * quantifier.
-      class_name_in_module.to_s[/[^:]*\z/]
+    #
+    # See also +deconstantize+.
+    def demodulize(path)
+      path = path.to_s
+      if i = path.rindex('::')
+        path[(i+2)..-1]
+      else
+        path
+      end
+    end
+
+    # Removes the rightmost segment from the constant expression in the string:
+    #
+    #   "Net::HTTP".deconstantize   # => "Net"
+    #   "::Net::HTTP".deconstantize # => "::Net"
+    #   "String".deconstantize      # => ""
+    #   "::String".deconstantize    # => ""
+    #   "".deconstantize            # => ""
+    #
+    # See also +demodulize+.
+    def deconstantize(path)
+      path.to_s[0...(path.rindex('::') || 0)] # implementation based on the one in facets' Module#spacename
     end
 
     # Creates a foreign key name from a class name.
diff --git a/activesupport/test/core_ext/module/qualified_const_test.rb b/activesupport/test/core_ext/module/qualified_const_test.rb
new file mode 100644
index 0000000000..8af0b9a023
--- /dev/null
+++ b/activesupport/test/core_ext/module/qualified_const_test.rb
@@ -0,0 +1,94 @@
+require 'abstract_unit'
+require 'active_support/core_ext/module/qualified_const'
+
+module QualifiedConstTestMod
+  X = false
+
+  module M
+    X = 1
+
+    class C
+      X = 2
+    end
+  end
+
+  module N
+    include M
+  end
+end
+
+class QualifiedConstTest < ActiveSupport::TestCase
+  test "Object.qualified_const_defined?" do
+    assert Object.qualified_const_defined?("QualifiedConstTestMod")
+    assert !Object.qualified_const_defined?("NonExistingQualifiedConstTestMod")
+
+    assert Object.qualified_const_defined?("QualifiedConstTestMod::X")
+    assert !Object.qualified_const_defined?("QualifiedConstTestMod::Y")
+
+    assert Object.qualified_const_defined?("QualifiedConstTestMod::M::X")
+    assert !Object.qualified_const_defined?("QualifiedConstTestMod::M::Y")
+
+    if Module.method(:const_defined?).arity == 1
+      assert !Object.qualified_const_defined?("QualifiedConstTestMod::N::X")
+    else
+      assert Object.qualified_const_defined?("QualifiedConstTestMod::N::X")
+      assert !Object.qualified_const_defined?("QualifiedConstTestMod::N::X", false)
+      assert Object.qualified_const_defined?("QualifiedConstTestMod::N::X", true)
+    end
+  end
+
+  test "mod.qualified_const_defined?" do
+    assert QualifiedConstTestMod.qualified_const_defined?("M")
+    assert !QualifiedConstTestMod.qualified_const_defined?("NonExistingM")
+
+    assert QualifiedConstTestMod.qualified_const_defined?("M::X")
+    assert !QualifiedConstTestMod.qualified_const_defined?("M::Y")
+
+    assert QualifiedConstTestMod.qualified_const_defined?("M::C::X")
+    assert !QualifiedConstTestMod.qualified_const_defined?("M::C::Y")
+
+    if Module.method(:const_defined?).arity == 1
+      assert !QualifiedConstTestMod.qualified_const_defined?("QualifiedConstTestMod::N::X")
+    else
+      assert QualifiedConstTestMod.qualified_const_defined?("N::X")
+      assert !QualifiedConstTestMod.qualified_const_defined?("N::X", false)
+      assert QualifiedConstTestMod.qualified_const_defined?("N::X", true)
+    end
+  end
+
+  test "qualified_const_get" do
+    assert_equal false, Object.qualified_const_get("QualifiedConstTestMod::X")
+    assert_equal false, QualifiedConstTestMod.qualified_const_get("X")
+    assert_equal 1, QualifiedConstTestMod.qualified_const_get("M::X")
+    assert_equal 1, QualifiedConstTestMod.qualified_const_get("N::X")
+    assert_equal 2, QualifiedConstTestMod.qualified_const_get("M::C::X")
+
+    assert_raise(NameError) { QualifiedConstTestMod.qualified_const_get("M::C::Y")}
+  end
+
+  test "qualified_const_set" do
+    m = Module.new
+    assert_equal m, Object.qualified_const_set("QualifiedConstTestMod2", m)
+    assert_equal m, ::QualifiedConstTestMod2
+
+    # We are going to assign to existing constants on purpose, so silence warnings.
+    silence_warnings do
+      assert_equal true, QualifiedConstTestMod.qualified_const_set("QualifiedConstTestMod::X", true)
+      assert_equal true, QualifiedConstTestMod::X
+
+      assert_equal 10, QualifiedConstTestMod::M.qualified_const_set("X", 10)
+      assert_equal 10, QualifiedConstTestMod::M::X
+    end
+  end
+
+  test "reject absolute paths" do
+    assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X")}
+    assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_defined?("::X::Y")}
+
+    assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X")}
+    assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_get("::X::Y")}
+
+    assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X", nil)}
+    assert_raise(NameError, "wrong constant name ::X") { Object.qualified_const_set("::X::Y", nil)}
+  end
+end
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 4d876954cf..ade09efc56 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -111,6 +111,10 @@ class StringInflectionsTest < Test::Unit::TestCase
     assert_equal "Account", "MyApplication::Billing::Account".demodulize
   end
 
+  def test_deconstantize
+    assert_equal "MyApplication::Billing", "MyApplication::Billing::Account".deconstantize
+  end
+
   def test_foreign_key
     ClassNameToForeignKeyWithUnderscore.each do |klass, foreign_key|
       assert_equal(foreign_key, klass.foreign_key)
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 7d15b3c7e5..6b7e839e43 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -198,6 +198,18 @@ class InflectorTest < Test::Unit::TestCase
     assert_equal "", ActiveSupport::Inflector.demodulize("")
   end
 
+  def test_deconstantize
+    assert_equal "MyApplication::Billing", ActiveSupport::Inflector.deconstantize("MyApplication::Billing::Account")
+    assert_equal "::MyApplication::Billing", ActiveSupport::Inflector.deconstantize("::MyApplication::Billing::Account")
+
+    assert_equal "MyApplication", ActiveSupport::Inflector.deconstantize("MyApplication::Billing")
+    assert_equal "::MyApplication", ActiveSupport::Inflector.deconstantize("::MyApplication::Billing")
+
+    assert_equal "", ActiveSupport::Inflector.deconstantize("Account")
+    assert_equal "", ActiveSupport::Inflector.deconstantize("::Account")
+    assert_equal "", ActiveSupport::Inflector.deconstantize("")
+  end
+
   def test_foreign_key
     ClassNameToForeignKeyWithUnderscore.each do |klass, foreign_key|
       assert_equal(foreign_key, ActiveSupport::Inflector.foreign_key(klass))
diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index c04e49281e..0941953d1c 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -725,6 +725,64 @@ WARNING: This method returns precise results in Ruby 1.9. In older versions of R
 
 NOTE: Defined in +active_support/core_ext/module/introspection.rb+.
 
+h5. Qualified Constant Names
+
+The standard methods +const_defined?+, +const_get+ , and +const_set+ accept
+bare constant names. Active Support extends this API to be able to pass
+relative qualified constant reference expressions.
+
+The new methods are +qualified_const_defined?+, +qualified_const_get+, and
++qualified_const_set+. Their arguments are assumed to be qualified constant
+names relative to their receiver:
+
+<ruby>
+Object.qualified_const_defined?("Math::PI")       # => true
+Object.qualified_const_get("Math::PI")            # => 3.141592653589793
+Object.qualified_const_set("Math::Phi", 1.618034) # => 1.618034
+</ruby>
+
+Arguments may be bare constant names:
+
+<ruby>
+Math.qualified_const_get("E") # => 2.718281828459045
+</ruby>
+
+These methods are analogous to their builtin counterparts. In particular,
++qualified_constant_defined?+ accepts an optional second argument in 1.9
+to be able to say whether you want the predicate to look in the ancestors.
+This flag is taken into account for each constant in the expression while
+walking down the path.
+
+For example, given
+
+<ruby>
+module M
+  X = 1
+end
+
+module N
+  class C
+    include M
+  end
+end
+</ruby>
+
++qualified_const_defined?+ behaves this way:
+
+<ruby>
+N.qualified_const_defined?("C::X", false) # => false (1.9 only)
+N.qualified_const_defined?("C::X", true)  # => true (1.9 only)
+N.qualified_const_defined?("C::X")        # => false in 1.8, true in 1.9
+</ruby>
+
+As the last example implies, in 1.9 the second argument defaults to true,
+as in +const_defined?+.
+
+For coherence with the builtin methods only relative paths are accepted.
+Absolute qualified constant names like +::Math::PI+ raise +NameError+.
+
+NOTE: Defined in +active_support/core_ext/module/qualified_const.rb+.
+
 h4. Synchronization
 
 The +synchronize+ macro declares a method to be synchronized:
@@ -1620,6 +1678,31 @@ end
 
 NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
 
+h5. +deconstantize+
+
+Given a string with a qualified constant reference expression, +deconstantize+ removes the rightmost segment, generally leaving the name of the constant's container:
+
+<ruby>
+"Product".deconstantize                        # => ""
+"Backoffice::UsersController".deconstantize    # => "Backoffice"
+"Admin::Hotel::ReservationUtils".deconstantize # => "Admin::Hotel"
+</ruby>
+
+Active Support for example uses this method in +Module#qualified_const_set+:
+
+<ruby>
+def qualified_const_set(path, value)
+  QualifiedConstUtils.raise_if_absolute(path)
+
+  const_name = path.demodulize
+  mod_name = path.deconstantize
+  mod = mod_name.empty? ? self : qualified_const_get(mod_name)
+  mod.const_set(const_name, value)
+end
+</ruby>
+
+NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
+
 h5. +parameterize+
 
 The method +parameterize+ normalizes its receiver in a way that can be used in pretty URLs.
-- 
cgit v1.2.3


From 9d1ba3755e9af6196240fc18472e2cc4fcbb4911 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 30 Oct 2011 02:08:59 -0700
Subject: fixes a typo (thanks to Alexey Vakhov)

---
 activesupport/lib/active_support/core_ext/string/inflections.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/core_ext/string/inflections.rb b/activesupport/lib/active_support/core_ext/string/inflections.rb
index 9356940650..1e57b586d9 100644
--- a/activesupport/lib/active_support/core_ext/string/inflections.rb
+++ b/activesupport/lib/active_support/core_ext/string/inflections.rb
@@ -118,7 +118,7 @@ class String
   #   "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
   #   "Inflections".demodulize                                       # => "Inflections"
   #
-  # See also +deconstatize+.
+  # See also +deconstantize+.
   def demodulize
     ActiveSupport::Inflector.demodulize(self)
   end
-- 
cgit v1.2.3


From c6b933faa91107a8213f0e8e151f8f1a72f55cdc Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 30 Oct 2011 02:24:30 -0700
Subject: prefer qualified constant "name" to "reference expression", much
 simpler

---
 railties/guides/source/active_support_core_extensions.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 0941953d1c..ff6c5f967f 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -729,7 +729,7 @@ h5. Qualified Constant Names
 
 The standard methods +const_defined?+, +const_get+ , and +const_set+ accept
 bare constant names. Active Support extends this API to be able to pass
-relative qualified constant reference expressions.
+relative qualified constant names.
 
 The new methods are +qualified_const_defined?+, +qualified_const_get+, and
 +qualified_const_set+. Their arguments are assumed to be qualified constant
@@ -1655,7 +1655,7 @@ NOTE: Defined in +active_support/core_ext/string/inflections.rb+.
 
 h5. +demodulize+
 
-Given a string with a qualified constant reference expression, +demodulize+ returns the very constant name, that is, the rightmost part of it:
+Given a string with a qualified constant name, +demodulize+ returns the very constant name, that is, the rightmost part of it:
 
 <ruby>
 "Product".demodulize                        # => "Product"
-- 
cgit v1.2.3


From 38da6249f0449204e0806f3142c0342ad2565344 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 19:18:23 +0900
Subject: fix a document for :compress_threshold. DEFAULT_COMPRESS_LIMIT is
 16K.

---
 activesupport/lib/active_support/cache.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 8b45efaf2a..6535cc1eb5 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -139,7 +139,7 @@ module ActiveSupport
     # large enough to warrant compression. To turn on compression either pass
     # <tt>:compress => true</tt> in the initializer or as an option to +fetch+
     # or +write+. To specify the threshold at which to compress values, set the
-    # <tt>:compress_threshold</tt> option. The default threshold is 32K.
+    # <tt>:compress_threshold</tt> option. The default threshold is 16K.
     class Store
 
       cattr_accessor :logger, :instance_writer => true
-- 
cgit v1.2.3


From 7670a5187d2000a577c9aa982158808550033dfd Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 30 Oct 2011 21:50:17 +0900
Subject: Refactor ActiveSupport::Cache::FileStore. used  method and deleted
 duplicate code.

---
 activesupport/lib/active_support/cache/file_store.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index b431041b76..85e7e21624 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -14,6 +14,7 @@ module ActiveSupport
 
       DIR_FORMATTER = "%03X"
       FILENAME_MAX_SIZE = 230 # max filename size on file system is 255, minus room for timestamp and random characters appended by Tempfile (used by atomic write)
+      EXCLUDED_DIRS = ['.', '..'].freeze
 
       def initialize(cache_path, options = nil)
         super(options)
@@ -22,7 +23,7 @@ module ActiveSupport
       end
 
       def clear(options = nil)
-        root_dirs = Dir.entries(cache_path).reject{|f| f.in?(['.', '..'])}
+        root_dirs = Dir.entries(cache_path).reject{|f| f.in?(EXCLUDED_DIRS)}
         FileUtils.rm_r(root_dirs.collect{|f| File.join(cache_path, f)})
       end
 
@@ -149,7 +150,7 @@ module ActiveSupport
         # Delete empty directories in the cache.
         def delete_empty_directories(dir)
           return if dir == cache_path
-          if Dir.entries(dir).reject{|f| f.in?(['.', '..'])}.empty?
+          if Dir.entries(dir).reject{|f| f.in?(EXCLUDED_DIRS)}.empty?
             File.delete(dir) rescue nil
             delete_empty_directories(File.dirname(dir))
           end
@@ -163,7 +164,7 @@ module ActiveSupport
         def search_dir(dir, &callback)
           return if !File.exist?(dir)
           Dir.foreach(dir) do |d|
-            next if d == "." || d == ".."
+            next if d.in?(EXCLUDED_DIRS)
             name = File.join(dir, d)
             if File.directory?(name)
               search_dir(name, &callback)
-- 
cgit v1.2.3


From 2d337ef080aec2c2e21ede3451f652ab5eaadca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Silva?= <goncalossilva@gmail.com>
Date: Sun, 30 Oct 2011 18:34:49 -0200
Subject: Fix typo on the performance test guide

---
 railties/guides/source/performance_testing.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/performance_testing.textile b/railties/guides/source/performance_testing.textile
index f3ea7e38bc..2440927542 100644
--- a/railties/guides/source/performance_testing.textile
+++ b/railties/guides/source/performance_testing.textile
@@ -447,7 +447,7 @@ h4. Using Ruby-Prof on MRI and REE
 Add Ruby-Prof to your applications' Gemfile if you want to benchmark/profile under MRI or REE:
 
 <ruby>
-gem 'ruby-prof', :path => 'git://github.com/wycats/ruby-prof.git'
+gem 'ruby-prof', :git => 'git://github.com/wycats/ruby-prof.git'
 </ruby>
 
 Now run +bundle install+ and you're ready to go.
-- 
cgit v1.2.3


From d106b34bd582483ebae57f8fa57f8d3649a31829 Mon Sep 17 00:00:00 2001
From: Alexey Vakhov <vakhov@gmail.com>
Date: Mon, 31 Oct 2011 10:36:38 +0400
Subject: Update routing guides, root route should be at the top of the file

---
 railties/guides/source/routing.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/routing.textile b/railties/guides/source/routing.textile
index f281009fee..29c729592b 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -620,7 +620,7 @@ You can specify what Rails should route +"/"+ to with the +root+ method:
 root :to => 'pages#main'
 </ruby>
 
-You should put the +root+ route at the end of the file. You also need to delete the +public/index.html+ file for the root route to take effect.
+You should put the +root+ route at the top of the file, because it is the most popular route and should be matched first. You also need to delete the +public/index.html+ file for the root route to take effect.
 
 h3. Customizing Resourceful Routes
 
-- 
cgit v1.2.3


From ff9c2799c1a065fb132df64da6d19683c647b5b4 Mon Sep 17 00:00:00 2001
From: Laust Rud Jacobsen <laust@object.io>
Date: Tue, 1 Nov 2011 07:29:48 +0100
Subject: dump_schema_information: explicitly order inserts into
 schema_migrations table

This change reduces churn in the db/development_structure.sql file when using :sql as
active_record.schema_format, and makes comparing diffs much easier.

Test ensures the output SQL-statements are lexically ordered by version.
---
 .../connection_adapters/abstract/schema_statements.rb            | 2 +-
 activerecord/test/cases/migration_test.rb                        | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index b4a9e29ef1..910ef3efce 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -405,7 +405,7 @@ module ActiveRecord
 
       def dump_schema_information #:nodoc:
         sm_table = ActiveRecord::Migrator.schema_migrations_table_name
-        migrated = select_values("SELECT version FROM #{sm_table}")
+        migrated = select_values("SELECT version FROM #{sm_table} ORDER BY version")
         migrated.map { |v| "INSERT INTO #{sm_table} (version) VALUES ('#{v}');" }.join("\n\n")
       end
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 49944eced9..4fdb7d2f25 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1339,6 +1339,15 @@ if ActiveRecord::Base.connection.supports_migrations?
       end
     end
 
+    def test_dump_schema_information_outputs_lexically_ordered_versions
+      migration_path = MIGRATIONS_ROOT + '/valid_with_timestamps'
+      ActiveRecord::Migrator.run(:up, migration_path, 20100301010101)
+      ActiveRecord::Migrator.run(:up, migration_path, 20100201010101)
+
+      schema_info = ActiveRecord::Base.connection.dump_schema_information
+      assert_match schema_info, /20100201010101.*20100301010101/m
+    end
+
     def test_finds_pending_migrations
       ActiveRecord::Migrator.up(MIGRATIONS_ROOT + "/interleaved/pass_2", 1)
       migrations = ActiveRecord::Migrator.new(:up, MIGRATIONS_ROOT + "/interleaved/pass_2").pending_migrations
-- 
cgit v1.2.3


From 1afe269a4aa18a815c509d3f0348ed99a9b4b560 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Mon, 31 Oct 2011 19:01:03 +0530
Subject: assert_match takes a regexp and a string in that order

---
 activerecord/test/cases/migration_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 4fdb7d2f25..f61d0315d0 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1345,7 +1345,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       ActiveRecord::Migrator.run(:up, migration_path, 20100201010101)
 
       schema_info = ActiveRecord::Base.connection.dump_schema_information
-      assert_match schema_info, /20100201010101.*20100301010101/m
+      assert_match(/20100201010101.*20100301010101/m, schema_info)
     end
 
     def test_finds_pending_migrations
-- 
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(-)

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(-)

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 dfdbbe059f464a0ab2437a93e9f8222942920155 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Fri, 28 Oct 2011 18:46:18 +1100
Subject: [engines guide] add 'General engine configuration' section

---
 railties/guides/source/engines.textile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/railties/guides/source/engines.textile b/railties/guides/source/engines.textile
index da56f3d0ed..694b36bea1 100644
--- a/railties/guides/source/engines.textile
+++ b/railties/guides/source/engines.textile
@@ -506,6 +506,10 @@ Now instead of the ugly Ruby object output the author's name will be displayed.
 
 h4. Configuring an engine
 
+This section covers firstly how you can make the +user_class+ setting of the Blorgh engine configurable, followed by general configuration tips for the engine.
+
+h5. Setting configuration settings in the application
+
 The next step is to make the class that represents a +User+ in the application customizable for the engine. This is because, as explained before, that class may not always be +User+. To make this customizable, the engine will have a configuration setting called +user_class+ that will be used to specify what the class representing users is inside the application.
 
 To define this configuration setting, you should use a +mattr_accessor+ inside the +Blorgh+ module for the engine, located at +lib/blorgh.rb+ inside the engine. Inside this module, put this line:
@@ -542,6 +546,14 @@ Go ahead and try to create a new post. You will see that it works exactly in the
 
 There are now no strict dependencies on what the class is, only what the class's API must be. The engine simply requires this class to define a +find_or_create_by_name+ method which returns an object of that class to be associated with a post when it's created.
 
+h5. General engine configuration
+
+Within an engine, there may come a time where you wish to use things such as initializers, internationalization or other configuration options. The great news is that these things are entirely possible because a Rails engine shares much the same functionality as a Rails application. In fact, a Rails application's functionality is actually a superset of what is provided by engines!
+
+If you wish to use initializers (code that should run before the engine is loaded), the best place for them is the +config/initializers+ folder. This directory's functionality is explained in the "Initializers section":http://guides.rubyonrails.org/configuring.html#initializers of the Configuring guide.
+
+For locales, simply place the locale files in the +config/locales+ directory, just like you would in an application.
+
 h3. Extending engine functionality
 
 This section looks at overriding or adding functionality to the views, controllers and models provided by an engine.
-- 
cgit v1.2.3


From e28bd7b22698dc2a5df05fe6ab9ceba715452a33 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Tue, 1 Nov 2011 11:18:17 +1100
Subject: [config guide] mention that config methods are to be called on
 Railtie subclasses

---
 railties/guides/source/configuring.textile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index bb494fbd33..cd6e7d116e 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -40,6 +40,8 @@ Rails will use that particular setting to configure Active Record.
 
 h4. Rails General Configuration
 
+These configuration methods are to be called on a +Rails::Railtie+ object, such as a subclass of +Rails::Engine+ or +Rails::Application+.
+
 * +config.after_initialize+ takes a block which will be run _after_ Rails has finished initializing the application. That includes the initialization of the framework itself, plugins, engines, and all the application's initializers in +config/initializers+. Note that this block _will_ be run for rake tasks. Useful for configuring values set up by other initializers:
 
 <ruby>
-- 
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(-)

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(-)

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 ed4bde5a0937f8eadfd806b1f579048bf5ac9b07 Mon Sep 17 00:00:00 2001
From: juandebravo <juandebravo@gmail.com>
Date: Tue, 1 Nov 2011 20:45:00 +0200
Subject: Fix wrong link in initialization doc

---
 railties/guides/source/initialization.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
index f88405a2fd..7710c9bd6c 100644
--- a/railties/guides/source/initialization.textile
+++ b/railties/guides/source/initialization.textile
@@ -817,7 +817,7 @@ def initializer(name, opts = {}, &blk)
 end
 </ruby>
 
-An initializer can be configured to run before or after another initializer, which we'll see a couple of times throughout this initialization process. Anything that inherits from +Rails::Railtie+ may also make use of the +initializer+ method, something which is covered in the "Configuration guide":[http://ryanbigg.com/guides/configuring.html#rails-railtie-initializer].
+An initializer can be configured to run before or after another initializer, which we'll see a couple of times throughout this initialization process. Anything that inherits from +Rails::Railtie+ may also make use of the +initializer+ method, something which is covered in the "Configuration guide":http://guides.rubyonrails.org/configuring.html#rails-railtie-initializer.
 
 The +Initializer+ class here is defined within the +Rails::Initializable+ module and its +initialize+ method is defined to just set up a couple of variables:
 
-- 
cgit v1.2.3


From 9aa880f2e860ff2058dc0d359c6310848b1e4383 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 2 Nov 2011 00:37:18 +0530
Subject: use relative urls for linking to sections in the guides

---
 railties/guides/source/initialization.textile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
index 7710c9bd6c..036b356a37 100644
--- a/railties/guides/source/initialization.textile
+++ b/railties/guides/source/initialization.textile
@@ -525,19 +525,19 @@ silence_warnings do
 end
 </ruby>
 
-These methods can be used to silence STDERR responses and the +silence_stream+ allows you to also silence other streams. Additionally, this mixin allows you to suppress exceptions and capture streams. For more information see the "Silencing Warnings, Streams, and Exceptions":http://guides.rubyonrails.org/active_support_core_extensions.html#silencing-warnings-streams-and-exceptions section from the Active Support Core Extensions Guide.
+These methods can be used to silence STDERR responses and the +silence_stream+ allows you to also silence other streams. Additionally, this mixin allows you to suppress exceptions and capture streams. For more information see the "Silencing Warnings, Streams, and Exceptions":active_support_core_extensions.html#silencing-warnings-streams-and-exceptions section from the Active Support Core Extensions Guide.
 
 h4. +active_support/core_ext/logger.rb+
 
 The next file that is required is another Active Support core extension, this time to the +Logger+ class. This begins by defining the +around_[level]+ helpers for the +Logger+ class as well as other methods such as a +datetime_format+ getter and setter for the +formatter+ object tied to a +Logger+ object.
 
-For more information see the "Extensions to Logger":http://guides.rubyonrails.org/active_support_core_extensions.html#extensions-to-logger section from the Active Support Core Extensions Guide.
+For more information see the "Extensions to Logger":active_support_core_extensions.html#extensions-to-logger section from the Active Support Core Extensions Guide.
 
 h4. +railties/lib/rails/application.rb+
 
 The next file required by +railties/lib/rails.rb+ is +application.rb+. This file defines the +Rails::Application+ constant which the application's class defined in +config/application.rb+ in a standard Rails application depends on. Before the +Rails::Application+ class is defined however, there's some other files that get required first.
 
-The first of these is +active_support/core_ext/hash/reverse_merge+ which can be "read about in the Active Support Core Extensions guide":http://guides.rubyonrails.org/active_support_core_extensions.html#merging under the "Merging" section.
+The first of these is +active_support/core_ext/hash/reverse_merge+ which can be "read about in the Active Support Core Extensions guide":active_support_core_extensions.html#merging under the "Merging" section.
 
 h4. +active_support/file_update_checker.rb+
 
@@ -575,7 +575,7 @@ Now that +rails/initializable.rb+ has finished being required from +rails/railti
 
 h4. +railties/lib/rails/configuration.rb+
 
-This file defines the +Rails::Configuration+ module, containing the +MiddlewareStackProxy+ class as well as the +Generators+ class. The +MiddlewareStackProxy+ class is used for managing the middleware stack for an application, which we'll see later on. The +Generators+ class provides the functionality used for configuring what generators an application uses through the "+config.generators+ option":http://guides.rubyonrails.org/configuring.html#configuring-generators.
+This file defines the +Rails::Configuration+ module, containing the +MiddlewareStackProxy+ class as well as the +Generators+ class. The +MiddlewareStackProxy+ class is used for managing the middleware stack for an application, which we'll see later on. The +Generators+ class provides the functionality used for configuring what generators an application uses through the "+config.generators+ option":configuring.html#configuring-generators.
 
 The first file required in this file is +activesupport/deprecation+.
 
@@ -598,11 +598,11 @@ This file defines the +ActiveSupport::Notifications+ module. Notifications provi
 
 The "API documentation":http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html for +ActiveSupport::Notifications+ explains the usage of this module, including the methods that it defines.
 
-The file required in +active_support/notifications.rb+ is +active_support/core_ext/module/delegation+ which is documented in the "Active Support Core Extensions Guide":http://guides.rubyonrails.org/active_support_core_extensions.html#method-delegation.
+The file required in +active_support/notifications.rb+ is +active_support/core_ext/module/delegation+ which is documented in the "Active Support Core Extensions Guide":active_support_core_extensions.html#method-delegation.
 
 h4. +activesupport/core_ext/array/wrap+
 
-As this file comprises of a core extension, it is covered exclusively in "the Active Support Core Extensions guide":http://guides.rubyonrails.org/active_support_core_extensions.html#wrapping
+As this file comprises of a core extension, it is covered exclusively in "the Active Support Core Extensions guide":active_support_core_extensions.html#wrapping
 
 h4. +activesupport/lib/active_support/deprecation/reporting.rb+
 
@@ -624,7 +624,7 @@ h4. +active_support/ordered_options+
 
 This file is the next file required from +rails/configuration.rb+ is the file that defines +ActiveSupport::OrderedOptions+ which is used for configuration options such as +config.active_support+ and the like.
 
-The next file required is +active_support/core_ext/hash/deep_dup+ which is covered in "Active Support Core Extensions guide":http://guides.rubyonrails.org/active_support_core_extensions.html#deep_dup
+The next file required is +active_support/core_ext/hash/deep_dup+ which is covered in "Active Support Core Extensions guide":active_support_core_extensions.html#deep_dup
 
 The file that is required next from is +rails/paths+
 
@@ -682,7 +682,7 @@ When the module from this file (+Rails::Initializable+) is included, it extends
 
 h4. +railties/lib/rails/engine.rb+
 
-The next file required in +rails/engine.rb+ is +active_support/core_ext/module/delegation+ which is documented in the "Active Support Core Extensions Guide":http://guides.rubyonrails.org/active_support_core_extensions.html#method-delegation.
+The next file required in +rails/engine.rb+ is +active_support/core_ext/module/delegation+ which is documented in the "Active Support Core Extensions Guide":active_support_core_extensions.html#method-delegation.
 
 The next two files after this are Ruby standard library files: +pathname+ and +rbconfig+. The file after these is +rails/engine/railties+.
 
@@ -698,7 +698,7 @@ Once this file has finished loading we jump back to +railties/lib/rails/plugin.r
 
 h4. Back to +railties/lib/rails/plugin.rb+
 
-The next file required in this is a core extension from Active Support called +array/conversions+ which is covered in "this section":http://guides.rubyonrails.org/active_support_core_extensions.html#array-conversions of the Active Support Core Extensions Guide.
+The next file required in this is a core extension from Active Support called +array/conversions+ which is covered in "this section":active_support_core_extensions.html#array-conversions of the Active Support Core Extensions Guide.
 
 Once that file has finished loading, the +Rails::Plugin+ class is defined.
 
@@ -817,7 +817,7 @@ def initializer(name, opts = {}, &blk)
 end
 </ruby>
 
-An initializer can be configured to run before or after another initializer, which we'll see a couple of times throughout this initialization process. Anything that inherits from +Rails::Railtie+ may also make use of the +initializer+ method, something which is covered in the "Configuration guide":http://guides.rubyonrails.org/configuring.html#rails-railtie-initializer.
+An initializer can be configured to run before or after another initializer, which we'll see a couple of times throughout this initialization process. Anything that inherits from +Rails::Railtie+ may also make use of the +initializer+ method, something which is covered in the "Configuration guide":configuring.html#rails-railtie-initializer.
 
 The +Initializer+ class here is defined within the +Rails::Initializable+ module and its +initialize+ method is defined to just set up a couple of variables:
 
-- 
cgit v1.2.3


From 836b6208504a761d6e0427b2709d0a87dfe98e06 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 1 Nov 2011 17:41:37 -0700
Subject: Revert "Disable 1.9.3 builds until upgraded from -preview1 to -rc1"

This reverts commit 8a6acc17bb8badf70e300f599bf0440ee197028c.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4a27f7788d..265124a3af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ script: 'ci/travis.rb'
 rvm:
   - 1.8.7
   - 1.9.2
-  #- 1.9.3 # Disable 1.9.3 builds until Travis is on 1.9.3-rc1.
+  - 1.9.3
 env:
   - "GEM=railties"
   - "GEM=ap,am,amo,ares,as"
-- 
cgit v1.2.3


From 5745a5e85e1900c52d169f79ec0802060e110e21 Mon Sep 17 00:00:00 2001
From: Colin MacKenzie IV <sinisterchipmunk@gmail.com>
Date: Wed, 2 Nov 2011 09:00:18 -0400
Subject: treat USAGE as an ERB template

---
 railties/lib/rails/generators/base.rb                               | 2 +-
 railties/test/fixtures/lib/generators/usage_template/USAGE          | 1 +
 .../lib/generators/usage_template/usage_template_generator.rb       | 5 +++++
 railties/test/generators_test.rb                                    | 6 ++++++
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 railties/test/fixtures/lib/generators/usage_template/USAGE
 create mode 100644 railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb

diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 911f80cf3a..f38a487a4e 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -34,7 +34,7 @@ module Rails
         usage = source_root && File.expand_path("../USAGE", source_root)
 
         @desc ||= if usage && File.exist?(usage)
-          File.read(usage)
+          ERB.new(File.read(usage)).result(binding)
         else
           "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
         end
diff --git a/railties/test/fixtures/lib/generators/usage_template/USAGE b/railties/test/fixtures/lib/generators/usage_template/USAGE
new file mode 100644
index 0000000000..bcd63c52e2
--- /dev/null
+++ b/railties/test/fixtures/lib/generators/usage_template/USAGE
@@ -0,0 +1 @@
+:: <%= 1 + 1 %> ::
\ No newline at end of file
diff --git a/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
new file mode 100644
index 0000000000..078b0f9412
--- /dev/null
+++ b/railties/test/fixtures/lib/generators/usage_template/usage_template_generator.rb
@@ -0,0 +1,5 @@
+require 'rails/generators'
+
+class UsageTemplateGenerator < Rails::Generators::Base
+  source_root File.expand_path("templates", File.dirname(__FILE__))
+end
diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb
index 56329f3183..5f9ee220dc 100644
--- a/railties/test/generators_test.rb
+++ b/railties/test/generators_test.rb
@@ -201,4 +201,10 @@ class GeneratorsTest < Rails::Generators::TestCase
     mspec = Rails::Generators.find_by_namespace :fixjour
     assert mspec.source_paths.include?(File.join(Rails.root, "lib", "templates", "fixjour"))
   end
+  
+  def test_usage_with_embedded_ruby
+    require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", File.dirname(__FILE__))
+    output = capture(:stdout) { Rails::Generators.invoke :usage_template, ['--help'] }
+    assert_match /:: 2 ::/, output
+  end
 end
-- 
cgit v1.2.3


From b3c1cfa2772e64b20681bae8e765f37660087b18 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 2 Nov 2011 23:01:30 +0530
Subject: minor edits in AR validations guide

---
 .../source/active_record_validations_callbacks.textile       | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile
index 665e7f9ccc..4c1f66aedf 100644
--- a/railties/guides/source/active_record_validations_callbacks.textile
+++ b/railties/guides/source/active_record_validations_callbacks.textile
@@ -796,17 +796,9 @@ person.errors.size # => 0
 
 h3. Displaying Validation Errors in the View
 
-Rails maintains an official plugin, DynamicForm, that provides helpers to display the error messages of your models in your view templates. You can install it as a plugin or as a Gem.
+"DynamicForm":https://github.com/joelmoss/dynamic_form provides helpers to display the error messages of your models in your view templates.
 
-h4. Installing as a plugin
-
-<shell>
-$ rails plugin install git://github.com/joelmoss/dynamic_form.git
-</shell>
-
-h4. Installing as a Gem
-
-Add this line in your Gemfile:
+You can install it as a gem by adding this line to your Gemfile:
 
 <ruby>
 gem "dynamic_form"
-- 
cgit v1.2.3


From bc09a11a666a1fba848d866dd61bf7123d4d5759 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 2 Nov 2011 23:34:27 +0530
Subject: minor edit

---
 railties/guides/source/action_view_overview.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile
index 40cde6ad84..e2b69fa0d5 100644
--- a/railties/guides/source/action_view_overview.textile
+++ b/railties/guides/source/action_view_overview.textile
@@ -16,7 +16,7 @@ Action View and Action Controller are the two major components of Action Pack. I
 
 Action View templates are written using embedded Ruby in tags mingled with HTML. To avoid cluttering the templates with boilerplate code, a number of helper classes provide common behavior for forms, dates, and strings. It's also easy to add new helpers to your application as it evolves.
 
-Note: Some features of Action View are tied to Active Record, but that doesn't mean that Action View depends on Active Record. Action View is an independent package that can be used with any sort of backend.
+NOTE. Some features of Action View are tied to Active Record, but that doesn't mean that Action View depends on Active Record. Action View is an independent package that can be used with any sort of backend.
 
 h3. Using Action View with Rails
 
-- 
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(-)

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(-)

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 b4b178f7e9a00a0235574a773cdbc06fe856acaf Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 3 Nov 2011 10:23:42 +0000
Subject: Fix #3247.

Fixes creating records in a through association with a polymorphic source
type.
---
 activerecord/CHANGELOG                                            | 8 +++++++-
 .../lib/active_record/associations/through_association.rb         | 2 +-
 .../test/cases/associations/has_many_through_associations_test.rb | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 798d875034..698a337dcc 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -8,7 +8,7 @@
     class User < ActiveRecord::Base
       store :settings, accessors: [ :color, :homepage ]
     end
-    
+
     u = User.new(color: 'black', homepage: '37signals.com')
     u.color                          # Accessor stored attribute
     u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
@@ -37,6 +37,12 @@
 
   [Aaron Christy]
 
+*Rails 3.1.2 (unreleased)*
+
+* Fix creating records in a through association with a polymorphic source type. [GH #3247]
+
+  [Jon Leighton]
+
 *Rails 3.1.1 (October 7, 2011)*
 
 * Add deprecation for the preload_associations method. Fixes #3022.
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb
index b347a94978..f95e5337c2 100644
--- a/activerecord/lib/active_record/associations/through_association.rb
+++ b/activerecord/lib/active_record/associations/through_association.rb
@@ -44,7 +44,7 @@ module ActiveRecord
           join_attributes = {
             source_reflection.foreign_key =>
               records.map { |record|
-                record.send(source_reflection.association_primary_key)
+                record.send(source_reflection.association_primary_key(reflection.klass))
               }
           }
 
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index b703c96ec1..2f4dd9e55c 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -825,4 +825,9 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   def test_explicitly_joining_join_table
     assert_equal owners(:blackbeard).toys, owners(:blackbeard).toys.with_pet
   end
+
+  def test_has_many_through_with_polymorphic_source
+    post = tags(:general).tagged_posts.create! :title => "foo", :body => "bar"
+    assert_equal [tags(:general)], post.reload.tags
+  end
 end
-- 
cgit v1.2.3


From 71bc921ec8ac89840077bb54752282a3d89429f6 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 3 Nov 2011 12:37:37 +0000
Subject: Fix adding multiple instances of the same record to a has_many
 :through.

Fixes #3425.
---
 activerecord/CHANGELOG                             |  4 ++
 .../associations/has_many_through_association.rb   | 64 +++++++++++++++-------
 .../has_many_through_associations_test.rb          | 10 ++++
 3 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 698a337dcc..fac9ad1188 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -39,6 +39,10 @@
 
 *Rails 3.1.2 (unreleased)*
 
+* Fix adding multiple instances of the same record to a has_many :through. [GH #3425]
+
+  [Jon Leighton]
+
 * Fix creating records in a through association with a polymorphic source type. [GH #3247]
 
   [Jon Leighton]
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 2e818dca5d..d82d041b69 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -6,6 +6,11 @@ module ActiveRecord
     class HasManyThroughAssociation < HasManyAssociation #:nodoc:
       include ThroughAssociation
 
+      def initialize(owner, reflection)
+        super
+        @through_records = {}
+      end
+
       # Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been
       # loaded and calling collection.size if it has. If it's more likely than not that the collection does
       # have a size larger than zero, and you need to fetch that collection afterwards, it'll take one fewer
@@ -42,27 +47,42 @@ module ActiveRecord
           end
         end
 
-        through_record(record).save!
+        save_through_record(record)
         update_counter(1)
         record
       end
 
       private
 
-        def through_record(record)
-          through_association = owner.association(through_reflection.name)
-          attributes = construct_join_attributes(record)
-
-          through_record = Array.wrap(through_association.target).find { |candidate|
-            candidate.attributes.slice(*attributes.keys) == attributes
-          }
+        def through_association
+          owner.association(through_reflection.name)
+        end
 
-          unless through_record
-            through_record = through_association.build(attributes)
+        # We temporarily cache through record that has been build, because if we build a
+        # through record in build_record and then subsequently call insert_record, then we
+        # want to use the exact same object.
+        #
+        # However, after insert_record has been called, we clear the cache entry because
+        # we want it to be possible to have multiple instances of the same record in an
+        # association
+        def build_through_record(record)
+          @through_records[record.object_id] ||= begin
+            through_record = through_association.build(construct_join_attributes(record))
             through_record.send("#{source_reflection.name}=", record)
+            through_record
           end
+        end
 
-          through_record
+        def save_through_record(record)
+          build_through_record(record).save!
+        ensure
+          @through_records.delete(record.object_id)
+        end
+
+        def through_record(record)
+          attributes = construct_join_attributes(record)
+          candidates = Array.wrap(through_association.target)
+          candidates.find { |c| c.attributes.slice(*attributes.keys) == attributes }
         end
 
         def build_record(attributes, options = {})
@@ -73,9 +93,9 @@ module ActiveRecord
           inverse = source_reflection.inverse_of
           if inverse
             if inverse.macro == :has_many
-              record.send(inverse.name) << through_record(record)
+              record.send(inverse.name) << build_through_record(record)
             elsif inverse.macro == :has_one
-              record.send("#{inverse.name}=", through_record(record))
+              record.send("#{inverse.name}=", build_through_record(record))
             end
           end
 
@@ -104,7 +124,7 @@ module ActiveRecord
         def delete_records(records, method)
           ensure_not_nested
 
-          through = owner.association(through_reflection.name)
+          through = through_association
           scope   = through.scoped.where(construct_join_attributes(*records))
 
           case method
@@ -126,14 +146,16 @@ module ActiveRecord
         end
 
         def delete_through_records(through, records)
-          if through_reflection.macro == :has_many
-            records.each do |record|
-              through.target.delete(through_record(record))
-            end
-          else
-            records.each do |record|
-              through.target = nil if through.target == through_record(record)
+          records.each do |record|
+            through_record = through_record(record)
+
+            if through_reflection.macro == :has_many
+              through.target.delete(through_record)
+            else
+              through.target = nil if through.target == through_record
             end
+
+            @through_records.delete(record.object_id)
           end
         end
 
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 2f4dd9e55c..115e06144e 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -67,6 +67,16 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_associate_existing_record_twice_should_add_records_twice
+    post   = posts(:thinking)
+    person = people(:david)
+
+    assert_difference 'post.people.count', 2 do
+      post.people << person
+      post.people << person
+    end
+  end
+
   def test_associating_new
     assert_queries(1) { posts(:thinking) }
     new_person = nil # so block binding catches it
-- 
cgit v1.2.3


From 19b2a5f2bdd5bf6404bfc3e574b7477038e9b2bf Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 3 Nov 2011 13:12:04 +0000
Subject: Remove all revelant through records.

If a record is removed from a has_many :through, all of the join records
relating to that record should also be removed from the through
association's target.

(Previously the records were removed in the database, but only one was
removed from the in-memory target array.)
---
 activerecord/CHANGELOG                                 |  5 +++++
 .../associations/has_many_through_association.rb       | 18 +++++++++---------
 .../associations/has_many_through_associations_test.rb | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index fac9ad1188..203b110e98 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -39,6 +39,11 @@
 
 *Rails 3.1.2 (unreleased)*
 
+* If a record is removed from a has_many :through, all of the join records relating to that
+  record should also be removed from the through association's target.
+
+  [Jon Leighton]
+
 * Fix adding multiple instances of the same record to a has_many :through. [GH #3425]
 
   [Jon Leighton]
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index d82d041b69..6ba405ba4c 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -79,12 +79,6 @@ module ActiveRecord
           @through_records.delete(record.object_id)
         end
 
-        def through_record(record)
-          attributes = construct_join_attributes(record)
-          candidates = Array.wrap(through_association.target)
-          candidates.find { |c| c.attributes.slice(*attributes.keys) == attributes }
-        end
-
         def build_record(attributes, options = {})
           ensure_not_nested
 
@@ -145,14 +139,20 @@ module ActiveRecord
           update_counter(-count)
         end
 
+        def through_records_for(record)
+          attributes = construct_join_attributes(record)
+          candidates = Array.wrap(through_association.target)
+          candidates.find_all { |c| c.attributes.slice(*attributes.keys) == attributes }
+        end
+
         def delete_through_records(through, records)
           records.each do |record|
-            through_record = through_record(record)
+            through_records = through_records_for(record)
 
             if through_reflection.macro == :has_many
-              through.target.delete(through_record)
+              through_records.each { |r| through.target.delete(r) }
             else
-              through.target = nil if through.target == through_record
+              through.target = nil if through_records.include?(through.target)
             end
 
             @through_records.delete(record.object_id)
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index 115e06144e..7a6aba6a6b 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -77,6 +77,21 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
     end
   end
 
+  def test_add_two_instance_and_then_deleting
+    post   = posts(:thinking)
+    person = people(:david)
+
+    post.people << person
+    post.people << person
+
+    counts = ['post.people.count', 'post.people.to_a.count', 'post.readers.count', 'post.readers.to_a.count']
+    assert_difference counts, -2 do
+      post.people.delete(person)
+    end
+
+    assert !post.people.reload.include?(person)
+  end
+
   def test_associating_new
     assert_queries(1) { posts(:thinking) }
     new_person = nil # so block binding catches it
-- 
cgit v1.2.3


From 567d454d99bd472ef342c047c0038504fa4f960c Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 3 Nov 2011 13:24:39 +0000
Subject: Memoize through association

---
 .../associations/has_many_through_association.rb      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 6ba405ba4c..7e6e3be382 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -8,7 +8,9 @@ module ActiveRecord
 
       def initialize(owner, reflection)
         super
-        @through_records = {}
+
+        @through_records     = {}
+        @through_association = nil
       end
 
       # Returns the size of the collection by executing a SELECT COUNT(*) query if the collection hasn't been
@@ -55,7 +57,7 @@ module ActiveRecord
       private
 
         def through_association
-          owner.association(through_reflection.name)
+          @through_association ||= owner.association(through_reflection.name)
         end
 
         # We temporarily cache through record that has been build, because if we build a
@@ -118,8 +120,7 @@ module ActiveRecord
         def delete_records(records, method)
           ensure_not_nested
 
-          through = through_association
-          scope   = through.scoped.where(construct_join_attributes(*records))
+          scope = through_association.scoped.where(construct_join_attributes(*records))
 
           case method
           when :destroy
@@ -130,7 +131,7 @@ module ActiveRecord
             count = scope.delete_all
           end
 
-          delete_through_records(through, records)
+          delete_through_records(records)
 
           if through_reflection.macro == :has_many && update_through_counter?(method)
             update_counter(-count, through_reflection)
@@ -145,14 +146,16 @@ module ActiveRecord
           candidates.find_all { |c| c.attributes.slice(*attributes.keys) == attributes }
         end
 
-        def delete_through_records(through, records)
+        def delete_through_records(records)
           records.each do |record|
             through_records = through_records_for(record)
 
             if through_reflection.macro == :has_many
-              through_records.each { |r| through.target.delete(r) }
+              through_records.each { |r| through_association.target.delete(r) }
             else
-              through.target = nil if through_records.include?(through.target)
+              if through_records.include?(through_association.target)
+                through_association.target = nil
+              end
             end
 
             @through_records.delete(record.object_id)
-- 
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(+)

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 d486103570bf680307ba474915efc01862e99403 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Thu, 3 Nov 2011 15:07:24 +0000
Subject: Fix #3271.

Building the conditions of a nested through association could
potentially modify the conditions of the through and/or source
association.

This is a Bad Thing.
---
 activerecord/CHANGELOG                       | 7 +++++++
 activerecord/lib/active_record/reflection.rb | 2 +-
 activerecord/test/cases/reflection_test.rb   | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 203b110e98..871cc624ca 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -39,6 +39,13 @@
 
 *Rails 3.1.2 (unreleased)*
 
+* Fix bug where building the conditions of a nested through association could potentially
+  modify the conditions of the through and/or source association. If you have experienced
+  bugs with conditions appearing in the wrong queries when using nested through associations,
+  this probably solves your problems. [GH #3271]
+
+  [Jon Leighton]
+
 * If a record is removed from a has_many :through, all of the join records relating to that
   record should also be removed from the through association's target.
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 5285060288..98f0418d3f 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -433,7 +433,7 @@ module ActiveRecord
       # of relevant reflections, plus any :source_type or polymorphic :as constraints.
       def conditions
         @conditions ||= begin
-          conditions = source_reflection.conditions
+          conditions = source_reflection.conditions.map { |c| c.dup }
 
           # Add to it the conditions from this reflection if necessary.
           conditions.first << options[:conditions] if options[:conditions]
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 69e9fc8d61..4d21822cf5 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -319,6 +319,12 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal "category_id", Post.reflect_on_association(:categorizations).foreign_key.to_s
   end
 
+  def test_through_reflection_conditions_do_not_modify_other_reflections
+    orig_conds = Post.reflect_on_association(:first_blue_tags_2).conditions.inspect
+    Author.reflect_on_association(:misc_post_first_blue_tags_2).conditions
+    assert_equal orig_conds, Post.reflect_on_association(:first_blue_tags_2).conditions.inspect
+  end
+
   private
     def assert_reflection(klass, association, options)
       assert reflection = klass.reflect_on_association(association)
-- 
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(+)

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 7102a3d7fc55067b6cda1a7eeb3b3452050d9b6b Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 4 Nov 2011 04:50:53 +0900
Subject: move Rails console top level methods to IRB context

---
 railties/lib/rails/console/app.rb         | 48 +++++++++++++++++--------------
 railties/lib/rails/console/helpers.rb     | 14 +++++----
 railties/test/application/console_test.rb | 14 ++++++---
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index 95c74baae2..cf081473a3 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,28 +5,32 @@ require 'action_controller'
 # work around the at_exit hook in test/unit, which kills IRB
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-# reference the global "app" instance, created on demand. To recreate the
-# instance, pass a non-false value as the parameter.
-def app(create=false)
-  @app_integration_instance = nil if create
-  @app_integration_instance ||= new_session do |sess|
-    sess.host! "www.example.com"
-  end
-end
+module IRB
+  module ExtendCommandBundle
+    # reference the global "app" instance, created on demand. To recreate the
+    # instance, pass a non-false value as the parameter.
+    def app(create=false)
+      @app_integration_instance = nil if create
+      @app_integration_instance ||= new_session do |sess|
+        sess.host! "www.example.com"
+      end
+    end
 
-# create a new session. If a block is given, the new session will be yielded
-# to the block before being returned.
-def new_session
-  app = Rails.application
-  session = ActionDispatch::Integration::Session.new(app)
-  yield session if block_given?
-  session
-end
+    # create a new session. If a block is given, the new session will be yielded
+    # to the block before being returned.
+    def new_session
+      app = Rails.application
+      session = ActionDispatch::Integration::Session.new(app)
+      yield session if block_given?
+      session
+    end
 
-# reloads the environment
-def reload!(print=true)
-  puts "Reloading..." if print
-  ActionDispatch::Reloader.cleanup!
-  ActionDispatch::Reloader.prepare!
-  true
+    # reloads the environment
+    def reload!(print=true)
+      puts "Reloading..." if print
+      ActionDispatch::Reloader.cleanup!
+      ActionDispatch::Reloader.prepare!
+      true
+    end
+  end
 end
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 212fc6125a..070d3c2bbf 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,7 +1,11 @@
-def helper
-  @helper ||= ApplicationController.helpers
-end
+module IRB
+  module ExtendCommandBundle
+    def helper
+      @helper ||= ApplicationController.helpers
+    end
 
-def controller
-  @controller ||= ApplicationController.new
+    def controller
+      @controller ||= ApplicationController.new
+    end
+  end
 end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 1528d5dd87..5a1f71ddad 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -18,16 +18,20 @@ class ConsoleTest < Test::Unit::TestCase
     Rails.application.load_console
   end
 
+  def irb_context
+    Object.new.extend(IRB::ExtendCommandBundle)
+  end
+
   def test_app_method_should_return_integration_session
     TestHelpers::Rack.send :remove_method, :app
     load_environment
-    console_session = app
+    console_session = irb_context.app
     assert_instance_of ActionDispatch::Integration::Session, console_session
   end
 
   def test_new_session_should_return_integration_session
     load_environment
-    session = new_session
+    session = irb_context.new_session
     assert_instance_of ActionDispatch::Integration::Session, session
   end
 
@@ -41,7 +45,7 @@ class ConsoleTest < Test::Unit::TestCase
     ActionDispatch::Reloader.to_prepare { c = 3 }
 
     # Hide Reloading... output
-    silence_stream(STDOUT) { reload! }
+    silence_stream(STDOUT) { irb_context.reload! }
 
     assert_equal 1, a
     assert_equal 2, b
@@ -66,12 +70,14 @@ class ConsoleTest < Test::Unit::TestCase
     MODEL
 
     assert !User.new.respond_to?(:age)
-    silence_stream(STDOUT) { reload! }
+    silence_stream(STDOUT) { irb_context.reload! }
+    session = irb_context.new_session
     assert User.new.respond_to?(:age)
   end
 
   def test_access_to_helpers
     load_environment
+    helper = irb_context.helper
     assert_not_nil helper
     assert_instance_of ActionView::Base, helper
     assert_equal 'Once upon a time in a world...',
-- 
cgit v1.2.3


From 8611f14cafea0e2fcfddd9d22cca442c31664940 Mon Sep 17 00:00:00 2001
From: Henrik Hodne <dvyjones@dvyjones.com>
Date: Thu, 3 Nov 2011 22:19:49 +0100
Subject: Added bundle exec to rake test.

This is in response to rails/rails#3504.
---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 5848172510..4d84c50e2a 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -87,21 +87,21 @@ $ bundle install --without db
 This command will install all dependencies except the MySQL and PostgreSQL Ruby drivers. We will come back at these soon. With dependencies installed, you can run the test suite with:
 
 <shell>
-$ rake test
+$ bundle exec rake test
 </shell>
 
 You can also run tests for a specific framework, like Action Pack, by going into its directory and executing the same command:
 
 <shell>
 $ cd actionpack
-$ rake test
+$ bundle exec rake test
 </shell>
 
 If you want to run tests from the specific directory use the +TEST_DIR+ environment variable. For example, this will run tests inside +railties/test/generators+ directory only:
 
 <shell>
 $ cd railties
-$ TEST_DIR=generators rake test
+$ TEST_DIR=generators bundle exec rake test
 </shell>
 
 h4. Warnings
@@ -111,7 +111,7 @@ The test suite runs with warnings enabled. Ideally Ruby on Rails should issue no
 As of this writing they are specially noisy with Ruby 1.9. If you are sure about what you are doing and would like to have a more clear output, there's a way to override the flag:
 
 <shell>
-$ RUBYOPT=-W0 rake test
+$ RUBYOPT=-W0 bundle exec rake test
 </shell>
 
 h4. Testing Active Record
@@ -130,7 +130,7 @@ The gem +sqlite3-ruby+ does not belong to the "db" group indeed, if you followed
 
 <shell>
 $ cd activerecord
-$ rake test_sqlite3
+$ bundle exec rake test_sqlite3
 </shell>
 
 h5. MySQL and PostgreSQL
@@ -195,7 +195,7 @@ test_postgresql
 respectively. As we mentioned before
 
 <shell>
-$ rake test
+$ bundle exec rake test
 </shell>
 
 will now run the four of them in turn.
-- 
cgit v1.2.3


From 533a9f84b035756eedf9fdccf0c494dc9701ba72 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 3 Nov 2011 21:14:51 -0700
Subject: Merge pull request #3507 from jmazzi/issue-3503

Preserve SELECT columns on the COUNT for finder_sql when possible
---
 .../active_record/associations/collection_association.rb  |  8 ++++++--
 .../test/cases/associations/has_many_associations_test.rb | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb
index cec876149c..362f1053cd 100644
--- a/activerecord/lib/active_record/associations/collection_association.rb
+++ b/activerecord/lib/active_record/associations/collection_association.rb
@@ -344,8 +344,12 @@ module ActiveRecord
           if options[:counter_sql]
             interpolate(options[:counter_sql])
           else
-            # replace the SELECT clause with COUNT(*), preserving any hints within /* ... */
-            interpolate(options[:finder_sql]).sub(/SELECT\b(\/\*.*?\*\/ )?(.*)\bFROM\b/im) { "SELECT #{$1}COUNT(*) FROM" }
+            # replace the SELECT clause with COUNT(SELECTS), preserving any hints within /* ... */
+            interpolate(options[:finder_sql]).sub(/SELECT\b(\/\*.*?\*\/ )?(.*)\bFROM\b/im) do
+              count_with = $2.to_s
+              count_with = '*' if count_with.blank? || count_with =~ /,/
+              "SELECT #{$1}COUNT(#{count_with}) FROM"
+            end
           end
         end
 
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index cddd2a6f8c..a60af7c046 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -41,6 +41,21 @@ class HasManyAssociationsTestForCountWithCountSql < ActiveRecord::TestCase
   end
 end
 
+class HasManyAssociationsTestForCountDistinctWithFinderSql < ActiveRecord::TestCase
+  class Invoice < ActiveRecord::Base
+    has_many :custom_line_items, :class_name => 'LineItem', :finder_sql => "SELECT DISTINCT line_items.amount from line_items"
+  end
+
+  def test_should_count_distinct_results
+    invoice = Invoice.new
+    invoice.custom_line_items << LineItem.new(:amount => 0)
+    invoice.custom_line_items << LineItem.new(:amount => 0)
+    invoice.save!
+
+    assert_equal 1, invoice.custom_line_items.count
+  end
+end
+
 
 
 class HasManyAssociationsTest < ActiveRecord::TestCase
-- 
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(-)

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 d163d3bf7ebb98d90977974aed8f85b7ec678afd Mon Sep 17 00:00:00 2001
From: Karthik Muthupalaniappan <karthik.swaminathan@gmail.com>
Date: Fri, 4 Nov 2011 15:18:37 +0530
Subject: outline two ways to invoke a custom active model validator

---
 activemodel/README.rdoc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index 67701bc422..fa3353a780 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -162,13 +162,21 @@ modules:
   {Learn more}[link:classes/ActiveModel/Validations.html]
 
 * Custom validators
-
+   
    class Person
      include ActiveModel::Validations
      validates_with HasNameValidator
      attr_accessor :name
    end
 
+   class Person
+     include ActiveModel::Validations
+     validates :name, :has_name => true
+     attr_accessor :name
+   end
+
+   You could use any of the two ways mentioned above to use a Custom Validator.
+
    class HasNameValidator < ActiveModel::Validator
      def validate(record)
       record.errors[:name] = "must exist" if record.name.blank?
-- 
cgit v1.2.3


From 36a5f48f9323c4a770c290a9a16ae58388e7925f Mon Sep 17 00:00:00 2001
From: Karthik Muthupalaniappan <karthik.swaminathan@gmail.com>
Date: Fri, 4 Nov 2011 15:22:50 +0530
Subject: make the inline text a comment in the code block

---
 .gitignore              | 2 ++
 activemodel/README.rdoc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index aa14cee911..203fed69a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ debug.log
 /railties/guides/output
 /railties/tmp
 /RDOC_MAIN.rdoc
+.DS_Store
+activemodel/.DS_Store
diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index fa3353a780..173bc18af1 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -175,7 +175,7 @@ modules:
      attr_accessor :name
    end
 
-   You could use any of the two ways mentioned above to use a Custom Validator.
+   #You could use any of the two ways mentioned above to use a Custom Validator.
 
    class HasNameValidator < ActiveModel::Validator
      def validate(record)
-- 
cgit v1.2.3


From e6cc2ea201857a5f3700f589336df2880564cfea Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 4 Nov 2011 11:16:55 +0000
Subject: Allow the :class_name option for associations to take a symbol.

This is to avoid confusing newbies, and to be consistent with the fact
that other options like :foreign_key already allow a symbol or a string.
---
 activerecord/CHANGELOG                       | 8 ++++++++
 activerecord/lib/active_record/reflection.rb | 2 +-
 activerecord/test/cases/reflection_test.rb   | 6 +++++-
 activerecord/test/models/company.rb          | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 871cc624ca..5417824805 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,13 @@
 *Rails 3.2.0 (unreleased)*
 
+* Allow the :class_name option for associations to take a symbol (:Client) in addition to
+  a string ('Client').
+
+  This is to avoid confusing newbies, and to be consistent with the fact that other options
+  like :foreign_key already allow a symbol or a string.
+
+  [Jon Leighton]
+
 * In development mode the db:drop task also drops the test database. For symmetry with
   the db:create task. [Dmitriy Kiriyenko]
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 98f0418d3f..52968070cb 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -124,7 +124,7 @@ module ActiveRecord
       # <tt>composed_of :balance, :class_name => 'Money'</tt> returns <tt>'Money'</tt>
       # <tt>has_many :clients</tt> returns <tt>'Client'</tt>
       def class_name
-        @class_name ||= options[:class_name] || derive_class_name
+        @class_name ||= (options[:class_name] || derive_class_name).to_s
       end
 
       # Returns +true+ if +self+ and +other_aggregation+ have the same +name+ attribute, +active_record+ attribute,
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 4d21822cf5..3868ecb3cb 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -189,7 +189,7 @@ class ReflectionTest < ActiveRecord::TestCase
 
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
-    assert_equal 36, Firm.reflect_on_all_associations.size
+    assert_equal 37, Firm.reflect_on_all_associations.size
     assert_equal 26, Firm.reflect_on_all_associations(:has_many).size
     assert_equal 10, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
@@ -325,6 +325,10 @@ class ReflectionTest < ActiveRecord::TestCase
     assert_equal orig_conds, Post.reflect_on_association(:first_blue_tags_2).conditions.inspect
   end
 
+  def test_symbol_for_class_name
+    assert_equal Client, Firm.reflect_on_association(:unsorted_clients_with_symbol).klass
+  end
+
   private
     def assert_reflection(klass, association, options)
       assert reflection = klass.reflect_on_association(association)
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index c1f7a4171a..78eb4c57ac 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -42,6 +42,7 @@ class Firm < Company
       :before_remove => :log_before_remove,
       :after_remove  => :log_after_remove
   has_many :unsorted_clients, :class_name => "Client"
+  has_many :unsorted_clients_with_symbol, :class_name => :Client
   has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
   has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
   has_many :unvalidated_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :validate => false
-- 
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
---
 actionmailer/CHANGELOG      |  449 ---
 actionmailer/CHANGELOG.md   |  449 +++
 actionpack/CHANGELOG        | 5689 -------------------------------------
 actionpack/CHANGELOG.md     | 5663 +++++++++++++++++++++++++++++++++++++
 activemodel/CHANGELOG       |  109 -
 activemodel/CHANGELOG.md    |  109 +
 activerecord/CHANGELOG      | 6602 -------------------------------------------
 activerecord/CHANGELOG.md   | 6564 ++++++++++++++++++++++++++++++++++++++++++
 activeresource/CHANGELOG    |  337 ---
 activeresource/CHANGELOG.md |  334 +++
 activesupport/CHANGELOG     | 1571 ----------
 activesupport/CHANGELOG.md  | 1571 ++++++++++
 railties/CHANGELOG          | 2390 ----------------
 railties/CHANGELOG.md       | 2390 ++++++++++++++++
 14 files changed, 17080 insertions(+), 17147 deletions(-)
 delete mode 100644 actionmailer/CHANGELOG
 create mode 100644 actionmailer/CHANGELOG.md
 delete mode 100644 actionpack/CHANGELOG
 create mode 100644 actionpack/CHANGELOG.md
 delete mode 100644 activemodel/CHANGELOG
 create mode 100644 activemodel/CHANGELOG.md
 delete mode 100644 activerecord/CHANGELOG
 create mode 100644 activerecord/CHANGELOG.md
 delete mode 100644 activeresource/CHANGELOG
 create mode 100644 activeresource/CHANGELOG.md
 delete mode 100644 activesupport/CHANGELOG
 create mode 100644 activesupport/CHANGELOG.md
 delete mode 100644 railties/CHANGELOG
 create mode 100644 railties/CHANGELOG.md

diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
deleted file mode 100644
index 14c887eb53..0000000000
--- a/actionmailer/CHANGELOG
+++ /dev/null
@@ -1,449 +0,0 @@
-*Rails 3.1.0 (August 30, 2011)*
-
-* No changes
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-* remove AM delegating register_observer and register_interceptor to Mail [Josh Kalderimis]
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* Don't allow i18n to change the minor version, version now set to ~> 0.5.0 [Santiago Pastorino]
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* No changes
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* subject is automatically looked up on I18n using mailer_name and action_name as scope as in t(".subject") [JK]
-
-* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML]
-
-* Added ability to pass Proc objects to the defaults hash [ML]
-
-* Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML]
-
-* Lot of updates to various test cases that now work better with the new Mail and so have different expectations
-
-* Added interceptors and observers from Mail [ML]
-
-    ActionMailer::Base.register_interceptor calls Mail.register_interceptor
-    ActionMailer::Base.register_observer calls Mail.register_observer
-
-* Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8
-
-* Added explict setting of charset in set_fields! method to make sure Mail has the user defined default
-
-* Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header.
-
-* Fixed several tests which had incorrect encoding.
-
-* Changed all utf-8 to UTF-8 for consistency
-
-* Whole new API added with tests.  See base.rb for full details.  Old API is deprecated.
-
-* The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc.  If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
-
-* Mail#content_type now returns the content_type field as a string. If you want the mime type of a mail, then you call Mail#mime_type (eg, text/plain), if you want the parameters of the content type field, you call Mail#content_type_parameters which gives you a hash, eg {'format' => 'flowed', 'charset' => 'utf-8'}
-
-* ActionMailer::Base :default_implicit_parts_order now is in the sequence of the order you want, no reversing of ordering takes place.  The default order now is text/plain, then text/enriched, then text/html and then any other part that is not one of these three.
-
-* Mail does not have "quoted_body", "quoted_subject" etc.  All of these are accessed via body.encoded, subject.encoded etc
-
-* Every object in a Mail object returns an object, never a string.  So Mail.body returns a Mail::Body class object, need to call #encoded or #decoded to get the string you want.
-* Mail::Message#set_content_type does not exist, it is simply Mail::Message#content_type
-
-* Every mail message gets a unique message_id unless you specify one, had to change all the tests that check for equality with expected.encoded == actual.encoded to first replace their message_ids with control values
-
-* Mail now has a proper concept of parts, remove the ActionMailer::Part and ActionMailer::PartContainer classes
-
-* Calling #encoded on any object returns it as a string ready to go into the output stream of an email, this means it includes the \r\n at the end of the lines and the object is pre-wrapped with \r\n\t if it is a header field.  Also, the "encoded" value includes the field name if it is a header field.
-
-* Attachments are only the actual attachment, with filename etc.  A part contains an attachment.  The part has the content_type etc.  So attachments.last.content_type is invalid.  But parts.last.content_type
-
-* There is no idea of a "sub_head" in Mail.  A part is just a Message with some extra functionality, so it just has a "header" like a normal mail message
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 [Matt Jones]
-
-* Fixed RFC-2045 quoted-printable bug #1421 [squadette]
-
-* Fixed that no body charset would be set when there are attachments present #740 [Paweł Kondzior]
-
-
-*2.2.1 [RC2] (November 14th, 2008)*
-
-* Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 [Grant Hollingworth]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* Add layout functionality to mailers [Pratik Naik]
-
-  Mailer layouts behaves just like controller layouts, except layout names need to
-  have '_mailer' postfix for them to be automatically picked up.
-
-
-*2.1.0 (May 31st, 2008)*
-
-* Fixed that a return-path header would be ignored #7572 [joost]
-
-* Less verbose mail logging: just recipients for :info log level; the whole email for :debug only.  #8000 [iaddict, Tarmo Tänav]
-
-* Updated TMail to version 1.2.1 [Mikel Lindsaar]
-
-* Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 [jamesgolick]
-
-
-*2.0.2* (December 16th, 2007)
-
-* Included in Rails 2.0.2
-
-
-*2.0.1* (December 7th, 2007)
-
-* Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 [Rick Olson]
-
-  * Pass the template_root as an array as ActionView's view_path
-  * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
-
-* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java]
-
-* Update README to use new smtp settings configuration API. Closes #10060 [psq]
-
-* Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [Zach Dennis]
-
-* Update TMail to v1.1.0.  Use an updated version of TMail if available.  [Mikel Lindsaar]
-
-* Introduce a new base test class for testing Mailers.  ActionMailer::TestCase [Michael Koziarski]
-
-* Fix silent failure of rxml templates.  #9879 [jstewart]
-
-* Fix attachment decoding when using the TMail C extension.  #7861 [orangechicken]
-
-* Increase mail delivery test coverage.  #8692 [Kamal Fariz Mahyuddin]
-
-* Register alternative template engines using ActionMailer::Base.register_template_extension('haml').  #7534 [cwd, Josh Peek]
-
-* Only load ActionController::UrlWriter if ActionController is present [Rick Olson]
-
-* Make sure parsed emails recognized attachments nested inside multipart parts. #6714 [Jamis Buck]
-
-* Allow mailer actions named send by using __send__ internally.  #6467 [iGEL]
-
-* Add assert_emails and assert_no_emails to test the number of emails delivered.  #6479 [Jonathan Viney]
-    # Assert total number of emails delivered:
-    assert_emails 0
-    ContactMailer.deliver_contact
-    assert_emails 1
-
-    # Assert number of emails delivered within a block:
-    assert_emails 1 do
-      post :signup, :name => 'Jonathan'
-    end
-
-
-*1.3.3* (March 12th, 2007)
-
-* Depend on Action Pack 1.13.3
-
-
-*1.3.2* (February 5th, 2007)
-
-* Deprecate server_settings renaming it to smtp_settings,  add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. [Michael Koziarski]
-
-
-*1.3.1* (January 16th, 2007)
-
-* Depend on Action Pack 1.13.1
-
-
-*1.3.0* (January 16th, 2007)
-
-* Make mime version default to 1.0. closes #2323 [ror@andreas-s.net]
-
-* Make sure quoted-printable text is decoded correctly when only portions of the text are encoded. closes #3154. [jon@siliconcircus.com]
-
-* Make sure DOS newlines in quoted-printable text are normalized to unix newlines before unquoting. closes #4166 and #4452. [Jamis Buck]
-
-* Fixed that iconv decoding should catch InvalidEncoding #3153 [jon@siliconcircus.com]
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]
-
-* Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. [David Heinemeier Hansson]
-
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Mailer template root applies to a class and its subclasses rather than acting globally. #5555 [somekool@gmail.com]
-
-* Resolve action naming collision. #5520 [ssinghi@kreeti.com]
-
-* ActionMailer::Base documentation rewrite. Closes #4991 [Kevin Clark, Marcel Molina Jr.]
-
-* 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.]
-
-* Correct spurious documentation example code which results in a SyntaxError. [Marcel Molina Jr.]
-
-
-*1.2.1* (April 6th, 2006)
-
-* Be part of Rails 1.1.1
-
-
-*1.2.0* (March 27th, 2006)
-
-* Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 [ehalvorsen+rails@runbox.com]
-
-* Parse content-type apart before using it so that sub-parts of the header can be set correctly #2918 [Jamis Buck]
-
-* Make custom headers work in subparts #4034 [elan@bluemandrill.com]
-
-* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 [Chad Fowler]
-
-* Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body [Jamis Buck]
-
-* Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type [Jamis Buck]
-
-
-*1.1.5* (December 13th, 2005)
-
-* Become part of Rails 1.0
-
-
-*1.1.4* (December 7th, 2005)
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-* Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml).  #2398 [Dave Burt <dave@burt.id.au>, Jeremy Kemper]
-
-
-*1.1.3* (November 7th, 2005)
-
-* Allow Mailers to have custom initialize methods that set default instance variables for all mail actions #2563 [mrj@bigpond.net.au]
-
-
-*1.1.2* (October 26th, 2005)
-
-* Upgraded to Action Pack 1.10.2
-
-
-*1.1.1* (October 19th, 2005)
-
-* Upgraded to Action Pack 1.10.1
-
-
-*1.1.0* (October 16th, 2005)
-
-* Update and extend documentation (rdoc)
-
-* Minero Aoki made TMail available to Rails/ActionMailer under the MIT license (instead of LGPL) [RubyConf '05]
-
-* Austin Ziegler made Text::Simple available to Rails/ActionMailer under a MIT-like licens [See rails ML, subject "Text::Format Licence Exception" on Oct 15, 2005]
-
-* Fix vendor require paths to prevent files being required twice
-
-* Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 [John Long]
-
-* Preserve underscores when unquoting message bodies #1930
-
-* Encode multibyte characters correctly #1894
-
-* Multipart messages specify a MIME-Version header automatically #2003 [John Long]
-
-* Add a unified render method to ActionMailer (delegates to ActionView::Base#render)
-
-* Move mailer initialization to a separate (overridable) method, so that subclasses may alter the various defaults #1727
-
-* Look at content-location header (if available) to determine filename of attachments #1670
-
-* ActionMailer::Base.deliver(email) had been accidentally removed, but was documented in the Rails book #1849
-
-* Fix problem with sendmail delivery where headers should be delimited by \n characters instead of \r\n, which confuses some mail readers #1742 [Kent Sibilev]
-
-
-*1.0.1* (11 July, 2005)
-
-* Bind to Action Pack 1.9.1
-
-
-*1.0.0* (6 July, 2005)
-
-* Avoid adding nil header values #1392
-
-* Better multipart support with implicit multipart/alternative and sorting of subparts [John Long]
-
-* Allow for nested parts in multipart mails #1570 [Flurin Egger]
-
-* Normalize line endings in outgoing mail bodies to "\n" #1536 [John Long]
-
-* Allow template to be explicitly specified #1448 [tuxie@dekadance.se]
-
-* Allow specific "multipart/xxx" content-type to be set on multipart messages #1412 [Flurin Egger]
-
-* Unquoted @ characters in headers are now accepted in spite of RFC 822 #1206
-
-* Helper support (borrowed from ActionPack)
-
-* Silently ignore Errno::EINVAL errors when converting text.
-
-* Don't cause an error when parsing an encoded attachment name #1340 [lon@speedymac.com]
-
-* Nested multipart message parts are correctly processed in TMail::Mail#body
-
-* BCC headers are removed when sending via SMTP #1402
-
-* Added 'content_type' accessor, to allow content type to be set on a per-message basis. content_type defaults to "text/plain".
-
-* Silently ignore Iconv::IllegalSequence errors when converting text #1341 [lon@speedymac.com]
-
-* Support attachments and multipart messages.
-
-* Added new accessors for the various mail properties.
-
-* Fix to only perform the charset conversion if a 'from' and a 'to' charset are given (make no assumptions about what the charset was) #1276 [Jamis Buck]
-
-* Fix attachments and content-type problems #1276 [Jamis Buck]
-
-* Fixed the TMail#body method to look at the content-transfer-encoding header and unquote the body according to the rules it specifies #1265 [Jamis Buck]
-
-* Added unquoting even if the iconv lib can't be loaded--in that case, only the charset conversion is skipped #1265 [Jamis Buck]
-
-* Added automatic decoding of base64 bodies #1214 [Jamis Buck]
-
-* Added that delivery errors are caught in a way so the mail is still returned whether the delivery was successful or not
-
-* Fixed that email address like "Jamis Buck, M.D." <wild.medicine@example.net> would cause the quoter to generate emails resulting in "bad address" errors from the mail server #1220 [Jamis Buck]
-
-
-*0.9.1* (20th April, 2005)
-
-* Depend on Action Pack 1.8.1
-
-
-*0.9.0* (19th April, 2005)
-
-* Added that deliver_* will now return the email that was sent
-
-* Added that quoting to UTF-8 only happens if the characters used are in that range #955 [Jamis Buck]
-
-* Fixed quoting for all address headers, not just to #955 [Jamis Buck]
-
-* Fixed unquoting of emails that doesn't have an explicit charset #1036 [wolfgang@stufenlos.net]
-
-
-*0.8.1* (27th March, 2005)
-
-* Fixed that if charset was found that the end of a mime part declaration TMail would throw an error #919 [lon@speedymac.com]
-
-* Fixed that TMail::Unquoter would fail to recognize quoting method if it was in lowercase #919 [lon@speedymac.com]
-
-* Fixed that TMail::Encoder would fail when it attempts to parse e-mail addresses which are encoded using something other than the messages encoding method #919 [lon@speedymac.com]
-
-* Added rescue for missing iconv library and throws warnings if subject/body is called on a TMail object without it instead
-
-
-*0.8.0* (22th March, 2005)
-
-* Added framework support for processing incoming emails with an Action Mailer class. See example in README.
-
-
-*0.7.1* (7th March, 2005)
-
-* Bind to newest Action Pack (1.5.1)
-
-
-*0.7.0* (24th February, 2005)
-
-* Added support for charsets for both subject and body. The default charset is now UTF-8 #673 [Jamis Buck]. Examples:
-
-    def iso_charset(recipient)
-      @recipients = recipient
-      @subject    = "testing iso charsets"
-      @from       = "system@loudthinking.com"
-      @body       = "Nothing to see here."
-      @charset    = "iso-8859-1"
-    end
-
-    def unencoded_subject(recipient)
-      @recipients = recipient
-      @subject    = "testing unencoded subject"
-      @from       = "system@loudthinking.com"
-      @body       = "Nothing to see here."
-      @encode_subject = false
-      @charset    = "iso-8859-1"
-    end
-
-
-*0.6.1* (January 18th, 2005)
-
-* Fixed sending of emails to use Tmail#from not the deprecated Tmail#from_address
-
-
-*0.6* (January 17th, 2005)
-
-* Fixed that bcc and cc should be settable through @bcc and @cc -- not just @headers["Bcc"] and @headers["Cc"] #453 [Eric Hodel]
-
-* Fixed Action Mailer to be "warnings safe" so you can run with ruby -w and not get framework warnings #453 [Eric Hodel]
-
-
-*0.5*
-
-* Added access to custom headers, like cc, bcc, and reply-to #268 [Andreas Schwarz]. Example:
-
-    def post_notification(recipients, post)
-      @recipients          = recipients
-      @from                = post.author.email_address_with_name
-      @headers["bcc"]      = SYSTEM_ADMINISTRATOR_EMAIL
-      @headers["reply-to"] = "notifications@example.com"
-      @subject             = "[#{post.account.name} #{post.title}]"
-      @body["post"]        = post
-    end
-
-*0.4* (5)
-
-* Consolidated the server configuration options into Base#server_settings= and expanded that with controls for authentication and more [Marten]
-  NOTE: This is an API change that could potentially break your application if you used the old application form. Please do change!
-
-* Added Base#deliveries as an accessor for an array of emails sent out through that ActionMailer class when using the :test delivery option. [Jeremy Kemper]
-
-* Added Base#perform_deliveries= which can be set to false to turn off the actual delivery of the email through smtp or sendmail.
-  This is especially useful for functional testing that shouldn't send off real emails, but still trigger delivery_* methods.
-
-* Added option to specify delivery method with Base#delivery_method=. Default is :smtp and :sendmail is currently the only other option.
-  Sendmail is assumed to be present at "/usr/sbin/sendmail" if that option is used. [Kent Sibilev]
-
-* Dropped "include TMail" as it added to much baggage into the default namespace (like Version) [Chad Fowler]
-
-
-*0.3*
-
-* First release
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
new file mode 100644
index 0000000000..57af4ee6a4
--- /dev/null
+++ b/actionmailer/CHANGELOG.md
@@ -0,0 +1,449 @@
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   No changes
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   remove AM delegating register_observer and register_interceptor to Mail *Josh Kalderimis*
+
+
+*   Rails 3.0.6 (April 5, 2011)
+
+*   Don't allow i18n to change the minor version, version now set to ~> 0.5.0 *Santiago Pastorino*
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   No changes.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   No changes
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   subject is automatically looked up on I18n using mailer_name and action_name as scope as in t(".subject") *JK*
+
+*   Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 *ML*
+
+*   Added ability to pass Proc objects to the defaults hash *ML*
+
+*   Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead *ML*
+
+*   Lot of updates to various test cases that now work better with the new Mail and so have different expectations
+
+*   Added interceptors and observers from Mail *ML*
+
+        ActionMailer::Base.register_interceptor calls Mail.register_interceptor
+        ActionMailer::Base.register_observer calls Mail.register_observer
+
+*   Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8
+
+*   Added explict setting of charset in set_fields! method to make sure Mail has the user defined default
+
+*   Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header.
+
+*   Fixed several tests which had incorrect encoding.
+
+*   Changed all utf-8 to UTF-8 for consistency
+
+*   Whole new API added with tests.  See base.rb for full details.  Old API is deprecated.
+
+*   The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc.  If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted
+
+*   Mail#content_type now returns the content_type field as a string. If you want the mime type of a mail, then you call Mail#mime_type (eg, text/plain), if you want the parameters of the content type field, you call Mail#content_type_parameters which gives you a hash, eg {'format' => 'flowed', 'charset' => 'utf-8'}
+
+*   ActionMailer::Base :default_implicit_parts_order now is in the sequence of the order you want, no reversing of ordering takes place.  The default order now is text/plain, then text/enriched, then text/html and then any other part that is not one of these three.
+
+*   Mail does not have "quoted_body", "quoted_subject" etc.  All of these are accessed via body.encoded, subject.encoded etc
+
+*   Every object in a Mail object returns an object, never a string.  So Mail.body returns a Mail::Body class object, need to call #encoded or #decoded to get the string you want.
+*   Mail::Message#set_content_type does not exist, it is simply Mail::Message#content_type
+
+*   Every mail message gets a unique message_id unless you specify one, had to change all the tests that check for equality with expected.encoded == actual.encoded to first replace their message_ids with control values
+
+*   Mail now has a proper concept of parts, remove the ActionMailer::Part and ActionMailer::PartContainer classes
+
+*   Calling #encoded on any object returns it as a string ready to go into the output stream of an email, this means it includes the \r\n at the end of the lines and the object is pre-wrapped with \r\n\t if it is a header field.  Also, the "encoded" value includes the field name if it is a header field.
+
+*   Attachments are only the actual attachment, with filename etc.  A part contains an attachment.  The part has the content_type etc.  So attachments.last.content_type is invalid.  But parts.last.content_type
+
+*   There is no idea of a "sub_head" in Mail.  A part is just a Message with some extra functionality, so it just has a "header" like a normal mail message
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+*   Fixed that ActionMailer should send correctly formatted Return-Path in MAIL FROM for SMTP #1842 *Matt Jones*
+
+*   Fixed RFC-2045 quoted-printable bug #1421 *squadette*
+
+*   Fixed that no body charset would be set when there are attachments present #740 *Paweł Kondzior*
+
+
+## 2.2.1 RC2 (November 14th, 2008) ##
+
+*   Turn on STARTTLS if it is available in Net::SMTP (added in Ruby 1.8.7) and the SMTP server supports it (This is required for Gmail's SMTP server) #1336 *Grant Hollingworth*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+*   Add layout functionality to mailers *Pratik Naik*
+
+    Mailer layouts behaves just like controller layouts, except layout names need to
+    have '_mailer' postfix for them to be automatically picked up.
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+*   Fixed that a return-path header would be ignored #7572 *joost*
+
+*   Less verbose mail logging: just recipients for :info log level; the whole email for :debug only.  #8000 *iaddict, Tarmo Tänav*
+
+*   Updated TMail to version 1.2.1 *Mikel Lindsaar*
+
+*   Fixed that you don't have to call super in ActionMailer::TestCase#setup #10406 *jamesgolick*
+
+
+## 2.0.2 (December 16th, 2007) ##
+
+*   Included in Rails 2.0.2
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+*   Update ActionMailer so it treats ActionView the same way that ActionController does.  Closes #10244 *Rick Olson*
+
+    * Pass the template_root as an array as ActionView's view_path
+    * Request templates with the "#{mailer_name}/#{action}" as opposed to just "#{action}"
+
+*   Fixed that partials would be broken when using text.plain.erb as the extension #10130 *java*
+
+*   Update README to use new smtp settings configuration API. Closes #10060 *psq*
+
+*   Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 *Zach Dennis*
+
+*   Update TMail to v1.1.0.  Use an updated version of TMail if available.  *Mikel Lindsaar*
+
+*   Introduce a new base test class for testing Mailers.  ActionMailer::TestCase *Michael Koziarski*
+
+*   Fix silent failure of rxml templates.  #9879 *jstewart*
+
+*   Fix attachment decoding when using the TMail C extension.  #7861 *orangechicken*
+
+*   Increase mail delivery test coverage.  #8692 *Kamal Fariz Mahyuddin*
+
+*   Register alternative template engines using ActionMailer::Base.register_template_extension('haml').  #7534 *cwd, Josh Peek*
+
+*   Only load ActionController::UrlWriter if ActionController is present *Rick Olson*
+
+*   Make sure parsed emails recognized attachments nested inside multipart parts. #6714 *Jamis Buck*
+
+*   Allow mailer actions named send by using __send__ internally.  #6467 *iGEL*
+
+*   Add assert_emails and assert_no_emails to test the number of emails delivered.  #6479 *Jonathan Viney*
+        # Assert total number of emails delivered:
+        assert_emails 0
+        ContactMailer.deliver_contact
+        assert_emails 1
+
+        # Assert number of emails delivered within a block:
+        assert_emails 1 do
+          post :signup, :name => 'Jonathan'
+        end
+
+
+## 1.3.3 (March 12th, 2007) ##
+
+*   Depend on Action Pack 1.13.3
+
+
+## 1.3.2 (February 5th, 2007) ##
+
+*   Deprecate server_settings renaming it to smtp_settings,  add sendmail_settings to allow you to override the arguments to and location of the sendmail executable. *Michael Koziarski*
+
+
+## 1.3.1 (January 16th, 2007) ##
+
+*   Depend on Action Pack 1.13.1
+
+
+## 1.3.0 (January 16th, 2007) ##
+
+*   Make mime version default to 1.0. closes #2323 *ror@andreas-s.net*
+
+*   Make sure quoted-printable text is decoded correctly when only portions of the text are encoded. closes #3154. *jon@siliconcircus.com*
+
+*   Make sure DOS newlines in quoted-printable text are normalized to unix newlines before unquoting. closes #4166 and #4452. *Jamis Buck*
+
+*   Fixed that iconv decoding should catch InvalidEncoding #3153 *jon@siliconcircus.com*
+
+*   Tighten rescue clauses.  #5985 *james@grayproductions.net*
+
+*   Automatically included ActionController::UrlWriter, such that URL generation can happen within ActionMailer controllers. *David Heinemeier Hansson*
+
+*   Replace Reloadable with Reloadable::Deprecated. *Nicholas Seckar*
+
+*   Mailer template root applies to a class and its subclasses rather than acting globally. #5555 *somekool@gmail.com*
+
+*   Resolve action naming collision. #5520 *ssinghi@kreeti.com*
+
+*   ActionMailer::Base documentation rewrite. Closes #4991 *Kevin Clark, Marcel Molina Jr.*
+
+*   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.*
+
+*   Correct spurious documentation example code which results in a SyntaxError. *Marcel Molina Jr.*
+
+
+## 1.2.1 (April 6th, 2006) ##
+
+*   Be part of Rails 1.1.1
+
+
+## 1.2.0 (March 27th, 2006) ##
+
+*   Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 *ehalvorsen+rails@runbox.com*
+
+*   Parse content-type apart before using it so that sub-parts of the header can be set correctly #2918 *Jamis Buck*
+
+*   Make custom headers work in subparts #4034 *elan@bluemandrill.com*
+
+*   Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 *Chad Fowler*
+
+*   Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body *Jamis Buck*
+
+*   Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type *Jamis Buck*
+
+
+## 1.1.5 (December 13th, 2005) ##
+
+*   Become part of Rails 1.0
+
+
+## 1.1.4 (December 7th, 2005) ##
+
+*   Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+*   Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml).  #2398 *Dave Burt <dave@burt.id.au>, Jeremy Kemper*
+
+
+## 1.1.3 (November 7th, 2005) ##
+
+*   Allow Mailers to have custom initialize methods that set default instance variables for all mail actions #2563 *mrj@bigpond.net.au*
+
+
+## 1.1.2 (October 26th, 2005) ##
+
+*   Upgraded to Action Pack 1.10.2
+
+
+## 1.1.1 (October 19th, 2005) ##
+
+*   Upgraded to Action Pack 1.10.1
+
+
+## 1.1.0 (October 16th, 2005) ##
+
+*   Update and extend documentation (rdoc)
+
+*   Minero Aoki made TMail available to Rails/ActionMailer under the MIT license (instead of LGPL) *RubyConf '05*
+
+*   Austin Ziegler made Text::Simple available to Rails/ActionMailer under a MIT-like licens *See rails ML, subject "Text::Format Licence Exception" on Oct 15, 2005*
+
+*   Fix vendor require paths to prevent files being required twice
+
+*   Don't add charset to content-type header for a part that contains subparts (for AOL compatibility) #2013 *John Long*
+
+*   Preserve underscores when unquoting message bodies #1930
+
+*   Encode multibyte characters correctly #1894
+
+*   Multipart messages specify a MIME-Version header automatically #2003 *John Long*
+
+*   Add a unified render method to ActionMailer (delegates to ActionView::Base#render)
+
+*   Move mailer initialization to a separate (overridable) method, so that subclasses may alter the various defaults #1727
+
+*   Look at content-location header (if available) to determine filename of attachments #1670
+
+*   ActionMailer::Base.deliver(email) had been accidentally removed, but was documented in the Rails book #1849
+
+*   Fix problem with sendmail delivery where headers should be delimited by \n characters instead of \r\n, which confuses some mail readers #1742 *Kent Sibilev*
+
+
+## 1.0.1 (11 July, 2005) ##
+
+*   Bind to Action Pack 1.9.1
+
+
+## 1.0.0 (6 July, 2005) ##
+
+*   Avoid adding nil header values #1392
+
+*   Better multipart support with implicit multipart/alternative and sorting of subparts *John Long*
+
+*   Allow for nested parts in multipart mails #1570 *Flurin Egger*
+
+*   Normalize line endings in outgoing mail bodies to "\n" #1536 *John Long*
+
+*   Allow template to be explicitly specified #1448 *tuxie@dekadance.se*
+
+*   Allow specific "multipart/xxx" content-type to be set on multipart messages #1412 *Flurin Egger*
+
+*   Unquoted @ characters in headers are now accepted in spite of RFC 822 #1206
+
+*   Helper support (borrowed from ActionPack)
+
+*   Silently ignore Errno::EINVAL errors when converting text.
+
+*   Don't cause an error when parsing an encoded attachment name #1340 *lon@speedymac.com*
+
+*   Nested multipart message parts are correctly processed in TMail::Mail#body
+
+*   BCC headers are removed when sending via SMTP #1402
+
+*   Added 'content_type' accessor, to allow content type to be set on a per-message basis. content_type defaults to "text/plain".
+
+*   Silently ignore Iconv::IllegalSequence errors when converting text #1341 *lon@speedymac.com*
+
+*   Support attachments and multipart messages.
+
+*   Added new accessors for the various mail properties.
+
+*   Fix to only perform the charset conversion if a 'from' and a 'to' charset are given (make no assumptions about what the charset was) #1276 *Jamis Buck*
+
+*   Fix attachments and content-type problems #1276 *Jamis Buck*
+
+*   Fixed the TMail#body method to look at the content-transfer-encoding header and unquote the body according to the rules it specifies #1265 *Jamis Buck*
+
+*   Added unquoting even if the iconv lib can't be loaded--in that case, only the charset conversion is skipped #1265 *Jamis Buck*
+
+*   Added automatic decoding of base64 bodies #1214 *Jamis Buck*
+
+*   Added that delivery errors are caught in a way so the mail is still returned whether the delivery was successful or not
+
+*   Fixed that email address like "Jamis Buck, M.D." <wild.medicine@example.net> would cause the quoter to generate emails resulting in "bad address" errors from the mail server #1220 *Jamis Buck*
+
+
+## 0.9.1 (20th April, 2005) ##
+
+*   Depend on Action Pack 1.8.1
+
+
+## 0.9.0 (19th April, 2005) ##
+
+*   Added that deliver_* will now return the email that was sent
+
+*   Added that quoting to UTF-8 only happens if the characters used are in that range #955 *Jamis Buck*
+
+*   Fixed quoting for all address headers, not just to #955 *Jamis Buck*
+
+*   Fixed unquoting of emails that doesn't have an explicit charset #1036 *wolfgang@stufenlos.net*
+
+
+## 0.8.1 (27th March, 2005) ##
+
+*   Fixed that if charset was found that the end of a mime part declaration TMail would throw an error #919 *lon@speedymac.com*
+
+*   Fixed that TMail::Unquoter would fail to recognize quoting method if it was in lowercase #919 *lon@speedymac.com*
+
+*   Fixed that TMail::Encoder would fail when it attempts to parse e-mail addresses which are encoded using something other than the messages encoding method #919 *lon@speedymac.com*
+
+*   Added rescue for missing iconv library and throws warnings if subject/body is called on a TMail object without it instead
+
+
+## 0.8.0 (22th March, 2005) ##
+
+*   Added framework support for processing incoming emails with an Action Mailer class. See example in README.
+
+
+## 0.7.1 (7th March, 2005) ##
+
+*   Bind to newest Action Pack (1.5.1)
+
+
+## 0.7.0 (24th February, 2005) ##
+
+*   Added support for charsets for both subject and body. The default charset is now UTF-8 #673 [Jamis Buck]. Examples:
+
+        def iso_charset(recipient)
+          @recipients = recipient
+          @subject    = "testing iso charsets"
+          @from       = "system@loudthinking.com"
+          @body       = "Nothing to see here."
+          @charset    = "iso-8859-1"
+        end
+
+        def unencoded_subject(recipient)
+          @recipients = recipient
+          @subject    = "testing unencoded subject"
+          @from       = "system@loudthinking.com"
+          @body       = "Nothing to see here."
+          @encode_subject = false
+          @charset    = "iso-8859-1"
+        end
+
+
+## 0.6.1 (January 18th, 2005) ##
+
+*   Fixed sending of emails to use Tmail#from not the deprecated Tmail#from_address
+
+
+## 0.6 (January 17th, 2005) ##
+
+*   Fixed that bcc and cc should be settable through @bcc and @cc -- not just @headers["Bcc"] and @headers["Cc"] #453 *Eric Hodel*
+
+*   Fixed Action Mailer to be "warnings safe" so you can run with ruby -w and not get framework warnings #453 *Eric Hodel*
+
+
+## 0.5 ##
+
+*   Added access to custom headers, like cc, bcc, and reply-to #268 [Andreas Schwarz]. Example:
+
+        def post_notification(recipients, post)
+          @recipients          = recipients
+          @from                = post.author.email_address_with_name
+          @headers["bcc"]      = SYSTEM_ADMINISTRATOR_EMAIL
+          @headers["reply-to"] = "notifications@example.com"
+          @subject             = "[#{post.account.name} #{post.title}]"
+          @body["post"]        = post
+        end
+
+## 0.4 (5) ##
+
+*   Consolidated the server configuration options into Base#server_settings= and expanded that with controls for authentication and more *Marten*
+    NOTE: This is an API change that could potentially break your application if you used the old application form. Please do change!
+
+*   Added Base#deliveries as an accessor for an array of emails sent out through that ActionMailer class when using the :test delivery option. *Jeremy Kemper*
+
+*   Added Base#perform_deliveries= which can be set to false to turn off the actual delivery of the email through smtp or sendmail.
+    This is especially useful for functional testing that shouldn't send off real emails, but still trigger delivery_* methods.
+
+*   Added option to specify delivery method with Base#delivery_method=. Default is :smtp and :sendmail is currently the only other option.
+    Sendmail is assumed to be present at "/usr/sbin/sendmail" if that option is used. *Kent Sibilev*
+
+*   Dropped "include TMail" as it added to much baggage into the default namespace (like Version) *Chad Fowler*
+
+
+## 0.3 ##
+
+*   First release
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
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
deleted file mode 100644
index bf077bef35..0000000000
--- a/activemodel/CHANGELOG
+++ /dev/null
@@ -1,109 +0,0 @@
-* Added ActiveModel::Errors#added? to check if a specific error has been added [Martin Svalin]
-
-* Add ability to define strict validation(with :strict => true option) that always raises exception when fails [Bogdan Gusiev]
-
-* Deprecate "Model.model_name.partial_path" in favor of "model.to_partial_path" [Grant Hutchins, Peter Jaros]
-
-* Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior [Bogdan Gusiev]
-
-*Rails 3.1.0 (August 30, 2011)*
-
-* Alternate I18n namespace lookup is no longer supported.
-  Instead of "activerecord.models.admins.post", do "activerecord.models.admins/post" instead [José Valim]
-
-* attr_accessible and friends now accepts :as as option to specify a role [Josh Kalderimis]
-
-* Add support for proc or lambda as an option for InclusionValidator,
-  ExclusionValidator, and FormatValidator [Prem Sichanugrist]
-
-  You can now supply Proc, lambda, or anything that respond to #call in those
-  validations, and it will be called with current record as an argument.
-  That given proc or lambda must returns an object which respond to #include? for
-  InclusionValidator and ExclusionValidator, and returns a regular expression
-  object for FormatValidator.
-
-* Added ActiveModel::SecurePassword to encapsulate dead-simple password usage with BCrypt encryption and salting [DHH]
-
-* ActiveModel::AttributeMethods allows attributes to be defined on demand [Alexander Uvarov]
-
-* Add support for selectively enabling/disabling observers [Myron Marston]
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-*No changes.
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* Fix when database column name has some symbolic characters (e.g. Oracle CASE# VARCHAR2(20)) #5818 #6850 [Robert Pankowecki, Santiago Pastorino]
-
-* Fix length validation for fixnums #6556 [Andriy Tyurnikov]
-
-* Fix i18n key collision with namespaced models #6448 [yves.senn]
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* No changes
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* Added ActiveModel::MassAssignmentSecurity [Eric Chapweske, Josh Kalderimis]
-
-* JSON supports a custom root option: to_json(:root => 'custom')  #4515 [Jatinder Singh]
-
-* #new_record? and #destroyed? were removed from ActiveModel::Lint. Use
-  persisted? instead. A model is persisted if it's not a new_record? and it was
-  not destroyed? [MG]
-
-* Added validations reflection in ActiveModel::Validations [JV]
-
-    Model.validators
-    Model.validators_on(:field)
-
-* #to_key was added to ActiveModel::Lint so we can generate DOM IDs for
-  AMo objects with composite keys [MG]
-
-* ActiveModel::Observer#add_observer!
-
-  It has a custom hook to define after_find that should really be in a
-  ActiveRecord::Observer subclass:
-
-    def add_observer!(klass)
-      klass.add_observer(self)
-      klass.class_eval 'def after_find() end' unless klass.respond_to?(:after_find)
-    end
-
-* Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH]
-
-* Add validates_format_of :without => /regexp/ option. #430 [Elliot Winkler, Peer Allan]
-
-  Example :
-
-      validates_format_of :subdomain, :without => /www|admin|mail/
-
-* Introduce validates_with to encapsulate attribute validations in a class.  #2630 [Jeff Dean]
-
-* Extracted from Active Record and Active Resource.
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
new file mode 100644
index 0000000000..71a737caff
--- /dev/null
+++ b/activemodel/CHANGELOG.md
@@ -0,0 +1,109 @@
+*   Added ActiveModel::Errors#added? to check if a specific error has been added *Martin Svalin*
+
+*   Add ability to define strict validation(with :strict => true option) that always raises exception when fails *Bogdan Gusiev*
+
+*   Deprecate "Model.model_name.partial_path" in favor of "model.to_partial_path" *Grant Hutchins, Peter Jaros*
+
+*   Provide mass_assignment_sanitizer as an easy API to replace the sanitizer behavior. Also support both :logger (default) and :strict sanitizer behavior *Bogdan Gusiev*
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   Alternate I18n namespace lookup is no longer supported.
+    Instead of "activerecord.models.admins.post", do "activerecord.models.admins/post" instead *José Valim*
+
+*   attr_accessible and friends now accepts :as as option to specify a role *Josh Kalderimis*
+
+*   Add support for proc or lambda as an option for InclusionValidator,
+    ExclusionValidator, and FormatValidator *Prem Sichanugrist*
+
+    You can now supply Proc, lambda, or anything that respond to #call in those
+    validations, and it will be called with current record as an argument.
+    That given proc or lambda must returns an object which respond to #include? for
+    InclusionValidator and ExclusionValidator, and returns a regular expression
+    object for FormatValidator.
+
+*   Added ActiveModel::SecurePassword to encapsulate dead-simple password usage with BCrypt encryption and salting *DHH*
+
+*   ActiveModel::AttributeMethods allows attributes to be defined on demand *Alexander Uvarov*
+
+*   Add support for selectively enabling/disabling observers *Myron Marston*
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   No changes.
+
+
+*   Rails 3.0.6 (April 5, 2011)
+
+*   Fix when database column name has some symbolic characters (e.g. Oracle CASE# VARCHAR2(20)) #5818 #6850 *Robert Pankowecki, Santiago Pastorino*
+
+*   Fix length validation for fixnums #6556 *Andriy Tyurnikov*
+
+*   Fix i18n key collision with namespaced models #6448 *yves.senn*
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   No changes.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   No changes
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   Added ActiveModel::MassAssignmentSecurity *Eric Chapweske, Josh Kalderimis*
+
+*   JSON supports a custom root option: to_json(:root => 'custom')  #4515 *Jatinder Singh*
+
+*   #new_record? and #destroyed? were removed from ActiveModel::Lint. Use
+    persisted? instead. A model is persisted if it's not a new_record? and it was
+    not destroyed? *MG*
+
+*   Added validations reflection in ActiveModel::Validations *JV*
+
+        Model.validators
+        Model.validators_on(:field)
+
+*   #to_key was added to ActiveModel::Lint so we can generate DOM IDs for
+    AMo objects with composite keys *MG*
+
+*   ActiveModel::Observer#add_observer!
+
+    It has a custom hook to define after_find that should really be in a
+    ActiveRecord::Observer subclass:
+
+        def add_observer!(klass)
+          klass.add_observer(self)
+          klass.class_eval 'def after_find() end' unless klass.respond_to?(:after_find)
+        end
+
+*   Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 *DHH*
+
+*   Add validates_format_of :without => /regexp/ option. #430 *Elliot Winkler, Peer Allan*
+
+    Example :
+
+          validates_format_of :subdomain, :without => /www|admin|mail/
+
+*   Introduce validates_with to encapsulate attribute validations in a class.  #2630 *Jeff Dean*
+
+*   Extracted from Active Record and Active Resource.
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
deleted file mode 100644
index 5417824805..0000000000
--- a/activerecord/CHANGELOG
+++ /dev/null
@@ -1,6602 +0,0 @@
-*Rails 3.2.0 (unreleased)*
-
-* Allow the :class_name option for associations to take a symbol (:Client) in addition to
-  a string ('Client').
-
-  This is to avoid confusing newbies, and to be consistent with the fact that other options
-  like :foreign_key already allow a symbol or a string.
-
-  [Jon Leighton]
-
-* In development mode the db:drop task also drops the test database. For symmetry with
-  the db:create task. [Dmitriy Kiriyenko]
-
-* Added ActiveRecord::Base.store for declaring simple single-column key/value stores [DHH]
-
-    class User < ActiveRecord::Base
-      store :settings, accessors: [ :color, :homepage ]
-    end
-
-    u = User.new(color: 'black', homepage: '37signals.com')
-    u.color                          # Accessor stored attribute
-    u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
-
-
-* MySQL: case-insensitive uniqueness validation avoids calling LOWER when
-  the column already uses a case-insensitive collation. Fixes #561.
-
-  [Joseph Palermo]
-
-* Transactional fixtures enlist all active database connections. You can test
-  models on different connections without disabling transactional fixtures.
-
-  [Jeremy Kemper]
-
-* Add first_or_create, first_or_create!, first_or_initialize methods to Active Record. This is a
-  better approach over the old find_or_create_by dynamic methods because it's clearer which
-  arguments are used to find the record and which are used to create it:
-
-    User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson")
-
-  [Andrés Mejía]
-
-* Fix nested attributes bug where _destroy parameter is taken into account
-  during :reject_if => :all_blank (fixes #2937)
-
-  [Aaron Christy]
-
-*Rails 3.1.2 (unreleased)*
-
-* Fix bug where building the conditions of a nested through association could potentially
-  modify the conditions of the through and/or source association. If you have experienced
-  bugs with conditions appearing in the wrong queries when using nested through associations,
-  this probably solves your problems. [GH #3271]
-
-  [Jon Leighton]
-
-* If a record is removed from a has_many :through, all of the join records relating to that
-  record should also be removed from the through association's target.
-
-  [Jon Leighton]
-
-* Fix adding multiple instances of the same record to a has_many :through. [GH #3425]
-
-  [Jon Leighton]
-
-* Fix creating records in a through association with a polymorphic source type. [GH #3247]
-
-  [Jon Leighton]
-
-*Rails 3.1.1 (October 7, 2011)*
-
-* Add deprecation for the preload_associations method. Fixes #3022.
-
-  [Jon Leighton]
-
-* Don't require a DB connection when loading a model that uses set_primary_key. GH #2807.
-
-  [Jon Leighton]
-
-* Fix using select() with a habtm association, e.g. Person.friends.select(:name). GH #3030 and
-  #2923.
-
-  [Hendy Tanata]
-
-* Fix belongs_to polymorphic with custom primary key on target. GH #3104.
-
-  [Jon Leighton]
-
-* CollectionProxy#replace should change the DB records rather than just mutating the array.
-  Fixes #3020.
-
-  [Jon Leighton]
-
-* LRU cache in mysql and sqlite are now per-process caches.
-
-	* lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache
-	  keys are per process id.
-	* lib/active_record/connection_adapters/sqlite_adapter.rb: ditto
-
-  [Aaron Patterson]
-
-* Support bulk change_table in mysql2 adapter, as well as the mysql one. [Jon Leighton]
-
-* If multiple parameters are sent representing a date, and some are blank, the
-resulting object is nil. In previous releases those values defaulted to 1. This
-only affects existing but blank parameters, missing ones still raise an error.
-[Akira Matsuda]
-
-* ActiveRecord::Base.establish_connection now takes a string that contains
-a URI that specifies the connection configuration.  For example:
-
-    ActiveRecord::Base.establish_connection 'postgres://localhost/foo'
-
-* Active Record's dynamic finder will now raise the error if you passing in less number of arguments than what you call in method signature.
-
-  So if you were doing this and expecting the second argument to be nil:
-
-    User.find_by_username_and_group("sikachu")
-
-  You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:
-
-    User.find_by_username_and_group("sikachu", nil)
-
-  [Prem Sichanugrist]
-
-
-*Rails 3.1.0 (August 30, 2011)*
-
-* Add a proxy_association method to association proxies, which can be called by association
-  extensions to access information about the association. This replaces proxy_owner etc with
-  proxy_association.owner.
-
-  [Jon Leighton]
-
-* ActiveRecord::MacroReflection::AssociationReflection#build_record has a new method signature.
-
-  Before: def build_association(*options)
-  After:  def build_association(*options, &block)
-
-  Users who are redefining this method to extend functionality should ensure that the block is
-  passed through to ActiveRecord::Base#new.
-
-  This change is necessary to fix https://github.com/rails/rails/issues/1842.
-
-  [Jon Leighton]
-
-* AR#pluralize_table_names can be used to singularize/pluralize table name of an individual model:
-
-    class User < ActiveRecord::Base
-      self.pluralize_table_names = false
-    end
-
-  Previously this could only be set globally for all models through ActiveRecord::Base.pluralize_table_names. [Guillermo Iguaran]
-
-* Add block setting of attributes to singular associations:
-
-    class User < ActiveRecord::Base
-      has_one :account
-    end
-
-    user.build_account{ |a| a.credit_limit => 100.0 }
-
-  The block is called after the instance has been initialized. [Andrew White]
-
-* Add ActiveRecord::Base.attribute_names to return a list of attribute names. This will return an empty array if the model is abstract or table does not exists. [Prem Sichanugrist]
-
-* CSV Fixtures are deprecated and support will be removed in Rails 3.2.0
-
-* AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes! all accept a second hash as option that allows you
-  to specify which role to consider when assigning attributes. This is built on top of ActiveModel's
-  new mass assignment capabilities:
-
-    class Post < ActiveRecord::Base
-      attr_accessible :title
-      attr_accessible :title, :published_at, :as => :admin
-    end
-
-    Post.new(params[:post], :as => :admin)
-
-  assign_attributes() with similar API was also added and attributes=(params, guard) was deprecated.
-
-  Please note that this changes the method signatures for AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes!. If you have overwritten these methods you should update them accordingly.
-
-  [Josh Kalderimis]
-
-* default_scope can take a block, lambda, or any other object which responds to `call` for lazy
-  evaluation:
-
-    default_scope { ... }
-    default_scope lambda { ... }
-    default_scope method(:foo)
-
-  This feature was originally implemented by Tim Morgan, but was then removed in favour of
-  defining a 'default_scope' class method, but has now been added back in by Jon Leighton.
-  The relevant lighthouse ticket is #1812.
-
-* Default scopes are now evaluated at the latest possible moment, to avoid problems where
-  scopes would be created which would implicitly contain the default scope, which would then
-  be impossible to get rid of via Model.unscoped.
-
-  Note that this means that if you are inspecting the internal structure of an
-  ActiveRecord::Relation, it will *not* contain the default scope, though the resulting
-  query will do. You can get a relation containing the default scope by calling
-  ActiveRecord#with_default_scope, though this is not part of the public API.
-
-  [Jon Leighton]
-
-* If you wish to merge default scopes in special ways, it is recommended to define your default
-  scope as a class method and use the standard techniques for sharing code (inheritance, mixins,
-  etc.):
-
-    class Post < ActiveRecord::Base
-      def self.default_scope
-        where(:published => true).where(:hidden => false)
-      end
-    end
-
-  [Jon Leighton]
-
-* PostgreSQL adapter only supports PostgreSQL version 8.2 and higher.
-
-* ConnectionManagement middleware is changed to clean up the connection pool
-  after the rack body has been flushed.
-
-* Added an update_column method on ActiveRecord. This new method updates a given attribute on an object, skipping validations and callbacks.
-  It is recommended to use #update_attribute unless you are sure you do not want to execute any callback, including the modification of
-  the updated_at column. It should not be called on new records.
-  Example:
-
-    User.first.update_column(:name, "sebastian")         # => true
-
-  [Sebastian Martinez]
-
-* Associations with a :through option can now use *any* association as the
-  through or source association, including other associations which have a
-  :through option and has_and_belongs_to_many associations
-
-  [Jon Leighton]
-
-* The configuration for the current database connection is now accessible via
-  ActiveRecord::Base.connection_config. [fxn]
-
-* limits and offsets are removed from COUNT queries unless both are supplied.
-  For example:
-
-    People.limit(1).count           # => 'SELECT COUNT(*) FROM people'
-    People.offset(1).count          # => 'SELECT COUNT(*) FROM people'
-    People.limit(1).offset(1).count # => 'SELECT COUNT(*) FROM people LIMIT 1 OFFSET 1'
-
-  [lighthouse #6262]
-
-* ActiveRecord::Associations::AssociationProxy has been split. There is now an Association class
-  (and subclasses) which are responsible for operating on associations, and then a separate,
-  thin wrapper called CollectionProxy, which proxies collection associations.
-
-  This prevents namespace pollution, separates concerns, and will allow further refactorings.
-
-  Singular associations (has_one, belongs_to) no longer have a proxy at all. They simply return
-  the associated record or nil. This means that you should not use undocumented methods such
-  as bob.mother.create - use bob.create_mother instead.
-
-  [Jon Leighton]
-
-* Make has_many :through associations work correctly when you build a record and then save it. This
-  requires you to set the :inverse_of option on the source reflection on the join model, like so:
-
-  class Post < ActiveRecord::Base
-    has_many :taggings
-    has_many :tags, :through => :taggings
-  end
-
-  class Tagging < ActiveRecord::Base
-    belongs_to :post
-    belongs_to :tag, :inverse_of => :tagging # :inverse_of must be set!
-  end
-
-  class Tag < ActiveRecord::Base
-    has_many :taggings
-    has_many :posts, :through => :taggings
-  end
-
-  post = Post.first
-  tag = post.tags.build :name => "ruby"
-  tag.save # will save a Taggable linking to the post
-
-  [Jon Leighton]
-
-* Support the :dependent option on has_many :through associations. For historical and practical
-  reasons, :delete_all is the default deletion strategy employed by association.delete(*records),
-  despite the fact that the default strategy is :nullify for regular has_many. Also, this only
-  works at all if the source reflection is a belongs_to. For other situations, you should directly
-  modify the through association.
-
-  [Jon Leighton]
-
-* Changed the behaviour of association.destroy for has_and_belongs_to_many and has_many :through.
-  From now on, 'destroy' or 'delete' on an association will be taken to mean 'get rid of the link',
-  not (necessarily) 'get rid of the associated records'.
-
-  Previously, has_and_belongs_to_many.destroy(*records) would destroy the records themselves. It
-  would not delete any records in the join table. Now, it deletes the records in the join table.
-
-  Previously, has_many_through.destroy(*records) would destroy the records themselves, and the
-  records in the join table. [Note: This has not always been the case; previous version of Rails
-  only deleted the records themselves.] Now, it destroys only the records in the join table.
-
-  Note that this change is backwards-incompatible to an extent, but there is unfortunately no
-  way to 'deprecate' it before changing it. The change is being made in order to have
-  consistency as to the meaning of 'destroy' or 'delete' across the different types of associations.
-
-  If you wish to destroy the records themselves, you can do records.association.each(&:destroy)
-
-  [Jon Leighton]
-
-* Add :bulk => true option to change_table to make all the schema changes defined in change_table block using a single ALTER statement. [Pratik Naik]
-
-  Example:
-
-  change_table(:users, :bulk => true) do |t|
-    t.string :company_name
-    t.change :birthdate, :datetime
-  end
-
-  This will now result in:
-
-    ALTER TABLE `users` ADD COLUMN `company_name` varchar(255), CHANGE `updated_at` `updated_at` datetime DEFAULT NULL
-
-* Removed support for accessing attributes on a has_and_belongs_to_many join table. This has been
-  documented as deprecated behaviour since April 2006. Please use has_many :through instead.
-  [Jon Leighton]
-
-* Added a create_association! method for has_one and belongs_to associations. [Jon Leighton]
-
-* Migration files generated from model and constructive migration generators
-  (for example, add_name_to_users) use the reversible migration's `change`
-  method instead of the ordinary `up` and `down` methods. [Prem Sichanugrist]
-
-* Removed support for interpolating string SQL conditions on associations. Instead, you should
-  use a proc, like so:
-
-  Before:
-
-    has_many :things, :conditions => 'foo = #{bar}'
-
-  After:
-
-    has_many :things, :conditions => proc { "foo = #{bar}" }
-
-  Inside the proc, 'self' is the object which is the owner of the association, unless you are
-  eager loading the association, in which case 'self' is the class which the association is within.
-
-  You can have any "normal" conditions inside the proc, so the following will work too:
-
-    has_many :things, :conditions => proc { ["foo = ?", bar] }
-
-  Previously :insert_sql and :delete_sql on has_and_belongs_to_many association allowed you to call
-  'record' to get the record being inserted or deleted. This is now passed as an argument to
-  the proc.
-
-* Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword) to encapsulate dead-simple password usage with BCrypt encryption and salting [DHH]. Example:
-
-    # Schema: User(name:string, password_digest:string, password_salt:string)
-    class User < ActiveRecord::Base
-      has_secure_password
-    end
-
-    user = User.new(:name => "david", :password => "", :password_confirmation => "nomatch")
-    user.save                                                      # => false, password required
-    user.password = "mUc3m00RsqyRe"
-    user.save                                                      # => false, confirmation doesn't match
-    user.password_confirmation = "mUc3m00RsqyRe"
-    user.save                                                      # => true
-    user.authenticate("notright")                                  # => false
-    user.authenticate("mUc3m00RsqyRe")                             # => user
-    User.find_by_name("david").try(:authenticate, "notright")      # => nil
-    User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
-
-
-* When a model is generated add_index is added by default for belongs_to or references columns
-
-  rails g model post user:belongs_to will generate the following:
-
-    class CreatePosts < ActiveRecord::Migration
-      def up
-        create_table :posts do |t|
-          t.belongs_to :user
-          t.timestamps
-        end
-
-        add_index :posts, :user_id
-      end
-
-      def down
-        drop_table :posts
-      end
-    end
-
-  [Santiago Pastorino]
-
-* Setting the id of a belongs_to object will update the reference to the
-object. [#2989 state:resolved]
-
-* ActiveRecord::Base#dup and ActiveRecord::Base#clone semantics have changed
-to closer match normal Ruby dup and clone semantics.
-
-* Calling ActiveRecord::Base#clone will result in a shallow copy of the record,
-including copying the frozen state.  No callbacks will be called.
-
-* Calling ActiveRecord::Base#dup will duplicate the record, including calling
-after initialize hooks.  Frozen state will not be copied, and all associations
-will be cleared.  A duped record will return true for new_record?, have a nil
-id field, and is saveable.
-
-* Migrations can be defined as reversible, meaning that the migration system
-will figure out how to reverse your migration.  To use reversible migrations,
-just define the "change" method.  For example:
-
-    class MyMigration < ActiveRecord::Migration
-      def change
-        create_table(:horses) do
-          t.column :content, :text
-          t.column :remind_at, :datetime
-        end
-      end
-    end
-
-Some things cannot be automatically reversed for you.  If you know how to
-reverse those things, you should define 'up' and 'down' in your migration.  If
-you define something in `change` that cannot be reversed, an
-IrreversibleMigration exception will be raised when going down.
-
-* Migrations should use instance methods rather than class methods:
-    class FooMigration < ActiveRecord::Migration
-      def up
-        ...
-      end
-    end
-
-  [Aaron Patterson]
-
-* has_one maintains the association with separate after_create/after_update instead
-  of a single after_save. [fxn]
-
-* The following code:
-
-    Model.limit(10).scoping { Model.count }
-
-  now generates the following SQL:
-
-    SELECT COUNT(*) FROM models LIMIT 10
-
-  This may not return what you want.  Instead, you may with to do something
-  like this:
-
-    Model.limit(10).scoping { Model.all.size }
-
-  [Aaron Patterson]
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-* Destroying records via nested attributes works independent of reject_if LH #6006 [Durran Jordan]
-
-* Delegate any? and many? to Model.scoped for consistency [Andrew White]
-
-* Quote the ORDER BY clause in batched finds - fixes #6620 [Andrew White]
-
-* Change exists? so records are not instantiated - fixes #6127. This prevents after_find
-  and after_initialize callbacks being triggered when checking for record existence.
-  [Andrew White]
-
-* Fix performance bug with attribute accessors which only occurred on Ruby 1.8.7, and ensure we
-  cache type-casted values when the column returned from the db contains non-standard chars.
-  [Jon Leighton]
-
-* Fix a performance regression introduced here 86acbf1cc050c8fa8c74a10c735e467fb6fd7df8
-  related to read_attribute method [Stian Grytøyr]
-
-
-*Rails 3.0.6 (April 5, 2011)*
-
-* Un-deprecate reorder method [Sebastian Martinez]
-
-* Extensions are applied when calling +except+ or +only+ on relations.
-  Thanks to Iain Hecker.
-
-* Schemas set in set_table_name are respected by the mysql adapter. LH #5322
-
-* Fixed a bug when empty? was called on a grouped Relation that wasn't loaded.
-  LH #5829
-
-* Reapply extensions when using except and only. Thanks Iain Hecker.
-
-* Binary data is escaped when being inserted to SQLite3 Databases. Thanks
-  Naruse!
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* Model.where(:column => 1).where(:column => 2) will always produce an AND
-query.
-
-  [Aaron Patterson]
-
-* Deprecated support for interpolated association conditions in the form of :conditions => 'foo = #{bar}'.
-
-  Instead, you should use a proc, like so:
-
-  Before:
-
-    has_many :things, :conditions => 'foo = #{bar}'
-
-  After:
-
-    has_many :things, :conditions => proc { "foo = #{bar}" }
-
-  Inside the proc, 'self' is the object which is the owner of the association, unless you are
-  eager loading the association, in which case 'self' is the class which the association is within.
-
-  You can have any "normal" conditions inside the proc, so the following will work too:
-
-    has_many :things, :conditions => proc { ["foo = ?", bar] }
-
-  Previously :insert_sql and :delete_sql on has_and_belongs_to_many association allowed you to call
-  'record' to get the record being inserted or deleted. This is now passed as an argument to
-  the proc.
-
-  [Jon Leighton]
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* Added deprecation warning for has_and_belongs_to_many associations where the join table has
-  additional attributes other than the keys. Access to these attributes is removed in 3.1.
-  Please use has_many :through instead. [Jon Leighton]
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* Support find by class like this: Post.where(:name => Post)
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* Dramatic speed increase (see: http://engineering.attinteractive.com/2010/10/arel-two-point-ohhhhh-yaaaaaa/) [Aaron Patterson]
-
-* reorder is deprecated in favor of except(:order).order(...) [Santiago Pastorino]
-
-* except is now AR public API
-
-    Model.order('name').except(:order).order('salary')
-
-  generates:
-
-    SELECT * FROM models ORDER BY salary
-
-  [Santiago Pastorino]
-
-* The following code:
-
-    Model.limit(10).scoping { Model.count }
-
-  now generates the following SQL:
-
-    SELECT COUNT(*) FROM models LIMIT 10
-
-  This may not return what you want.  Instead, you may with to do something
-  like this:
-
-    Model.limit(10).scoping { Model.all.size }
-
-  [Aaron Patterson]
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* Introduce a fix for CVE-2010-3993
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
-
-* Add scoping and unscoped as the syntax to replace the old with_scope and with_exclusive_scope [José Valim]
-
-* New rake task, db:migrate:status, displays status of migrations #4947 [Kevin Skoglund]
-
-* select and order for ActiveRecord now always concatenate nested calls. Use reorder if you want the original order to be overwritten [Santiago Pastorino]
-
-* PostgreSQL: ensure the database time zone matches Ruby's time zone #4895 [Aaron Patterson]
-
-* Fixed that ActiveRecord::Base.compute_type would swallow NoMethodError #4751 [Andrew Bloomgarden, Andrew White]
-
-* Add index length support for MySQL. #1852 [Emili Parreno, Pratik Naik]
-
-  Example:
-
-    add_index(:accounts, :name, :name => 'by_name', :length => 10)
-    => CREATE INDEX by_name ON accounts(name(10))
-
-    add_index(:accounts, [:name, :surname], :name => 'by_name_surname', :length => {:name => 10, :surname => 15})
-    => CREATE INDEX by_name_surname ON accounts(name(10), surname(15))
-
-* find_or_create_by_attr(value, ...) works when attr is protected.  #4457 [Santiago Pastorino, Marc-André Lafortune]
-
-* New callbacks: after_commit and after_rollback. Do expensive operations like image thumbnailing after_commit instead of after_save.  #2991 [Brian Durand]
-
-* Serialized attributes are not converted to YAML if they are any of the formats that can be serialized to XML (like Hash, Array and Strings). [José Valim]
-
-* Destroy uses optimistic locking. If lock_version on the record you're destroying doesn't match lock_version in the database, a StaleObjectError is raised.  #1966 [Curtis Hawthorne]
-
-* PostgreSQL: drop support for old postgres driver. Use pg 0.9.0 or later.  [Jeremy Kemper]
-
-* Observers can prevent records from saving by returning false, just like before_save and friends.  #4087 [Mislav Marohnić]
-
-* Add Relation extensions. [Pratik Naik]
-
-  users = User.where(:admin => true).extending(User::AdminPowers)
-
-  latest_users = User.order('created_at DESC') do
-    def posts_count
-      Post.count(:user_id => to_a.map(&:id))
-    end
-  end
-
-* To prefix the table names of all models in a module, define self.table_name_prefix on the module.  #4032 [Andrew White]
-
-* Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH]
-
-* PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns. #3777 [Jack Christensen]
-
-* Allow relations to be used as scope.
-
-  class Item
-    scope :red, where(:colour => 'red')
-  end
-
-  Item.red.limit(10) # Ten red items
-
-* Rename named_scope to scope. [Pratik Naik]
-
-* Changed ActiveRecord::Base.store_full_sti_class to be true by default reflecting the previously announced Rails 3 default [DHH]
-
-* Add Relation#except. [Pratik Naik]
-
-  one_red_item = Item.where(:colour => 'red').limit(1)
-  all_items = one_red_item.except(:where, :limit)
-
-* Add Relation#delete_all. [Pratik Naik]
-
-  Item.where(:colour => 'red').delete_all
-
-* Add Model.having and Relation#having. [Pratik Naik]
-
-  Developer.group("salary").having("sum(salary) >  10000").select("salary")
-
-* Add Relation#count. [Pratik Naik]
-
-  legends = People.where("age > 100")
-  legends.count
-  legends.count(:age, :distinct => true)
-  legends.select('id').count
-
-* Add Model.readonly and association_collection#readonly finder method. [Pratik Naik]
-
-  Post.readonly.to_a # Load all posts in readonly mode
-  @user.items.readonly(false).to_a # Load all the user items in writable mode
-
-* Add .lock finder method [Pratik Naik]
-
-  User.lock.where(:name => 'lifo').to_a
-
-  old_items = Item.where("age > 100")
-  old_items.lock.each {|i| .. }
-
-* Add Model.from and association_collection#from finder methods [Pratik Naik]
-
-  user = User.scoped
-  user.select('*').from('users, items')
-
-* Add relation.destroy_all [Pratik Naik]
-
-  old_items = Item.where("age > 100")
-  old_items.destroy_all
-
-* Add relation.exists? [Pratik Naik]
-
-  red_items = Item.where(:colours => 'red')
-  red_items.exists?
-  red_items.exists?(1)
-
-* Add find(ids) to relations. [Pratik Naik]
-
-  old_users = User.order("age DESC")
-  old_users.find(1)
-  old_users.find(1, 2, 3)
-
-* Add new finder methods to association collection. [Pratik Naik]
-
-  class User < ActiveRecord::Base
-    has_many :items
-  end
-
-  user = User.first
-  user.items.where(:items => {:colour => 'red'})
-  user.items.select('items.id')
-
-* Add relation.reload to force reloading the records. [Pratik Naik]
-
-  topics = Topic.scoped
-  topics.to_a  # force load
-  topics.first # returns a cached record
-  topics.reload
-  topics.first # Fetches a new record from the database
-
-* Rename Model.conditions and relation.conditions to .where. [Pratik Naik]
-
-  Before :
-    User.conditions(:name => 'lifo')
-    User.select('id').conditions(["age > ?", 21])
-
-  Now :
-    User.where(:name => 'lifo')
-    User.select('id').where(["age > ?", 21])
-
-* Add Model.select/group/order/limit/joins/conditions/preload/eager_load class methods returning a lazy relation. [Pratik Naik]
-
-  Examples :
-
-    posts = Post.select('id).order('name') # Returns a lazy relation
-    posts.each {|p| puts p.id } # Fires "select id from posts order by name"
-
-* Model.scoped now returns a relation if invoked without any arguments. [Pratik Naik]
-
-  Example :
-
-    posts = Post.scoped
-    posts.size # Fires "select count(*) from  posts" and returns the count
-    posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
-
-* Association inverses for belongs_to, has_one, and has_many. Optimization to reduce database queries.  #3533 [Murray Steele]
-
-    # post.comments sets each comment's post without needing to :include
-    class Post < ActiveRecord::Base
-      has_many :comments, :inverse_of => :post
-    end
-
-* MySQL: add_ and change_column support positioning.  #3286 [Ben Marini]
-
-* Reset your Active Record counter caches with the reset_counter_cache class method.  #1211 [Mike Breen, Gabe da Silveira]
-
-* Remove support for SQLite 2. Please upgrade to SQLite 3+ or install the plugin from git://github.com/rails/sqlite2_adapter.git [Pratik Naik]
-
-* PostgreSQL: XML datatype support.  #1874 [Leonardo Borges]
-
-* quoted_date converts time-like objects to ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc. #2946 [Geoff Buesing]
-
-* SQLite: drop support for 'dbfile' option in favor of 'database.'  #2363 [Paul Hinze, Jeremy Kemper]
-
-* Added :primary_key option to belongs_to associations.  #765 [Szymon Nowak, Philip Hallstrom, Noel Rocha]
-    # employees.company_name references companies.name
-    Employee.belongs_to :company, :primary_key => 'name', :foreign_key => 'company_name'
-
-* Implement #many? for NamedScope and AssociationCollection using #size. #1500 [Chris Kampmeier]
-
-* Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed [DHH]
-
-* Added ActiveRecord::Base#touch to update the updated_at/on attributes (or another specified timestamp) with the current time [DHH]
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* Added ActiveRecord::Base.find_each and ActiveRecord::Base.find_in_batches for batch processing [DHH/Jamis Buck]
-
-* Added that ActiveRecord::Base.exists? can be called with no arguments #1817 [Scott Taylor]
-
-* Add Support for updating deeply nested models from a single form. #1202 [Eloy Duran]
-
-  class Book < ActiveRecord::Base
-    has_one :author
-    has_many :pages
-
-    accepts_nested_attributes_for :author, :pages
-  end
-
-* Make after_save callbacks fire only if the record was successfully saved.  #1735 [Michael Lovitt]
-
-  Previously the callbacks would fire if a before_save cancelled saving.
-
-* Support nested transactions using database savepoints.  #383 [Jonathan Viney, Hongli Lai]
-
-* Added dynamic scopes ala dynamic finders #1648 [Yaroslav Markin]
-
-* Fixed that ActiveRecord::Base#new_record? should return false (not nil) for existing records #1219 [Yaroslav Markin]
-
-* I18n the word separator for error messages. Introduces the activerecord.errors.format.separator translation key.  #1294 [Akira Matsuda]
-
-* Add :having as a key to find and the relevant associations.  [Emilio Tagua]
-
-* Added default_scope to Base #1381 [Paweł Kondzior]. Example:
-
-    class Person < ActiveRecord::Base
-      default_scope :order => 'last_name, first_name'
-    end
-
-    class Company < ActiveRecord::Base
-      has_many :people
-    end
-
-    Person.all             # => Person.find(:all, :order => 'last_name, first_name')
-    Company.find(1).people # => Person.find(:all, :order => 'last_name, first_name', :conditions => { :company_id => 1 })
-
-
-*2.2.1 [RC2] (November 14th, 2008)*
-
-* Ensure indices don't flip order in schema.rb #1266 [Jordi Bunster]
-
-* Fixed that serialized strings should never be type-casted (i.e. turning "Yes" to a boolean) #857 [Andreas Korth]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* Skip collection ids reader optimization if using :finder_sql [Jeremy Kemper]
-
-* Add Model#delete instance method, similar to Model.delete class method. #1086 [Hongli Lai (Phusion)]
-
-* MySQL: cope with quirky default values for not-null text columns.  #1043 [Frederick Cheung]
-
-* Multiparameter attributes skip time zone conversion for time-only columns [#1030 state:resolved] [Geoff Buesing]
-
-* Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved] [Emilio Tagua]
-
-* Added find_last_by dynamic finder #762 [Emilio Tagua]
-
-* Internal API: configurable association options and build_association method for reflections so plugins may extend and override.  #985 [Hongli Lai (Phusion)]
-
-* Changed benchmarks to be reported in milliseconds [David Heinemeier Hansson]
-
-* Connection pooling.  #936 [Nick Sieger]
-
-* Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code!  #501 [Andrew White]
-
-* before_save, before_validation and before_destroy callbacks that return false will now ROLLBACK the transaction.  Previously this would have been committed before the processing was aborted. #891 [Xavier Noria]
-
-* Transactional migrations for databases which support them.  #834 [divoxx, Adam Wiggins, Tarmo Tänav]
-
-* Set config.active_record.timestamped_migrations = false to have migrations with numeric prefix instead of UTC timestamp. #446. [Andrew Stone, Nik Wakelin]
-
-* change_column_default preserves the not-null constraint.  #617 [Tarmo Tänav]
-
-* Fixed that create database statements would always include "DEFAULT NULL" (Nick Sieger) [#334]
-
-* Add :tokenizer option to validates_length_of to specify how to split up the attribute string. #507. [David Lowenfels] Example :
-
-  # Ensure essay contains at least 100 words.
-  validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least %d words."), :tokenizer => lambda {|str| str.scan(/\w+/) }
-
-* Allow conditions on multiple tables to be specified using hash. [Pratik Naik]. Example:
-
-  User.all :joins => :items, :conditions => { :age => 10, :items => { :color => 'black' } }
-  Item.first :conditions => { :items => { :color => 'red' } }
-
-* Always treat integer :limit as byte length.  #420 [Tarmo Tänav]
-
-* Partial updates don't update lock_version if nothing changed.  #426 [Daniel Morrison]
-
-* Fix column collision with named_scope and :joins.  #46 [Duncan Beevers, Mark Catley]
-
-* db:migrate:down and :up update schema_migrations.  #369 [Michael Raidel, RaceCondition]
-
-* PostgreSQL: support :conditions => [':foo::integer', { :foo => 1 }] without treating the ::integer typecast as a bind variable.  [Tarmo Tänav]
-
-* MySQL: rename_column preserves column defaults.  #466 [Diego Algorta]
-
-* Add :from option to calculations.  #397 [Ben Munat]
-
-* Add :validate option to associations to enable/disable the automatic validation of associated models. Resolves #301. [Jan De Poorter]
-
-* PostgreSQL: use 'INSERT ... RETURNING id' for 8.2 and later.  [Jeremy Kemper]
-
-* Added SQL escaping for :limit and :offset in MySQL [Jonathan Wiess]
-
-
-*2.1.0 (May 31st, 2008)*
-
-* Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [Rick Olson]
-
-* Add first/last methods to associations/named_scope. Resolved #226. [Ryan Bates]
-
-* Added SQL escaping for :limit and :offset #288 [Aaron Bedra, Steven Bristol, Jonathan Wiess]
-
-* Added first/last methods to associations/named_scope. Resolved #226. [Ryan Bates]
-
-* Ensure hm:t preloading honours reflection options. Resolves #137. [Frederick Cheung]
-
-* Added protection against duplicate migration names (Aslak Hellesøy) [#112]
-
-* Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true [Geoff Buesing]
-
-* Time zone aware attribute methods use Time.zone.parse instead of #to_time for String arguments, so that offset information in String is respected. Resolves #105. [Scott Fleckenstein, Geoff Buesing]
-
-* Added change_table for migrations (Jeff Dean) [#71]. Example:
-
-    change_table :videos do |t|
-      t.timestamps                          # adds created_at, updated_at
-      t.belongs_to :goat                    # adds goat_id integer
-      t.string :name, :email, :limit => 20  # adds name and email both with a 20 char limit
-      t.remove :name, :email                # removes the name and email columns
-    end
-
-* Fixed has_many :through .create with no parameters caused a "can't dup NilClass" error (Steven Soroka) [#85]
-
-* Added block-setting of attributes for Base.create like Base.new already has (Adam Meehan) [#39]
-
-* Fixed that pessimistic locking you reference the quoted table name (Josh Susser) [#67]
-
-* Fixed that change_column should be able to use :null => true on a field that formerly had false [Nate Wiger] [#26]
-
-* Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL [David Heinemeier Hansson]
-
-* Change validates_uniqueness_of :case_sensitive option default back to true (from [9160]).  Love your database columns, don't LOWER them.  [Rick Olson]
-
-* Add support for interleaving migrations by storing which migrations have run in the new schema_migrations table. Closes #11493 [Jordi Bunster]
-
-* ActiveRecord::Base#sum defaults to 0 if no rows are returned.  Closes #11550 [Kamal Fariz Mahyuddin]
-
-* Ensure that respond_to? considers dynamic finder methods. Closes #11538. [James Mead]
-
-* Ensure that save on parent object fails for invalid has_one association. Closes #10518. [Pratik Naik]
-
-* Remove duplicate code from associations. [Pratik Naik]
-
-* Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Association callbacks and <association>_ids= now work with hm:t. #11516 [Ruy Asan]
-
-* Ensure HABTM#create and HABTM#build do not load entire association. [Pratik Naik]
-
-* Improve documentation. [Xavier Noria, Jack Danger Canty, leethal]
-
-* Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {"post": {"title": ...}} [Rick Olson]
-
-  Post.find(1).to_json # => {"title": ...}
-  config.active_record.include_root_in_json = true
-  Post.find(1).to_json # => {"post": {"title": ...}}
-
-* Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm).  [stopdropandrew]
-
-* PostgreSQL: create_ and drop_database support.  #9042 [ez, pedz, Nick Sieger]
-
-* Ensure that validates_uniqueness_of works with with_scope. Closes #9235. [Nik Wakelin, cavalle]
-
-* Partial updates include only unsaved attributes. Off by default; set YourClass.partial_updates = true to enable.  [Jeremy Kemper]
-
-* Removing unnecessary uses_tzinfo helper from tests, given that TZInfo is now bundled [Geoff Buesing]
-
-* Fixed that validates_size_of :within works in associations #11295, #10019 [cavalle]
-
-* Track changes to unsaved attributes.  [Jeremy Kemper]
-
-* Switched to UTC-timebased version numbers for migrations and the schema. This will as good as eliminate the problem of multiple migrations getting the same version assigned in different branches. Also added rake db:migrate:up/down to apply individual migrations that may need to be run when you merge branches #11458 [John Barnette]
-
-* Fixed that has_many :through would ignore the hash conditions #11447 [Emilio Tagua]
-
-* Fix issue where the :uniq option of a has_many :through association is ignored when find(:all) is called.  Closes #9407 [cavalle]
-
-* Fix duplicate table alias error when including an association with a has_many :through association on the same join table.  Closes #7310 [cavalle]
-
-* More efficient association preloading code that compacts a through_records array in a central location.  Closes #11427 [Jack Danger Canty]
-
-* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
-
-* Fixed that ActiveRecord#Base.find_or_create/initialize would not honor attr_protected/accessible when used with a hash #11422 [Emilio Tagua]
-
-* Added ActiveRecord#Base.all/first/last as aliases for find(:all/:first/:last) #11413 [nkallen, Chris O'Sullivan]
-
-* Merge the has_finder gem, renamed as 'named_scope'.  #11404 [nkallen]
-
-  class Article < ActiveRecord::Base
-    named_scope :published, :conditions => {:published => true}
-    named_scope :popular, :conditions => ...
-  end
-
-  Article.published.paginate(:page => 1)
-  Article.published.popular.count
-  Article.popular.find(:first)
-  Article.popular.find(:all, :conditions => {...})
-
-  See http://pivots.pivotallabs.com/users/nick/blog/articles/284-hasfinder-it-s-now-easier-than-ever-to-create-complex-re-usable-sql-queries
-
-* Add has_one :through support.  #4756 [Chris O'Sullivan]
-
-* Migrations: create_table supports primary_key_prefix_type.  #10314 [student, Chris O'Sullivan]
-
-* Added logging for dependency load errors with fixtures #11056 [stuthulhu]
-
-* Time zone aware attributes use Time#in_time_zone [Geoff Buesing]
-
-* Fixed that scoped joins would not always be respected #6821 [Theory/Jack Danger Canty]
-
-* Ensure that ActiveRecord::Calculations disambiguates field names with the table name.  #11027 [cavalle]
-
-* Added add/remove_timestamps to the schema statements for adding the created_at/updated_at columns on existing tables #11129 [jramirez]
-
-* Added ActiveRecord::Base.find(:last) #11338 [Emilio Tagua]
-
-* test_native_types expects DateTime.local_offset instead of DateTime.now.offset; fixes test breakage due to dst transition [Geoff Buesing]
-
-* Add :readonly option to HasManyThrough associations. #11156 [Emilio Tagua]
-
-* Improve performance on :include/:conditions/:limit queries by selectively joining in the pre-query.  #9560 [dasil003]
-
-* Perf fix: Avoid the use of named block arguments.  Closes #11109 [adymo]
-
-* PostgreSQL: support server versions 7.4 through 8.0 and the ruby-pg driver.  #11127 [jdavis]
-
-* Ensure association preloading doesn't break when an association returns nil. ##11145 [GMFlash]
-
-* Make dynamic finders respect the :include on HasManyThrough associations.  #10998. [cpytel]
-
-* Base#instantiate_time_object only uses Time.zone when Base.time_zone_aware_attributes is true; leverages Time#time_with_datetime_fallback for readability [Geoff Buesing]
-
-* Refactor ConnectionAdapters::Column.new_time: leverage DateTime failover behavior of Time#time_with_datetime_fallback [Geoff Buesing]
-
-* Improve associations performance by using symbol callbacks instead of string callbacks. #11108 [adymo]
-
-* Optimise the BigDecimal conversion code.  #11110 [adymo]
-
-* Introduce the :readonly option to all associations. Records from the association cannot be saved.  #11084 [Emilio Tagua]
-
-* Multiparameter attributes for time columns fail over to DateTime when out of range of Time [Geoff Buesing]
-
-* Base#instantiate_time_object uses Time.zone.local() [Geoff Buesing]
-
-* Add timezone-aware attribute readers and writers. #10982 [Geoff Buesing]
-
-* Instantiating time objects in multiparameter attributes uses Time.zone if available.  #10982 [Rick Olson]
-
-* Add note about how ActiveRecord::Observer classes are initialized in a Rails app. #10980 [Xavier Noria]
-
-* MySQL: omit text/blob defaults from the schema instead of using an empty string.  #10963 [mdeiters]
-
-* belongs_to supports :dependent => :destroy and :delete.  #10592 [Jonathan Viney]
-
-* Introduce preload query strategy for eager :includes.  #9640 [Frederick Cheung, Aliaksey Kandratsenka, codafoo]
-
-* Support aggregations in finder conditions.  #10572 [Ryan Kinderman]
-
-* Organize and clean up the Active Record test suite.  #10742 [John Barnette]
-
-* Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 [john.andrews]
-
-* Fix issue where Table#references doesn't pass a :null option to a *_type attribute for polymorphic associations.  Closes #10753 [railsjitsu]
-
-* Fixtures: removed support for the ancient pre-YAML file format.  #10736 [John Barnette]
-
-* More thoroughly quote table names.  #10698 [dimdenis, lotswholetime, Jeremy Kemper]
-
-* update_all ignores scoped :order and :limit, so post.comments.update_all doesn't try to include the comment order in the update statement.  #10686 [Brendan Ribera]
-
-* Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries [David Heinemeier Hansson]
-
-* Make sure CSV fixtures are compatible with ruby 1.9's new csv implementation. [JEG2]
-
-* Added by parameter to increment, decrement, and their bang varieties so you can do player1.increment!(:points, 5) #10542 [Sam]
-
-* Optimize ActiveRecord::Base#exists? to use #select_all instead of #find.  Closes #10605 [jamesh, Frederick Cheung, protocool]
-
-* Don't unnecessarily load has_many associations in after_update callbacks.  Closes #6822 [stopdropandrew, canadaduane]
-
-* Eager belongs_to :include infers the foreign key from the association name rather than the class name.  #10517 [Jonathan Viney]
-
-* SQLite: fix rename_ and remove_column for columns with unique indexes.  #10576 [Brandon Keepers]
-
-* Ruby 1.9 compatibility.  #10655 [Jeremy Kemper, Dirkjan Bussink]
-
-
-*2.0.2* (December 16th, 2007)
-
-* Ensure optimistic locking handles nil #lock_version values properly.  Closes #10510 [Rick Olson]
-
-* Make the Fixtures Test::Unit enhancements more supporting for double-loaded test cases.  Closes #10379 [brynary]
-
-* Fix that validates_acceptance_of still works for non-existent tables (useful for bootstrapping new databases).  Closes #10474 [Josh Susser]
-
-* Ensure that the :uniq option for has_many :through associations retains the order.  #10463 [remvee]
-
-* Base.exists? doesn't rescue exceptions to avoid hiding SQL errors.  #10458 [Michael Klishin]
-
-* Documentation: Active Record exceptions, destroy_all and delete_all.  #10444, #10447 [Michael Klishin]
-
-
-*2.0.1* (December 7th, 2007)
-
-* Removed query cache rescue as it could cause code to be run twice (closes #10408) [David Heinemeier Hansson]
-
-
-*2.0.0* (December 6th, 2007)
-
-* Anchor DateTimeTest to fixed DateTime instead of a variable value based on Time.now#advance#to_datetime, so that this test passes on 64-bit platforms running Ruby 1.8.6+ [Geoff Buesing]
-
-* Fixed that the Query Cache should just be ignored if the database is misconfigured (so that the "About your applications environment" works even before the database has been created) [David Heinemeier Hansson]
-
-* Fixed that the truncation of strings longer than 50 chars should use inspect
-so newlines etc are escaped #10385 [Norbert Crombach]
-
-* Fixed that habtm associations should be able to set :select as part of their definition and have that honored [David Heinemeier Hansson]
-
-* Document how the :include option can be used in Calculations::calculate.  Closes #7446 [adamwiggins, ultimoamore]
-
-* Fix typo in documentation for polymorphic associations w/STI. Closes #7461 [johnjosephbachir]
-
-* Reveal that the type option in migrations can be any supported column type for your database but also include caveat about agnosticism. Closes #7531 [adamwiggins, mikong]
-
-* More complete documentation for find_by_sql. Closes #7912 [fearoffish]
-
-* Added ActiveRecord::Base#becomes to turn a record into one of another class (mostly relevant for STIs) [David Heinemeier Hansson]. Example:
-
-    render :partial => @client.becomes(Company) # renders companies/company instead of clients/client
-
-* Fixed that to_xml should not automatically pass :procs to associations included with :include #10162 [Cheah Chu Yeow]
-
-* Fix documentation typo introduced in [8250]. Closes #10339 [Henrik N]
-
-* Foxy fixtures: support single-table inheritance.  #10234 [tom]
-
-* Foxy fixtures: allow mixed usage to make migration easier and more attractive.  #10004 [lotswholetime]
-
-* Make the record_timestamps class-inheritable so it can be set per model.  #10004 [tmacedo]
-
-* Allow validates_acceptance_of to use a real attribute instead of only virtual (so you can record that the acceptance occured) #7457 [ambethia]
-
-* DateTimes use Ruby's default calendar reform setting. #10201 [Geoff Buesing]
-
-* Dynamic finders on association collections respect association :order and :limit.  #10211, #10227 [Patrick Joyce, Rick Olson, Jack Danger Canty]
-
-* Add 'foxy' support for fixtures of polymorphic associations. #10183 [John Barnette, David Lowenfels]
-
-* validates_inclusion_of and validates_exclusion_of allow formatted :message strings.  #8132 [devrieda, Mike Naberezny]
-
-* attr_readonly behaves well with optimistic locking.  #10188 [Nick Bugajski]
-
-* Base#to_xml supports the nil="true" attribute like Hash#to_xml.  #8268 [Jonathan del Strother]
-
-* Change plings to the more conventional quotes in the documentation. Closes #10104 [Jack Danger Canty]
-
-* Fix HasManyThrough Association so it uses :conditions on the HasMany Association.  Closes #9729 [Jack Danger Canty]
-
-* Ensure that column names are quoted.  Closes #10134 [wesley.moxam]
-
-* Smattering of grammatical fixes to documentation. Closes #10083 [Bob Silva]
-
-* Enhance explanation with more examples for attr_accessible macro. Closes #8095 [fearoffish, Marcel Molina Jr.]
-
-* Update association/method mapping table to refected latest collection methods for has_many :through. Closes #8772 [Pratik Naik]
-
-* Explain semantics of having several different AR instances in a transaction block. Closes #9036 [jacobat, Marcel Molina Jr.]
-
-* Update Schema documentation to use updated sexy migration notation. Closes #10086 [Sam Granieri]
-
-* Make fixtures work with the new test subclasses. [Tarmo Tänav, Michael Koziarski]
-
-* Introduce finder :joins with associations. Same :include syntax but with inner rather than outer joins.  #10012 [RubyRedRick]
-    # Find users with an avatar
-    User.find(:all, :joins => :avatar)
-
-    # Find posts with a high-rated comment.
-    Post.find(:all, :joins => :comments, :conditions => 'comments.rating > 3')
-
-* Associations: speedup duplicate record check.  #10011 [Pratik Naik]
-
-* Make sure that << works on has_many associations on unsaved records.  Closes #9989 [Josh Susser]
-
-* Allow association redefinition in subclasses.  #9346 [wildchild]
-
-* Fix has_many :through delete with custom foreign keys.  #6466 [naffis]
-
-* Foxy fixtures, from rathole (http://svn.geeksomnia.com/rathole/trunk/README)
-    - stable, autogenerated IDs
-    - specify associations (belongs_to, has_one, has_many) by label, not ID
-    - specify HABTM associations as inline lists
-    - autofill timestamp columns
-    - support YAML defaults
-    - fixture label interpolation
-  Enabled for fixtures that correspond to a model class and don't specify a primary key value.  #9981 [John Barnette]
-
-* Add docs explaining how to protect all attributes using attr_accessible with no arguments. Closes #9631 [boone, rmm5t]
-
-* Update add_index documentation to use new options api. Closes #9787 [Kamal Fariz Mahyuddin]
-
-* Allow find on a has_many association defined with :finder_sql to accept id arguments as strings like regular find does. Closes #9916 [krishna]
-
-* Use VALID_FIND_OPTIONS when resolving :find scoping rather than hard coding the list of valid find options. Closes #9443 [sur]
-
-* Limited eager loading no longer ignores scoped :order. Closes #9561 [Jack Danger Canty, Josh Peek]
-
-* Assigning an instance of a foreign class to a composed_of aggregate calls an optional conversion block. Refactor and simplify composed_of implementation.  #6322 [brandon, Chris Cruft]
-
-* Assigning nil to a composed_of aggregate also sets its immediate value to nil.  #9843 [Chris Cruft]
-
-* Ensure that mysql quotes table names with database names correctly.  Closes #9911 [crayz]
-
-  "foo.bar" => "`foo`.`bar`"
-
-* Complete the assimilation of Sexy Migrations from ErrFree [Chris Wanstrath, PJ Hyett]
-  http://errtheblog.com/post/2381
-
-* Qualified column names work in hash conditions, like :conditions => { 'comments.created_at' => ... }.  #9733 [Jack Danger Canty]
-
-* Fix regression where the association would not construct new finder SQL on save causing bogus queries for "WHERE owner_id = NULL" even after owner was saved.  #8713 [Bryan Helmkamp]
-
-* Refactor association create and build so before & after callbacks behave consistently.  #8854 [Pratik Naik, mortent]
-
-* Quote table names. Defaults to column quoting.  #4593 [Justin Lynn, gwcoffey, eadz, Dmitry V. Sabanin, Jeremy Kemper]
-
-* Alias association #build to #new so it behaves predictably.  #8787 [Pratik Naik]
-
-* Add notes to documentation regarding attr_readonly behavior with counter caches and polymorphic associations.  Closes #9835 [saimonmoore, Rick Olson]
-
-* Observers can observe model names as symbols properly now.  Closes #9869  [queso]
-
-* find_and_(initialize|create)_by methods can now properly initialize protected attributes [Tobias Lütke]
-
-* belongs_to infers the foreign key from the association name instead of from the class name.  [Jeremy Kemper]
-
-* PostgreSQL: support multiline default values.  #7533 [Carl Lerche, aguynamedryan, Rein Henrichs, Tarmo Tänav]
-
-* MySQL: fix change_column on not-null columns that don't accept dfeault values of ''.  #6663 [Jonathan Viney, Tarmo Tänav]
-
-* validates_uniqueness_of behaves well with abstract superclasses and
-single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Beausoleil, Josh Peek, Tarmo Tänav, pat]
-
-* Warn about protected attribute assigments in development and test environments when mass-assigning to an attr_protected attribute.  #9802 [Henrik N]
-
-* Speedup database date/time parsing.  [Jeremy Kemper, Tarmo Tänav]
-
-* Fix calling .clear on a has_many :dependent=>:delete_all association. [Tarmo Tänav]
-
-* Allow change_column to set NOT NULL in the PostgreSQL adapter [Tarmo Tänav]
-
-* Fix that ActiveRecord would create attribute methods and override custom attribute getters if the method is also defined in Kernel.methods. [Rick Olson]
-
-* Don't call attr_readonly on polymorphic belongs_to associations, in case it matches the name of some other non-ActiveRecord class/module.  [Rick Olson]
-
-* Try loading activerecord-<adaptername>-adapter gem before trying a plain require so you can use custom gems for the bundled adapters. Also stops gems from requiring an adapter from an old Active Record gem.  [Jeremy Kemper, Derrick Spell]
-
-
-*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.14.2 - 1.15.3]
-
-* Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 [Dan Manges]
-
-  class Comment < ActiveRecord::Base
-    # Automatically sets Article#comments_count as readonly.
-    belongs_to :article, :counter_cache => :comments_count
-  end
-
-  class Article < ActiveRecord::Base
-    attr_readonly :approved_comments_count
-  end
-
-* Make size for has_many :through use counter cache if it exists.  Closes #9734 [Xavier Shay]
-
-* Remove DB2 adapter since IBM chooses to maintain their own adapter instead.  [Jeremy Kemper]
-
-* Extract Oracle, SQLServer, and Sybase adapters into gems.  [Jeremy Kemper]
-
-* Added fixture caching that'll speed up a normal fixture-powered test suite between 50% and 100% #9682 [Frederick Cheung]
-
-* Correctly quote id list for limited eager loading.  #7482 [tmacedo]
-
-* Fixed that using version-targetted migrates would fail on loggers other than the default one #7430 [valeksenko]
-
-* Fixed rename_column for SQLite when using symbols for the column names #8616 [drodriguez]
-
-* Added the possibility of using symbols in addition to concrete classes with ActiveRecord::Observer#observe.  #3998 [Robby Russell, Tarmo Tänav]
-
-* Added ActiveRecord::Base#to_json/from_json [David Heinemeier Hansson, Cheah Chu Yeow]
-
-* Added ActiveRecord::Base#from_xml [David Heinemeier Hansson]. Example:
-
-    xml = "<person><name>David</name></person>"
-    Person.new.from_xml(xml).name # => "David"
-
-* Define dynamic finders as real methods after first usage. [bscofield]
-
-* Deprecation: remove deprecated threaded_connections methods. Use allow_concurrency instead.  [Jeremy Kemper]
-
-* Associations macros accept extension blocks alongside modules.  #9346 [Josh Peek]
-
-* Speed up and simplify query caching.  [Jeremy Kemper]
-
-* connection.select_rows 'sql' returns an array (rows) of arrays (field values).  #2329 [Michael Schuerig]
-
-* Eager loading respects explicit :joins.  #9496 [dasil003]
-
-* Extract Firebird, FrontBase, and OpenBase adapters into gems.  #9508, #9509, #9510 [Jeremy Kemper]
-
-* RubyGem database adapters: expects a gem named activerecord-<database>-adapter with active_record/connection_adapters/<database>_adapter.rb in its load path.  [Jeremy Kemper]
-
-* Fixed that altering join tables in migrations would fail w/ sqlite3 #7453 [TimoMihaljov/brandon]
-
-* Fix association writer with :dependent => :nullify.  #7314 [Jonathan Viney]
-
-* OpenBase: update for new lib and latest Rails. Support migrations.  #8748 [dcsesq]
-
-* Moved acts_as_tree into a plugin of the same name on the official Rails svn.  #9514 [Pratik Naik]
-
-* Moved acts_as_nested_set into a plugin of the same name on the official Rails svn.  #9516 [Josh Peek]
-
-* Moved acts_as_list into a plugin of the same name on the official Rails svn.  [Josh Peek]
-
-* Explicitly require active_record/query_cache before using it.  [Jeremy Kemper]
-
-* Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record.  [Rick Olson, marclove]
-
-* Performance: absorb instantiate and initialize_with_callbacks into the Base methods. [Jeremy Kemper]
-
-* Fixed that eager loading queries and with_scope should respect the :group option [David Heinemeier Hansson]
-
-* Improve performance and functionality of the postgresql adapter.  Closes #8049 [roderickvd]
-
-  For more information see: http://dev.rubyonrails.org/ticket/8049
-
-* Don't clobber includes passed to has_many.count [Jack Danger Canty]
-
-* Make sure has_many uses :include when counting [Jack Danger Canty]
-
-* Change the implementation of ActiveRecord's attribute reader and writer methods [Michael Koziarski]
- - Generate Reader and Writer methods which cache attribute values in hashes.  This is to avoid repeatedly parsing the same date or integer columns.
- - Change exception raised when users use find with :select then try to access a skipped column.  Plugins could override missing_attribute() to lazily load the columns.
- - Move method definition to the class, instead of the instance
- - Always generate the readers, writers and predicate methods.
-
-* Perform a deep #dup on query cache results so that modifying activerecord attributes does not modify the cached attributes.  [Rick Olson]
-
-# Ensure that has_many :through associations use a count query instead of loading the target when #size is called.  Closes #8800 [Pratik Naik]
-
-* Added :unless clause to validations #8003 [monki]. Example:
-
-    def using_open_id?
-      !identity_url.blank?
-    end
-
-    validates_presence_of :identity_url, :if => using_open_id?
-    validates_presence_of :username, :unless => using_open_id?
-    validates_presence_of :password, :unless => using_open_id?
-
-* Fix #count on a has_many :through association so that it recognizes the :uniq option.  Closes #8801 [Pratik Naik]
-
-* Fix and properly document/test count(column_name) usage. Closes #8999 [Pratik Naik]
-
-* Remove deprecated count(conditions=nil, joins=nil) usage.  Closes #8993 [Pratik Naik]
-
-* Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name.  Closes #8992 [Josh Susser]
-
-  OLD
-    belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is user_id
-
-  NEW
-    belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is visitor_id
-
-* Remove spurious tests from deprecated_associations_test, most of these aren't deprecated, and are duplicated in associations_test.  Closes #8987 [Pratik Naik]
-
-* Make create! on a has_many :through association return the association object.  Not the collection.  Closes #8786 [Pratik Naik]
-
-* Move from select * to select tablename.* to avoid clobbering IDs. Closes #8889 [dasil003]
-
-* Don't call unsupported methods on associated objects when using :include, :method with to_xml #7307, [Manfred Stienstra, jwilger]
-
-* Define collection singular ids method for has_many :through associations.  #8763 [Pratik Naik]
-
-* Array attribute conditions work with proxied association collections.  #8318 [Kamal Fariz Mahyuddin, theamazingrando]
-
-* Fix polymorphic has_one associations declared in an abstract class.  #8638 [Pratik Naik, Dax Huiberts]
-
-* Fixed validates_associated should not stop on the first error.  #4276 [mrj, Manfred Stienstra, Josh Peek]
-
-* Rollback if commit raises an exception.  #8642 [kik, Jeremy Kemper]
-
-* Update tests' use of fixtures for the new collections api.  #8726 [Kamal Fariz Mahyuddin]
-
-* Save associated records only if the association is already loaded.  #8713 [Blaine]
-
-* MySQL: fix show_variable.  #8448 [matt, Jeremy Kemper]
-
-* Fixtures: correctly delete and insert fixtures in a single transaction.  #8553 [Michael Schuerig]
-
-* Fixtures: people(:technomancy, :josh) returns both fixtures.  #7880 [technomancy, Josh Peek]
-
-* Calculations support non-numeric foreign keys.  #8154 [Kamal Fariz Mahyuddin]
-
-* with_scope is protected.  #8524 [Josh Peek]
-
-* Quickref for association methods.  #7723 [marclove, Mindsweeper]
-
-* Calculations: return nil average instead of 0 when there are no rows to average.  #8298 [davidw]
-
-* acts_as_nested_set: direct_children is sorted correctly.  #4761 [Josh Peek, rails@33lc0.net]
-
-* Raise an exception if both attr_protected and attr_accessible are declared.  #8507 [stellsmi]
-
-* SQLite, MySQL, PostgreSQL, Oracle: quote column names in column migration SQL statements.  #8466 [marclove, lorenjohnson]
-
-* Allow nil serialized attributes with a set class constraint.  #7293 [sandofsky]
-
-* Oracle: support binary fixtures.  #7987 [Michael Schoen]
-
-* Fixtures: pull fixture insertion into the database adapters.  #7987 [Michael Schoen]
-
-* Announce migration versions as they're performed.  [Jeremy Kemper]
-
-* find gracefully copes with blank :conditions.  #7599 [Dan Manges, johnnyb]
-
-* validates_numericality_of takes :greater_than, :greater_than_or_equal_to, :equal_to, :less_than, :less_than_or_equal_to, :odd, and :even options.  #3952 [Bob Silva, Dan Kubb, Josh Peek]
-
-* MySQL: create_database takes :charset and :collation options. Charset defaults to utf8.  #8448 [matt]
-
-* Find with a list of ids supports limit/offset.  #8437 [hrudududu]
-
-* Optimistic locking: revert the lock version when an update fails.  #7840 [plang]
-
-* Migrations: add_column supports custom column types.  #7742 [jsgarvin, Theory]
-
-* Load database adapters on demand. Eliminates config.connection_adapters and RAILS_CONNECTION_ADAPTERS. Add your lib directory to the $LOAD_PATH and put your custom adapter in lib/active_record/connection_adapters/adaptername_adapter.rb. This way you can provide custom adapters as plugins or gems without modifying Rails. [Jeremy Kemper]
-
-* Ensure that associations with :dependent => :delete_all respect :conditions option.  Closes #8034 [Jack Danger Canty, Josh Peek, Rick Olson]
-
-* belongs_to assignment creates a new proxy rather than modifying its target in-place.  #8412 [mmangino@elevatedrails.com]
-
-* Fix column type detection while loading fixtures.  Closes #7987 [roderickvd]
-
-* Document deep eager includes.  #6267 [Josh Susser, Dan Manges]
-
-* Document warning that associations names shouldn't be reserved words.  #4378 [murphy@cYcnus.de, Josh Susser]
-
-* Sanitize Base#inspect.  #8392, #8623 [Nik Wakelin, jnoon]
-
-* Replace the transaction {|transaction|..} semantics with a new Exception ActiveRecord::Rollback.   [Michael Koziarski]
-
-* Oracle: extract column length for CHAR also.  #7866 [ymendel]
-
-* Document :allow_nil option for validates_acceptance_of since it defaults to true. [tzaharia]
-
-* Update documentation for :dependent declaration so that it explicitly uses the non-deprecated API. [Jack Danger Canty]
-
-* Add documentation caveat about when to use count_by_sql. [fearoffish]
-
-* Enhance documentation for increment_counter and decrement_counter. [fearoffish]
-
-* Provide brief introduction to what optimistic locking is. [fearoffish]
-
-* Add documentation for :encoding option to mysql adapter. [marclove]
-
-* Added short-hand declaration style to migrations (inspiration from Sexy Migrations, http://errtheblog.com/post/2381) [David Heinemeier Hansson]. Example:
-
-    create_table "products" do |t|
-      t.column "shop_id",    :integer
-      t.column "creator_id", :integer
-      t.column "name",       :string,   :default => "Untitled"
-      t.column "value",      :string,   :default => "Untitled"
-      t.column "created_at", :datetime
-      t.column "updated_at", :datetime
-    end
-
-  ...can now be written as:
-
-    create_table :products do |t|
-      t.integer :shop_id, :creator_id
-      t.string  :name, :value, :default => "Untitled"
-      t.timestamps
-    end
-
-* Use association name for the wrapper element when using .to_xml.  Previous behavior lead to non-deterministic situations with STI and polymorphic associations. [Michael Koziarski, jstrachan]
-
-* Improve performance of calling .create on has_many :through associations. [evan]
-
-* Improved cloning performance by relying less on exception raising #8159 [Blaine]
-
-* Added ActiveRecord::Base.inspect to return a column-view like #<Post id:integer, title:string, body:text> [David Heinemeier Hansson]
-
-* Added yielding of Builder instance for ActiveRecord::Base#to_xml calls [David Heinemeier Hansson]
-
-* Small additions and fixes for ActiveRecord documentation.  Closes #7342 [Jeremy McAnally]
-
-* Add helpful debugging info to the ActiveRecord::StatementInvalid exception in ActiveRecord::ConnectionAdapters::SqliteAdapter#table_structure.  Closes #7925. [court3nay]
-
-* SQLite: binary escaping works with $KCODE='u'.  #7862 [tsuka]
-
-* Base#to_xml supports serialized attributes.  #7502 [jonathan]
-
-* Base.update_all :order and :limit options. Useful for MySQL updates that must be ordered to avoid violating unique constraints.  [Jeremy Kemper]
-
-* Remove deprecated object transactions.  People relying on this functionality should install the object_transactions plugin at http://code.bitsweat.net/svn/object_transactions.  Closes #5637 [Michael Koziarski, Jeremy Kemper]
-
-* PostgreSQL: remove DateTime -> Time downcast. Warning: do not enable translate_results for the C bindings if you have timestamps outside Time's domain.  [Jeremy Kemper]
-
-* find_or_create_by_* takes a hash so you can create with more attributes than are in the method name. For example, Person.find_or_create_by_name(:name => 'Henry', :comments => 'Hi new user!') is equivalent to Person.find_by_name('Henry') || Person.create(:name => 'Henry', :comments => 'Hi new user!').  #7368 [Josh Susser]
-
-* Make sure with_scope takes both :select and :joins into account when setting :readonly.  Allows you to save records you retrieve using method_missing on a has_many :through associations.  [Michael Koziarski]
-
-* Allow a polymorphic :source for has_many :through associations.  Closes #7143 [protocool]
-
-* Consistent public/protected/private visibility for chained methods.  #7813 [Dan Manges]
-
-* Oracle: fix quoted primary keys and datetime overflow.  #7798 [Michael Schoen]
-
-* Consistently quote primary key column names.  #7763 [toolmantim]
-
-* Fixtures: fix YAML ordered map support.  #2665 [Manuel Holtgrewe, nfbuckley]
-
-* DateTimes assume the default timezone.  #7764 [Geoff Buesing]
-
-* Sybase: hide timestamp columns since they're inherently read-only.  #7716 [Mike Joyce]
-
-* Oracle: overflow Time to DateTime.  #7718 [Michael Schoen]
-
-* PostgreSQL: don't use async_exec and async_query with postgres-pr.  #7727, #7762 [flowdelic, toolmantim]
-
-* Fix has_many :through << with custom foreign keys.  #6466, #7153 [naffis, Rich Collins]
-
-* Test DateTime native type in migrations, including an edge case with dates
-during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
-
-* SQLServer: correctly schema-dump tables with no indexes or descending indexes.  #7333, #7703 [Jakob Skjerning, Tom Ward]
-
-* SQLServer: recognize real column type as Ruby float.  #7057 [sethladd, Tom Ward]
-
-* Added fixtures :all as a way of loading all fixtures in the fixture directory at once #7214 [Manfred Stienstra]
-
-* Added database connection as a yield parameter to ActiveRecord::Base.transaction so you can manually rollback [David Heinemeier Hansson]. Example:
-
-    transaction do |transaction|
-      david.withdrawal(100)
-      mary.deposit(100)
-      transaction.rollback! # rolls back the transaction that was otherwise going to be successful
-    end
-
-* Made increment_counter/decrement_counter play nicely with optimistic locking, and added a more general update_counters method [Jamis Buck]
-
-* Reworked David's query cache to be available as Model.cache {...}. For the duration of the block no select query should be run more then once. Any inserts/deletes/executes will flush the whole cache however [Tobias Lütke]
-  Task.cache { Task.find(1); Task.find(1) } # => 1 query
-
-* When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. [Jamis Buck]
-
-* Oracle: fix lob and text default handling.  #7344 [gfriedrich, Michael Schoen]
-
-* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob Skjerning]
-
-* MySQL: blob and text columns may not have defaults in 5.x. Update fixtures schema for strict mode.  #6695 [Dan Kubb]
-
-* update_all can take a Hash argument. sanitize_sql splits into two methods for conditions and assignment since NULL values and delimiters are handled differently.  #6583, #7365 [sandofsky, Assaf]
-
-* MySQL: SET SQL_AUTO_IS_NULL=0 so 'where id is null' doesn't select the last inserted id.  #6778 [Jonathan Viney, timc]
-
-* Use Date#to_s(:db) for quoted dates.  #7411 [Michael Schoen]
-
-* Don't create instance writer methods for class attributes.  Closes #7401 [Rick Olson]
-
-* Docs: validations examples.  #7343 [zackchandler]
-
-* Add missing tests ensuring callbacks work with class inheritance.  Closes #7339 [sandofsky]
-
-* Fixtures use the table name and connection from set_fixture_class.  #7330 [Anthony Eden]
-
-* Remove useless code in #attribute_present? since 0 != blank?.  Closes #7249 [Josh Susser]
-
-* Fix minor doc typos. Closes #7157 [Josh Susser]
-
-* Fix incorrect usage of #classify when creating the eager loading join statement.  Closes #7044 [Josh Susser]
-
-* SQLServer: quote table name in indexes query.  #2928 [keithm@infused.org]
-
-* Subclasses of an abstract class work with single-table inheritance.  #5704, #7284 [BertG, nick+rails@ag.arizona.edu]
-
-* Make sure sqlite3 driver closes open connections on disconnect [Rob Rasmussen]
-
-* [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 [Jeremy McAnally]
-
-* change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 [Dan Manges, Jeremy Kemper]
-
-* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, Manfred Stienstra, altano@bigfoot.com]
-
-* Oracle: create_table takes a :sequence_name option to override the 'tablename_seq' default.  #7000 [Michael Schoen]
-
-* MySQL: retain SSL settings on reconnect.  #6976 [randyv2]
-
-* Apply scoping during initialize instead of create.  Fixes setting of foreign key when using find_or_initialize_by with scoping. [Cody Fauser]
-
-* SQLServer: handle [quoted] table names.  #6635 [rrich]
-
-* acts_as_nested_set works with single-table inheritance.  #6030 [Josh Susser]
-
-* PostgreSQL, Oracle: correctly perform eager finds with :limit and :order.  #4668, #7021 [eventualbuddha, Michael Schoen]
-
-* Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 [Dan Manges]
-    Student.find(:all, :conditions => { :grade => 9..12 })
-
-* Fix the Oracle adapter for serialized attributes stored in CLOBs.  Closes #6825 [mschoen, tdfowler]
-
-* [DOCS] Apply more documentation for ActiveRecord Reflection.  Closes #4055 [Robby Russell]
-
-* [DOCS] Document :allow_nil option of #validate_uniqueness_of. Closes #3143 [Caio Chassot]
-
-* Bring the sybase adapter up to scratch for 1.2 release. [jsheets]
-
-* Rollback new_record? and id when an exception is raised in a save callback.  #6910 [Ben Curren, outerim]
-
-* Pushing a record on an association collection doesn't unnecessarily load all the associated records.  [Obie Fernandez, Jeremy Kemper]
-
-* Oracle: fix connection reset failure.  #6846 [leonlleslie]
-
-* Subclass instantiation doesn't try to explicitly require the corresponding subclass.  #6840 [leei, Jeremy Kemper]
-
-* fix faulty inheritance tests and that eager loading grabs the wrong inheritance column when the class of your association is an STI subclass. Closes #6859 [protocool]
-
-* Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues. Closes #5847 [Alexander Dymo, Tobias Lütke]
-
-* find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using.  #6764 [vitaly, Jeremy Kemper]
-
-* Add AssociationCollection#create! to be consistent with AssociationCollection#create when dealing with a foreign key that is a protected attribute [Cody Fauser]
-
-* Added counter optimization for AssociationCollection#any? so person.friends.any? won't actually load the full association if we have the count in a cheaper form [David Heinemeier Hansson]
-
-* Change fixture_path to a class inheritable accessor allowing test cases to have their own custom set of fixtures. #6672 [Zach Dennis]
-
-* Quote ActiveSupport::Multibyte::Chars.  #6653 [Julian Tarkhanov]
-
-* Simplify query_attribute by typecasting the attribute value and checking whether it's nil, false, zero or blank.  #6659 [Jonathan Viney]
-
-* validates_numericality_of uses \A \Z to ensure the entire string matches rather than ^ $ which may match one valid line of a multiline string.  #5716 [Andreas Schwarz]
-
-* Run validations in the order they were declared.  #6657 [obrie]
-
-* MySQL: detect when a NOT NULL column without a default value is misreported as default ''.  Can't detect for string, text, and binary columns since '' is a legitimate default.  #6156 [simon@redhillconsulting.com.au, obrie, Jonathan Viney, Jeremy Kemper]
-
-* Simplify association proxy implementation by factoring construct_scope out of method_missing.  #6643 [martin]
-
-* Oracle: automatically detect the primary key.  #6594 [vesaria, Michael Schoen]
-
-* Oracle: to increase performance, prefetch 100 rows and enable similar cursor sharing. Both are configurable in database.yml.  #6607 [philbogle@gmail.com, ray.fortna@jobster.com, Michael Schoen]
-
-* Don't inspect unloaded associations.  #2905 [lmarlow]
-
-* SQLite: use AUTOINCREMENT primary key in >= 3.1.0.  #6588, #6616 [careo, lukfugl]
-
-* Cache inheritance_column.  #6592 [Stefan Kaes]
-
-* Firebird: decimal/numeric support.  #6408 [macrnic]
-
-* make add_order a tad faster. #6567 [Stefan Kaes]
-
-* Find with :include respects scoped :order.  #5850
-
-* Support nil and Array in :conditions => { attr => value } hashes.  #6548 [Assaf, Jeremy Kemper]
-    find(:all, :conditions => { :topic_id => [1, 2, 3], :last_read => nil }
-
-* Consistently use LOWER() for uniqueness validations (rather than mixing with UPPER()) so the database can always use a functional index on the lowercased column.  #6495 [Si]
-
-* SQLite: fix calculations workaround, remove count(distinct) query rewrite, cleanup test connection scripts.  [Jeremy Kemper]
-
-* SQLite: count(distinct) queries supported in >= 3.2.6.  #6544 [Bob Silva]
-
-* Dynamically generate reader methods for serialized attributes.  #6362 [Stefan Kaes]
-
-* Deprecation: object transactions warning.  [Jeremy Kemper]
-
-* has_one :dependent => :nullify ignores nil associates.  #4848, #6528 [bellis@deepthought.org, janovetz, Jeremy Kemper]
-
-* Oracle: resolve test failures, use prefetched primary key for inserts, check for null defaults, fix limited id selection for eager loading. Factor out some common methods from all adapters.  #6515 [Michael Schoen]
-
-* Make add_column use the options hash with the Sqlite Adapter. Closes #6464 [obrie]
-
-* Document other options available to migration's add_column. #6419 [grg]
-
-* MySQL: all_hashes compatibility with old MysqlRes class.  #6429, #6601 [Jeremy Kemper]
-
-* Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. [Jonathan Viney]
-
-* fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters [Rick Olson]
-
-* Restore eager condition interpolation, document it's differences [Rick Olson]
-
-* Don't rollback in teardown unless a transaction was started. Don't start a transaction in create_fixtures if a transaction is started.  #6282 [Jacob Fugal, Jeremy Kemper]
-
-* Add #delete support to has_many :through associations.  Closes #6049 [Martin Landers]
-
-* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 [Rick Olson]
-
-* Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 [turnip@turnipspatch.com]
-
-* Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception #6126 [wreese@gmail.com]
-
-* Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 [jonathan]
-
-* Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 [Bob Silva]
-
-* The has_many create method works with polymorphic associations.  #6361 [Dan Peterson]
-
-* MySQL: introduce Mysql::Result#all_hashes to support further optimization.  #5581 [Stefan Kaes]
-
-* save! shouldn't validate twice.  #6324 [maiha, Bob Silva]
-
-* Association collections have an _ids reader method to match the existing writer for collection_select convenience (e.g. employee.task_ids). The writer method skips blank ids so you can safely do @employee.task_ids = params[:tasks] without checking every time for an empty list or blank values.  #1887, #5780 [Michael Schuerig]
-
-* Add an attribute reader method for ActiveRecord::Base.observers [Rick Olson]
-
-* Deprecation: count class method should be called with an options hash rather than two args for conditions and joins.  #6287 [Bob Silva]
-
-* has_one associations with a nil target may be safely marshaled.  #6279 [norbauer, Jeremy Kemper]
-
-* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Michael Koziarski]
-
-* Add a :namespace option to  AR::Base#to_xml [Michael Koziarski]
-
-* Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. [Jeremy Kemper]
-
-* Mock Time.now for more accurate Touch mixin tests.  #6213 [Dan Peterson]
-
-* Improve yaml fixtures error reporting.  #6205 [Bruce Williams]
-
-* Rename AR::Base#quote so people can use that name in their models. #3628 [Michael Koziarski]
-
-* Add deprecation warning for inferred foreign key. #6029 [Josh Susser]
-
-* Fixed the Ruby/MySQL adapter we ship with Active Record to work with the new authentication handshake that was introduced in MySQL 4.1, along with the other protocol changes made at that time #5723 [jimw@mysql.com]
-
-* Deprecation: use :dependent => :delete_all rather than :exclusively_dependent => true.  #6024 [Josh Susser]
-
-* Document validates_presences_of behavior with booleans: you probably want validates_inclusion_of :attr, :in => [true, false].  #2253 [Bob Silva]
-
-* Optimistic locking: gracefully handle nil versions, treat as zero.  #5908 [Tom Ward]
-
-* to_xml: the :methods option works on arrays of records.  #5845 [Josh Starcher]
-
-* Deprecation: update docs. #5998 [Jakob Skjerning, Kevin Clark]
-
-* Add some XmlSerialization tests for ActiveRecord [Rick Olson]
-
-* has_many :through conditions are sanitized by the associating class.  #5971 [martin.emde@gmail.com]
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]
-
-* Fix spurious newlines and spaces in AR::Base#to_xml output [Jamis Buck]
-
-* has_one supports the :dependent => :delete option which skips the typical callback chain and deletes the associated object directly from the database.  #5927 [Chris Mear, Jonathan Viney]
-
-* Nested subclasses are not prefixed with the parent class' table_name since they should always use the base class' table_name.  #5911 [Jonathan Viney]
-
-* SQLServer: work around bug where some unambiguous date formats are not correctly identified if the session language is set to german.  #5894 [Tom Ward, kruth@bfpi]
-
-* SQLServer: fix eager association test.  #5901 [Tom Ward]
-
-* Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance.  #5838 [Kevin Clark]
-
-* Fixtures: correct escaping of \n and \r.  #5859 [evgeny.zislis@gmail.com]
-
-* Migrations: gracefully handle missing migration files.  #5857 [eli.gordon@gmail.com]
-
-* MySQL: update test schema for MySQL 5 strict mode.  #5861 [Tom Ward]
-
-* to_xml: correct naming of included associations.  #5831 [Josh Starcher]
-
-* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [Josh Susser]
-
-* Add records to has_many :through using <<, push, and concat by creating the association record. Raise if base or associate are new records since both ids are required to create the association. #build raises since you can't associate an unsaved record. #create! takes an attributes hash and creates the associated record and its association in a transaction. [Jeremy Kemper]
-
-    # Create a tagging to associate the post and tag.
-    post.tags << Tag.find_by_name('old')
-    post.tags.create! :name => 'general'
-
-    # Would have been:
-    post.taggings.create!(:tag => Tag.find_by_name('finally')
-    transaction do
-      post.taggings.create!(:tag => Tag.create!(:name => 'general'))
-    end
-
-* Cache nil results for :included has_one associations also.  #5787 [Michael Schoen]
-
-* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Lütke]
-
-* Nested classes are given table names prefixed by the singular form of the parent's table name. [Jeremy Kemper]
-    Example: Invoice::Lineitem is given table name invoice_lineitems
-
-* Migrations: uniquely name multicolumn indexes so you don't have to. [Jeremy Kemper]
-    # people_active_last_name_index, people_active_deactivated_at_index
-    add_index    :people, [:active, :last_name]
-    add_index    :people, [:active, :deactivated_at]
-    remove_index :people, [:active, :last_name]
-    remove_index :people, [:active, :deactivated_at]
-
-  WARNING: backward-incompatibility. Multicolumn indexes created before this
-  revision were named using the first column name only. Now they're uniquely
-  named using all indexed columns.
-
-  To remove an old multicolumn index, remove_index :table_name, :first_column
-
-* Fix for deep includes on the same association. [richcollins@gmail.com]
-
-* Tweak fixtures so they don't try to use a non-ActiveRecord class.  [Kevin Clark]
-
-* Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore.  [Rick Olson]
-
-* Document find's :from option. Closes #5762. [andrew@redlinesoftware.com]
-
-* PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema.  #5280 [guy.naor@famundo.com]
-
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael Schoen]
-
-* Add documentation for how to disable timestamps on a per model basis. Closes #5684. [matt@mattmargolis.net Marcel Molina Jr.]
-
-* Don't save has_one associations unnecessarily.  #5735 [Jonathan Viney]
-
-* Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  [Rick Olson]
-
-* Formally deprecate the deprecated finders. [Michael Koziarski]
-
-* Formally deprecate rich associations.  [Michael Koziarski]
-
-* Fixed that default timezones for new / initialize should uphold utc setting #5709 [daniluk@yahoo.com]
-
-* Fix announcement of very long migration names.  #5722 [blake@near-time.com]
-
-* The exists? class method should treat a string argument as an id rather than as conditions.  #5698 [jeremy@planetargon.com]
-
-* Fixed to_xml with :include misbehaviors when invoked on array of model instances #5690 [alexkwolfe@gmail.com]
-
-* Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
-
-    assert (Topic.exists?(:author_name => "David"))
-     assert (Topic.exists?(:author_name => "Mary", :approved => true))
-     assert (Topic.exists?(["parent_id = ?", 1]))
-
-* Schema dumper quotes date :default values. [Dave Thomas]
-
-* Calculate sum with SQL, not Enumerable on HasManyThrough Associations. [Dan Peterson]
-
-* Factor the attribute#{suffix} methods out of method_missing for easier extension. [Jeremy Kemper]
-
-* Patch sql injection vulnerability when using integer or float columns. [Jamis Buck]
-
-* Allow #count through a has_many association to accept :include.  [Dan Peterson]
-
-* create_table rdoc: suggest :id => false for habtm join tables. [Zed Shaw]
-
-* PostgreSQL: return array fields as strings. #4664 [Robby Russell]
-
-* SQLServer: added tests to ensure all database statements are closed, refactored identity_insert management code to use blocks, removed update/delete rowcount code out of execute and into update/delete, changed insert to go through execute method, removed unused quoting methods, disabled pessimistic locking tests as feature is currently unsupported, fixed RakeFile to load sqlserver specific tests whether running in ado or odbc mode, fixed support for recently added decimal types, added support for limits on integer types. #5670 [Tom Ward]
-
-* SQLServer: fix db:schema:dump case-sensitivity. #4684 [Will Rogers]
-
-* Oracle: BigDecimal support. #5667 [Michael Schoen]
-
-* Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. #5454 [robbat2@gentoo.org, work@ashleymoran.me.uk]
-
-* Firebird migrations support. #5337 [Ken Kunz <kennethkunz@gmail.com>]
-
-* PostgreSQL: create/drop as postgres user. #4790 [mail@matthewpainter.co.uk, mlaster@metavillage.com]
-
-* Update callbacks documentation. #3970 [Robby Russell <robby@planetargon.com>]
-
-* PostgreSQL: correctly quote the ' in pk_and_sequence_for. #5462 [tietew@tietew.net]
-
-* PostgreSQL: correctly quote microseconds in timestamps. #5641 [rick@rickbradley.com]
-
-* Clearer has_one/belongs_to model names (account has_one :user). #5632 [matt@mattmargolis.net]
-
-* Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 [Michael Schoen]
-
-* Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [Michael Schoen]
-
-* Added :group to available options for finds done on associations #5516 [mike@michaeldewey.org]
-
-* Minor tweak to improve performance of ActiveRecord::Base#to_param.
-
-* Observers also watch subclasses created after they are declared. #5535 [daniels@pronto.com.au]
-
-* Removed deprecated timestamps_gmt class methods. [Jeremy Kemper]
-
-* rake build_mysql_database grants permissions to rails@localhost. #5501 [brianegge@yahoo.com]
-
-* PostgreSQL: support microsecond time resolution. #5492 [alex@msgpad.com]
-
-* Add AssociationCollection#sum since the method_missing invokation has been shadowed by Enumerable#sum.
-
-* Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record. [Sam Stephenson]
-
-* Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE". Use the #lock! method to obtain a row lock on a single record (reloads the record with :lock => true). [Shugo Maeda]
-    # Obtain an exclusive lock on person 1 so we can safely increment visits.
-    Person.transaction do
-      # select * from people where id=1 for update
-      person = Person.find(1, :lock => true)
-      person.visits += 1
-      person.save!
-    end
-
-* PostgreSQL: introduce allow_concurrency option which determines whether to use blocking or asynchronous #execute. Adapters with blocking #execute will deadlock Ruby threads. The default value is ActiveRecord::Base.allow_concurrency. [Jeremy Kemper]
-
-* Use a per-thread (rather than global) transaction mutex so you may execute concurrent transactions on separate connections. [Jeremy Kemper]
-
-* Change AR::Base#to_param to return a String instead of a Fixnum. Closes #5320. [Nicholas Seckar]
-
-* Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. #5299 (skaes@web.de)
-
-* Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [David Heinemeier Hansson]
-
-* Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [Hampton Catlin]. Example:
-
-    Person.find(:all, :conditions => { :last_name => "Catlin", :status => 1 }, :limit => 2)
-
-...is the same as:
-
-    Person.find(:all, :conditions => [ "last_name = ? and status = ?", "Catlin", 1 ], :limit => 2)
-
-  This makes it easier to pass in the options from a form or otherwise outside.
-
-
-* Fixed issues with BLOB limits, charsets, and booleans for Firebird #5194, #5191, #5189 [kennethkunz@gmail.com]
-
-* Fixed usage of :limit and with_scope when the association in scope is a 1:m #5208 [alex@purefiction.net]
-
-* Fixed migration trouble with SQLite when NOT NULL is used in the new definition #5215 [greg@lapcominc.com]
-
-* Fixed problems with eager loading and counting on SQL Server #5212 [kajism@yahoo.com]
-
-* Fixed that count distinct should use the selected column even when using :include #5251 [anna@wota.jp]
-
-* Fixed that :includes merged from with_scope won't cause the same association to be loaded more than once if repetition occurs in the clauses #5253 [alex@purefiction.net]
-
-* Allow models to override to_xml.  #4989 [Blair Zajac <blair@orcaware.com>]
-
-* PostgreSQL: don't ignore port when host is nil since it's often used to label the domain socket.  #5247 [shimbo@is.naist.jp]
-
-* Records and arrays of records are bound as quoted ids. [Jeremy Kemper]
-    Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
-    Foo.find(:first, :conditions => ['bar_id = ?', bar])
-
-* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [David Heinemeier Hansson]
-
-* Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick Olson]
-
-* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [Josh Susser]
-
-* Provide Association Extensions access to the instance that the association is being accessed from.
-  Closes #4433 [Josh Susser]
-
-* Update OpenBase adaterp's maintainer's email address. Closes #5176. [Derrick Spell]
-
-* Add a quick note about :select and eagerly included associations. [Rick Olson]
-
-* Add docs for the :as option in has_one associations.  Closes #5144 [cdcarter@gmail.com]
-
-* Fixed that has_many collections shouldn't load the entire association to do build or create [David Heinemeier Hansson]
-
-* Added :allow_nil option for aggregations #5091 [Ian White]
-
-* Fix Oracle boolean support and tests. Closes #5139. [Michael Schoen]
-
-* create! no longer blows up when no attributes are passed and a :create scope is in effect (e.g. foo.bars.create! failed whereas foo.bars.create!({}) didn't.) [Jeremy Kemper]
-
-* Call Inflector#demodulize on the class name when eagerly including an STI model.  Closes #5077 [info@loobmedia.com]
-
-* Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. [pdcawley@bofh.org.uk]
-
-* PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 [keegan@thebasement.org]
-
-* Dates and times interpret empty strings as nil rather than 2000-01-01. #4830 [kajism@yahoo.com]
-
-* Allow :uniq => true with has_many :through associations. [Jeremy Kemper]
-
-* Ensure that StringIO is always available for the Schema dumper. [Marcel Molina Jr.]
-
-* Allow AR::Base#to_xml to include methods too. Closes #4921. [johan@textdrive.com]
-
-* Replace superfluous name_to_class_name variant with camelize. [Marcel Molina Jr.]
-
-* 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.]
-
-* Remove duplicate fixture entry in comments.yml. Closes #4923. [Blair Zajac <blair@orcaware.com>]
-
-* Update FrontBase adapter to check binding version. Closes #4920. [mlaster@metavillage.com]
-
-* New Frontbase connections don't start in auto-commit mode. Closes #4922. [mlaster@metavillage.com]
-
-* When grouping, use the appropriate option key. [Marcel Molina Jr.]
-
-* Only modify the sequence name in the FrontBase adapter if the FrontBase adapter is actually being used. [Marcel Molina Jr.]
-
-* Add support for FrontBase (http://www.frontbase.com/) with a new adapter thanks to the hard work of one Mike Laster. Closes #4093. [mlaster@metavillage.com]
-
-* Add warning about the proper way to validate the presence of a foreign key. Closes #4147. [Francois Beausoleil <francois.beausoleil@gmail.com>]
-
-* Fix syntax error in documentation. Closes #4679. [Mislav Marohnić]
-
-* Add Oracle support for CLOB inserts. Closes #4748. [schoenm@earthlink.net sandra.metz@duke.edu]
-
-* Various fixes for sqlserver_adapter (odbc statement finishing, ado schema dumper, drop index). Closes #4831. [kajism@yahoo.com]
-
-* Add support for :order option to with_scope. Closes #3887. [eric.daspet@survol.net]
-
-* Prettify output of schema_dumper by making things line up. Closes #4241 [Caio  Chassot <caio@v2studio.com>]
-
-* Make build_postgresql_databases task make databases owned by the postgres user. Closes #4790. [mlaster@metavillage.com]
-
-* Sybase Adapter type conversion cleanup. Closes #4736. [dev@metacasa.net]
-
-* Fix bug where calculations with long alias names return null. [Rick Olson]
-
-* Raise error when trying to add to a has_many :through association.  Use the Join Model instead. [Rick Olson]
-
-    @post.tags << @tag                  # BAD
-    @post.taggings.create(:tag => @tag) # GOOD
-
-* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick Olson]
-
-* Update inconsistent migrations documentation. #4683 [machomagna@gmail.com]
-
-* Add ActiveRecord::Errors#to_xml [Jamis Buck]
-
-* Properly quote index names in migrations (closes #4764) [John Long]
-
-* Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  [Rick Olson]
-
-* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick Olson]
-
-* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick Olson]
-
-* DRY up association collection reader method generation. [Marcel Molina Jr.]
-
-* DRY up and tweak style of the validation error object. [Marcel Molina Jr.]
-
-* Add :case_sensitive option to validates_uniqueness_of (closes #3090) [Rick Olson]
-
-    class Account < ActiveRecord::Base
-      validates_uniqueness_of :email, :case_sensitive => false
-    end
-
-* Allow multiple association extensions with :extend option (closes #4666) [Josh Susser]
-
-    class Account < ActiveRecord::Base
-      has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
-    end
-
-    *1.15.3* (March 12th, 2007)
-
-    * Allow a polymorphic :source for has_many :through associations. Closes #7143 [protocool]
-
-    * Consistently quote primary key column names.  #7763 [toolmantim]
-
-    * Fixtures: fix YAML ordered map support.  #2665 [Manuel Holtgrewe, nfbuckley]
-
-    * Fix has_many :through << with custom foreign keys.  #6466, #7153 [naffis, Rich Collins]
-
-
-*1.15.2* (February 5th, 2007)
-
-* Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 [Dan Manges]
-    Student.find(:all, :conditions => { :grade => 9..12 })
-
-* Don't create instance writer methods for class attributes. [Rick Olson]
-
-* When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. [Jamis Buck]
-
-* SQLServer: don't choke on strings containing 'null'.  #7083 [Jakob Skjerning]
-
-* Consistently use LOWER() for uniqueness validations (rather than mixing with UPPER()) so the database can always use a functional index on the lowercased column.  #6495 [Si]
-
-* MySQL: SET SQL_AUTO_IS_NULL=0 so 'where id is null' doesn't select the last inserted id.  #6778 [Jonathan Viney, timc]
-
-* Fixtures use the table name and connection from set_fixture_class.  #7330 [Anthony Eden]
-
-* SQLServer: quote table name in indexes query.  #2928 [keithm@infused.org]
-
-
-*1.15.1* (January 17th, 2007)
-
-* Fix nodoc breaking of adapters
-
-
-*1.15.0* (January 16th, 2007)
-
-* [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 [Jeremy McAnally]
-
-* change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 [Dan Manges, Jeremy Kemper]
-
-* MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 [Jonathan Viney, Manfred Stienstra, altano@bigfoot.com]
-
-* Oracle: create_table takes a :sequence_name option to override the 'tablename_seq' default.  #7000 [Michael Schoen]
-
-* MySQL: retain SSL settings on reconnect.  #6976 [randyv2]
-
-* SQLServer: handle [quoted] table names.  #6635 [rrich]
-
-* acts_as_nested_set works with single-table inheritance.  #6030 [Josh Susser]
-
-* PostgreSQL, Oracle: correctly perform eager finds with :limit and :order.  #4668, #7021 [eventualbuddha, Michael Schoen]
-
-* Fix the Oracle adapter for serialized attributes stored in CLOBs.  Closes #6825 [mschoen, tdfowler]
-
-* [DOCS] Apply more documentation for ActiveRecord Reflection.  Closes #4055 [Robby Russell]
-
-* [DOCS] Document :allow_nil option of #validate_uniqueness_of. Closes #3143 [Caio Chassot]
-
-* Bring the sybase adapter up to scratch for 1.2 release. [jsheets]
-
-* Oracle: fix connection reset failure.  #6846 [leonlleslie]
-
-* Subclass instantiation doesn't try to explicitly require the corresponding subclass.  #6840 [leei, Jeremy Kemper]
-
-* fix faulty inheritance tests and that eager loading grabs the wrong inheritance column when the class of your association is an STI subclass. Closes #6859 [protocool]
-
-* find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using.  #6764 [vitaly, Jeremy Kemper]
-
-* Support nil and Array in :conditions => { attr => value } hashes.  #6548 [Assaf, Jeremy Kemper]
-    find(:all, :conditions => { :topic_id => [1, 2, 3], :last_read => nil }
-
-* Quote ActiveSupport::Multibyte::Chars.  #6653 [Julian Tarkhanov]
-
-* MySQL: detect when a NOT NULL column without a default value is misreported as default ''.  Can't detect for string, text, and binary columns since '' is a legitimate default.  #6156 [simon@redhillconsulting.com.au, obrie, Jonathan Viney, Jeremy Kemper]
-
-* validates_numericality_of uses \A \Z to ensure the entire string matches rather than ^ $ which may match one valid line of a multiline string.  #5716 [Andreas Schwarz]
-
-* Oracle: automatically detect the primary key.  #6594 [vesaria, Michael Schoen]
-
-* Oracle: to increase performance, prefetch 100 rows and enable similar cursor sharing. Both are configurable in database.yml.  #6607 [philbogle@gmail.com, ray.fortna@jobster.com, Michael Schoen]
-
-* Firebird: decimal/numeric support.  #6408 [macrnic]
-
-* Find with :include respects scoped :order.  #5850
-
-* Dynamically generate reader methods for serialized attributes.  #6362 [Stefan Kaes]
-
-* Deprecation: object transactions warning.  [Jeremy Kemper]
-
-* has_one :dependent => :nullify ignores nil associates.  #6528 [janovetz, Jeremy Kemper]
-
-* Oracle: resolve test failures, use prefetched primary key for inserts, check for null defaults, fix limited id selection for eager loading. Factor out some common methods from all adapters.  #6515 [Michael Schoen]
-
-* Make add_column use the options hash with the Sqlite Adapter. Closes #6464 [obrie]
-
-* Document other options available to migration's add_column. #6419 [grg]
-
-* MySQL: all_hashes compatibility with old MysqlRes class.  #6429, #6601 [Jeremy Kemper]
-
-* Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. [Jonathan Viney]
-
-* fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters [Rick Olson]
-
-* Restore eager condition interpolation, document it's differences [Rick Olson]
-
-* Don't rollback in teardown unless a transaction was started. Don't start a transaction in create_fixtures if a transaction is started.  #6282 [Jacob Fugal, Jeremy Kemper]
-
-* Add #delete support to has_many :through associations.  Closes #6049 [Martin Landers]
-
-* Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 [Rick Olson]
-
-* Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 [turnip@turnipspatch.com]
-
-* Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception #6126 [wreese@gmail.com]
-
-* Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 [jonathan]
-
-* Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 [Bob Silva]
-
-* The has_many create method works with polymorphic associations.  #6361 [Dan Peterson]
-
-* MySQL: introduce Mysql::Result#all_hashes to support further optimization.  #5581 [Stefan Kaes]
-
-* save! shouldn't validate twice.  #6324 [maiha, Bob Silva]
-
-* Association collections have an _ids reader method to match the existing writer for collection_select convenience (e.g. employee.task_ids). The writer method skips blank ids so you can safely do @employee.task_ids = params[:tasks] without checking every time for an empty list or blank values.  #1887, #5780 [Michael Schuerig]
-
-* Add an attribute reader method for ActiveRecord::Base.observers [Rick Olson]
-
-* Deprecation: count class method should be called with an options hash rather than two args for conditions and joins.  #6287 [Bob Silva]
-
-* has_one associations with a nil target may be safely marshaled.  #6279 [norbauer, Jeremy Kemper]
-
-* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Michael Koziarski]
-
-* Add a :namespace option to  AR::Base#to_xml [Michael Koziarski]
-
-* Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. [Jeremy Kemper]
-
-* Mock Time.now for more accurate Touch mixin tests.  #6213 [Dan Peterson]
-
-* Improve yaml fixtures error reporting.  #6205 [Bruce Williams]
-
-* Rename AR::Base#quote so people can use that name in their models. #3628 [Michael Koziarski]
-
-* Add deprecation warning for inferred foreign key. #6029 [Josh Susser]
-
-* Fixed the Ruby/MySQL adapter we ship with Active Record to work with the new authentication handshake that was introduced in MySQL 4.1, along with the other protocol changes made at that time #5723 [jimw@mysql.com]
-
-* Deprecation: use :dependent => :delete_all rather than :exclusively_dependent => true.  #6024 [Josh Susser]
-
-* Optimistic locking: gracefully handle nil versions, treat as zero.  #5908 [Tom Ward]
-
-* to_xml: the :methods option works on arrays of records.  #5845 [Josh Starcher]
-
-* has_many :through conditions are sanitized by the associating class.  #5971 [martin.emde@gmail.com]
-
-* Fix spurious newlines and spaces in AR::Base#to_xml output [Jamis Buck]
-
-* has_one supports the :dependent => :delete option which skips the typical callback chain and deletes the associated object directly from the database.  #5927 [Chris Mear, Jonathan Viney]
-
-* Nested subclasses are not prefixed with the parent class' table_name since they should always use the base class' table_name.  #5911 [Jonathan Viney]
-
-* SQLServer: work around bug where some unambiguous date formats are not correctly identified if the session language is set to german.  #5894 [Tom Ward, kruth@bfpi]
-
-* Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance.  #5838 [Kevin Clark]
-
-* Fixtures: correct escaping of \n and \r.  #5859 [evgeny.zislis@gmail.com]
-
-* Migrations: gracefully handle missing migration files.  #5857 [eli.gordon@gmail.com]
-
-* MySQL: update test schema for MySQL 5 strict mode.  #5861 [Tom Ward]
-
-* to_xml: correct naming of included associations.  #5831 [Josh Starcher]
-
-* Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 [Josh Susser]
-
-* Add records to has_many :through using <<, push, and concat by creating the association record. Raise if base or associate are new records since both ids are required to create the association. #build raises since you can't associate an unsaved record. #create! takes an attributes hash and creates the associated record and its association in a transaction. [Jeremy Kemper]
-
-    # Create a tagging to associate the post and tag.
-    post.tags << Tag.find_by_name('old')
-    post.tags.create! :name => 'general'
-
-    # Would have been:
-    post.taggings.create!(:tag => Tag.find_by_name('finally')
-    transaction do
-      post.taggings.create!(:tag => Tag.create!(:name => 'general'))
-    end
-
-* Cache nil results for :included has_one associations also.  #5787 [Michael Schoen]
-
-* Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. [Tobias Lütke]
-
-* Nested classes are given table names prefixed by the singular form of the parent's table name. [Jeremy Kemper]
-    Example: Invoice::Lineitem is given table name invoice_lineitems
-
-* Migrations: uniquely name multicolumn indexes so you don't have to. [Jeremy Kemper]
-    # people_active_last_name_index, people_active_deactivated_at_index
-    add_index    :people, [:active, :last_name]
-    add_index    :people, [:active, :deactivated_at]
-    remove_index :people, [:active, :last_name]
-    remove_index :people, [:active, :deactivated_at]
-
-  WARNING: backward-incompatibility. Multicolumn indexes created before this
-  revision were named using the first column name only. Now they're uniquely
-  named using all indexed columns.
-
-  To remove an old multicolumn index, remove_index :table_name, :first_column
-
-* Fix for deep includes on the same association. [richcollins@gmail.com]
-
-* Tweak fixtures so they don't try to use a non-ActiveRecord class.  [Kevin Clark]
-
-* Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore.  [Rick Olson]
-
-* PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema.  #5280 [guy.naor@famundo.com]
-
-* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
-
-* Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. [Michael Schoen]
-
-* Don't save has_one associations unnecessarily.  #5735 [Jonathan Viney]
-
-* Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  [Rick Olson]
-
-* Formally deprecate the deprecated finders. [Michael Koziarski]
-
-* Formally deprecate rich associations.  [Michael Koziarski]
-
-* Fixed that default timezones for new / initialize should uphold utc setting #5709 [daniluk@yahoo.com]
-
-* Fix announcement of very long migration names.  #5722 [blake@near-time.com]
-
-* The exists? class method should treat a string argument as an id rather than as conditions.  #5698 [jeremy@planetargon.com]
-
-* Fixed to_xml with :include misbehaviors when invoked on array of model instances #5690 [alexkwolfe@gmail.com]
-
-* Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
-
-    assert (Topic.exists?(:author_name => "David"))
-     assert (Topic.exists?(:author_name => "Mary", :approved => true))
-     assert (Topic.exists?(["parent_id = ?", 1]))
-
-* Schema dumper quotes date :default values. [Dave Thomas]
-
-* Calculate sum with SQL, not Enumerable on HasManyThrough Associations. [Dan Peterson]
-
-* Factor the attribute#{suffix} methods out of method_missing for easier extension. [Jeremy Kemper]
-
-* Patch sql injection vulnerability when using integer or float columns. [Jamis Buck]
-
-* Allow #count through a has_many association to accept :include.  [Dan Peterson]
-
-* create_table rdoc: suggest :id => false for habtm join tables. [Zed Shaw]
-
-* PostgreSQL: return array fields as strings. #4664 [Robby Russell]
-
-* SQLServer: added tests to ensure all database statements are closed, refactored identity_insert management code to use blocks, removed update/delete rowcount code out of execute and into update/delete, changed insert to go through execute method, removed unused quoting methods, disabled pessimistic locking tests as feature is currently unsupported, fixed RakeFile to load sqlserver specific tests whether running in ado or odbc mode, fixed support for recently added decimal types, added support for limits on integer types. #5670 [Tom Ward]
-
-* SQLServer: fix db:schema:dump case-sensitivity. #4684 [Will Rogers]
-
-* Oracle: BigDecimal support. #5667 [Michael Schoen]
-
-* Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. #5454 [robbat2@gentoo.org, work@ashleymoran.me.uk]
-
-* Firebird migrations support. #5337 [Ken Kunz <kennethkunz@gmail.com>]
-
-* PostgreSQL: create/drop as postgres user. #4790 [mail@matthewpainter.co.uk, mlaster@metavillage.com]
-
-* PostgreSQL: correctly quote the ' in pk_and_sequence_for. #5462 [tietew@tietew.net]
-
-* PostgreSQL: correctly quote microseconds in timestamps. #5641 [rick@rickbradley.com]
-
-* Clearer has_one/belongs_to model names (account has_one :user). #5632 [matt@mattmargolis.net]
-
-* Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 [Michael Schoen]
-
-* Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [Michael Schoen]
-
-* Added :group to available options for finds done on associations #5516 [mike@michaeldewey.org]
-
-* Observers also watch subclasses created after they are declared. #5535 [daniels@pronto.com.au]
-
-* Removed deprecated timestamps_gmt class methods. [Jeremy Kemper]
-
-* rake build_mysql_database grants permissions to rails@localhost. #5501 [brianegge@yahoo.com]
-
-* PostgreSQL: support microsecond time resolution. #5492 [alex@msgpad.com]
-
-* Add AssociationCollection#sum since the method_missing invokation has been shadowed by Enumerable#sum.
-
-* Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record. [Sam Stephenson]
-
-* Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE". Use the #lock! method to obtain a row lock on a single record (reloads the record with :lock => true). [Shugo Maeda]
-    # Obtain an exclusive lock on person 1 so we can safely increment visits.
-    Person.transaction do
-      # select * from people where id=1 for update
-      person = Person.find(1, :lock => true)
-      person.visits += 1
-      person.save!
-    end
-
-* PostgreSQL: introduce allow_concurrency option which determines whether to use blocking or asynchronous #execute. Adapters with blocking #execute will deadlock Ruby threads. The default value is ActiveRecord::Base.allow_concurrency. [Jeremy Kemper]
-
-* Use a per-thread (rather than global) transaction mutex so you may execute concurrent transactions on separate connections. [Jeremy Kemper]
-
-* Change AR::Base#to_param to return a String instead of a Fixnum. Closes #5320. [Nicholas Seckar]
-
-* Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. #5299 (skaes@web.de)
-
-* Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization [David Heinemeier Hansson]
-
-* Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [Hampton Catlin]. Example:
-
-    Person.find(:all, :conditions => { :last_name => "Catlin", :status => 1 }, :limit => 2)
-
-...is the same as:
-
-    Person.find(:all, :conditions => [ "last_name = ? and status = ?", "Catlin", 1 ], :limit => 2)
-
-  This makes it easier to pass in the options from a form or otherwise outside.
-
-
-* Fixed issues with BLOB limits, charsets, and booleans for Firebird #5194, #5191, #5189 [kennethkunz@gmail.com]
-
-* Fixed usage of :limit and with_scope when the association in scope is a 1:m #5208 [alex@purefiction.net]
-
-* Fixed migration trouble with SQLite when NOT NULL is used in the new definition #5215 [greg@lapcominc.com]
-
-* Fixed problems with eager loading and counting on SQL Server #5212 [kajism@yahoo.com]
-
-* Fixed that count distinct should use the selected column even when using :include #5251 [anna@wota.jp]
-
-* Fixed that :includes merged from with_scope won't cause the same association to be loaded more than once if repetition occurs in the clauses #5253 [alex@purefiction.net]
-
-* Allow models to override to_xml.  #4989 [Blair Zajac <blair@orcaware.com>]
-
-* PostgreSQL: don't ignore port when host is nil since it's often used to label the domain socket.  #5247 [shimbo@is.naist.jp]
-
-* Records and arrays of records are bound as quoted ids. [Jeremy Kemper]
-    Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
-    Foo.find(:first, :conditions => ['bar_id = ?', bar])
-
-* Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [David Heinemeier Hansson]
-
-* Add a list of regexes assert_queries skips in the ActiveRecord test suite.  [Rick Olson]
-
-* Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 [Josh Susser]
-
-* Provide Association Extensions access to the instance that the association is being accessed from.
-  Closes #4433 [Josh Susser]
-
-* Update OpenBase adaterp's maintainer's email address. Closes #5176. [Derrick Spell]
-
-* Add a quick note about :select and eagerly included associations. [Rick Olson]
-
-* Add docs for the :as option in has_one associations.  Closes #5144 [cdcarter@gmail.com]
-
-* Fixed that has_many collections shouldn't load the entire association to do build or create [David Heinemeier Hansson]
-
-* Added :allow_nil option for aggregations #5091 [Ian White]
-
-* Fix Oracle boolean support and tests. Closes #5139. [Michael Schoen]
-
-* create! no longer blows up when no attributes are passed and a :create scope is in effect (e.g. foo.bars.create! failed whereas foo.bars.create!({}) didn't.) [Jeremy Kemper]
-
-* Call Inflector#demodulize on the class name when eagerly including an STI model.  Closes #5077 [info@loobmedia.com]
-
-* Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. [pdcawley@bofh.org.uk]
-
-* PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 [keegan@thebasement.org]
-
-* Dates and times interpret empty strings as nil rather than 2000-01-01. #4830 [kajism@yahoo.com]
-
-* Allow :uniq => true with has_many :through associations. [Jeremy Kemper]
-
-* Ensure that StringIO is always available for the Schema dumper. [Marcel Molina Jr.]
-
-* Allow AR::Base#to_xml to include methods too. Closes #4921. [johan@textdrive.com]
-
-* Remove duplicate fixture entry in comments.yml. Closes #4923. [Blair Zajac <blair@orcaware.com>]
-
-* When grouping, use the appropriate option key. [Marcel Molina Jr.]
-
-* Add support for FrontBase (http://www.frontbase.com/) with a new adapter thanks to the hard work of one Mike Laster. Closes #4093. [mlaster@metavillage.com]
-
-* Add warning about the proper way to validate the presence of a foreign key. Closes #4147. [Francois Beausoleil <francois.beausoleil@gmail.com>]
-
-* Fix syntax error in documentation. Closes #4679. [Mislav Marohnić]
-
-* Add Oracle support for CLOB inserts. Closes #4748. [schoenm@earthlink.net sandra.metz@duke.edu]
-
-* Various fixes for sqlserver_adapter (odbc statement finishing, ado schema dumper, drop index). Closes #4831. [kajism@yahoo.com]
-
-* Add support for :order option to with_scope. Closes #3887. [eric.daspet@survol.net]
-
-* Prettify output of schema_dumper by making things line up. Closes #4241 [Caio  Chassot <caio@v2studio.com>]
-
-* Make build_postgresql_databases task make databases owned by the postgres user. Closes #4790. [mlaster@metavillage.com]
-
-* Sybase Adapter type conversion cleanup. Closes #4736. [dev@metacasa.net]
-
-* Fix bug where calculations with long alias names return null. [Rick Olson]
-
-* Raise error when trying to add to a has_many :through association.  Use the Join Model instead. [Rick Olson]
-
-    @post.tags << @tag                  # BAD
-    @post.taggings.create(:tag => @tag) # GOOD
-
-* Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick Olson]
-
-* Add ActiveRecord::Errors#to_xml [Jamis Buck]
-
-* Properly quote index names in migrations (closes #4764) [John Long]
-
-* Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  [Rick Olson]
-
-* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick Olson]
-
-* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick Olson]
-
-* Add :case_sensitive option to validates_uniqueness_of (closes #3090) [Rick Olson]
-
-    class Account < ActiveRecord::Base
-      validates_uniqueness_of :email, :case_sensitive => false
-    end
-
-* Allow multiple association extensions with :extend option (closes #4666) [Josh Susser]
-
-    class Account < ActiveRecord::Base
-      has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
-    end
-
-
-*1.14.4* (August 8th, 2006)
-
-* Add warning about the proper way to validate the presence of a foreign key.  #4147 [Francois Beausoleil <francois.beausoleil@gmail.com>]
-
-* Fix syntax error in documentation. #4679 [Mislav Marohnić]
-
-* Update inconsistent migrations documentation. #4683 [machomagna@gmail.com]
-
-
-*1.14.3* (June 27th, 2006)
-
-* Fix announcement of very long migration names.  #5722 [blake@near-time.com]
-
-* Update callbacks documentation. #3970 [Robby Russell <robby@planetargon.com>]
-
-* Properly quote index names in migrations (closes #4764) [John Long]
-
-* Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions [Rick Olson]
-
-* Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. [Rick Olson]
-
-
-*1.14.2* (April 9th, 2006)
-
-* Fixed calculations for the Oracle Adapter (closes #4626) [Michael Schoen]
-
-
-*1.14.1* (April 6th, 2006)
-
-* Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
-
-* Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) [Lars Pind]
-
-* Enable Limit/Offset in Calculations (closes #4558) [lmarlow]
-
-* Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) [Rick Olson]
-
-* Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 [lagroue@free.fr]
-
-* Allow AR::Base#respond_to? to behave when @attributes is nil [Ryan Davis]
-
-* Support eager includes when going through a polymorphic has_many association. [Rick Olson]
-
-* Added support for eagerly including polymorphic has_one associations. (closes #4525) [Rick Olson]
-
-    class Post < ActiveRecord::Base
-      has_one :tagging, :as => :taggable
-    end
-
-    Post.find :all, :include => :tagging
-
-* Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many [Rick Olson]
-
-* Added support for going through a polymorphic has_many association: (closes #4401) [Rick Olson]
-
-    class PhotoCollection < ActiveRecord::Base
-      has_many :photos, :as => :photographic
-      belongs_to :firm
-    end
-
-    class Firm < ActiveRecord::Base
-      has_many :photo_collections
-      has_many :photos, :through => :photo_collections
-    end
-
-* Multiple fixes and optimizations in PostgreSQL adapter, allowing ruby-postgres gem to work properly. [ruben.nine@gmail.com]
-
-* Fixed that AssociationCollection#delete_all should work even if the records of the association are not loaded yet. [Florian Weber]
-
-* Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations.  (closes #4456) [Stefan]
-
-* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick Olson]
-
-* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [David Heinemeier Hansson]
-
-* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [David Heinemeier Hansson]
-
-* Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). [Marcel Mollina Jr.]
-
-* Fixed broken OCIAdapter #4457 [Michael Schoen]
-
-
-*1.14.0* (March 27th, 2006)
-
-* Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]
-
-* Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table [Rick Olson]
-
-* Add support for :include to with_scope [andrew@redlinesoftware.com]
-
-* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [Michael Schoen]
-
-* Change periods (.) in table aliases to _'s.  Closes #4251 [jeff@ministrycentered.com]
-
-* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 [Rick Olson]
-
-* Fixed issue that kept :select options from being scoped [Rick Olson]
-
-* Fixed db_schema_import when binary types are present #3101 [David Heinemeier Hansson]
-
-* Fixed that MySQL enums should always be returned as strings #3501 [David Heinemeier Hansson]
-
-* Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. [Rick Olson]
-
-    class Connection < ActiveRecord::Base
-      belongs_to :user
-      belongs_to :channel
-    end
-
-    class Channel < ActiveRecord::Base
-      has_many :connections
-      has_many :contacts, :through => :connections, :class_name => 'User' # OLD
-      has_many :contacts, :through => :connections, :source => :user      # NEW
-    end
-
-* Fixed DB2 adapter so nullable columns will be determines correctly now and quotes from column default values will be removed #4350 [contact@maik-schmidt.de]
-
-* Allow overriding of find parameters in scoped has_many :through calls [Rick Olson]
-
-  In this example, :include => false disables the default eager association from loading.  :select changes the standard
-  select clause.  :joins specifies a join that is added to the end of the has_many :through query.
-
-    class Post < ActiveRecord::Base
-      has_many :tags, :through => :taggings, :include => :tagging do
-        def add_joins_and_select
-          find :all, :select => 'tags.*, authors.id as author_id', :include => false,
-            :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
-        end
-      end
-    end
-
-* Fixed that schema changes while the database was open would break any connections to an SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
-
-* Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [Jonathan Viney]
-
-* Quit ignoring default :include options in has_many :through calls [Mark James]
-
-* Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [Jonathan Viney]
-
-* Eager Loading support added for has_many :through => :has_many associations (see below).  [Rick Olson]
-
-* Allow has_many :through to work on has_many associations (closes #3864) [sco@scottraymond.net]  Example:
-
-    class Firm < ActiveRecord::Base
-      has_many :clients
-      has_many :invoices, :through => :clients
-    end
-
-    class Client < ActiveRecord::Base
-      belongs_to :firm
-      has_many   :invoices
-    end
-
-    class Invoice < ActiveRecord::Base
-      belongs_to :client
-    end
-
-* Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [Josh Susser]
-
-* Fixed has_many :through to include :conditions set on the :through association. closes #4020 [Jonathan Viney]
-
-* Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick Olson]
-
-* SQL Server adapter gets some love #4298 [Ryan Tomayko]
-
-* Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 [derrickspell@cdmplus.com]
-
-* Rework table aliasing to account for truncated table aliases.  Add smarter table aliasing when doing eager loading of STI associations. This allows you to use the association name in the order/where clause. [Jonathan Viney / Rick Olson] #4108 Example (SpecialComment is using STI):
-
-    Author.find(:all, :include => { :posts => :special_comments }, :order => 'special_comments.body')
-
-* Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick Olson]
-
-* Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 [Michael Koziarski]
-
-* Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 [Michael Koziarski]
-
-* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom Ward]
-
-* Fixed that Migration#execute would have the table name prefix appended to its query #4110 [mark.imbriaco@pobox.com]
-
-* Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) [Jamis Buck]
-
-* Use association's :conditions when eager loading. [Jeremy Evans] #4144
-
-* Alias the has_and_belongs_to_many join table on eager includes. #4106 [Jeremy Evans]
-
-  This statement would normally error because the projects_developers table is joined twice, and therefore joined_on would be ambiguous.
-
-    Developer.find(:all, :include => {:projects => :developers}, :conditions => 'join_project_developers.joined_on IS NOT NULL')
-
-* Oracle adapter gets some love #4230 [Michael Schoen]
-
-    * Changes :text to CLOB rather than BLOB [Moses Hohman]
-    * Fixes an issue with nil numeric length/scales (several)
-    * Implements support for XMLTYPE columns [wilig / Kubo Takehiro]
-    * Tweaks a unit test to get it all green again
-    * Adds support for #current_database
-
-* Added Base.abstract_class? that marks which classes are not part of the Active Record hierarchy #3704 [Rick Olson]
-
-    class CachedModel < ActiveRecord::Base
-      self.abstract_class = true
-    end
-
-    class Post < CachedModel
-    end
-
-    CachedModel.abstract_class?
-    => true
-
-    Post.abstract_class?
-    => false
-
-    Post.base_class
-    => Post
-
-    Post.table_name
-    => 'posts'
-
-* Allow :dependent options to be used with polymorphic joins. #3820 [Rick Olson]
-
-    class Foo < ActiveRecord::Base
-      has_many :attachments, :as => :attachable, :dependent => :delete_all
-    end
-
-* Nicer error message on has_many :through when :through reflection can not be found. #4042 [court3nay]
-
-* Upgrade to Transaction::Simple 1.3 [Jamis Buck]
-
-* Catch FixtureClassNotFound when using instantiated fixtures on a fixture that has no ActiveRecord model [Rick Olson]
-
-* Allow ordering of calculated results and/or grouped fields in calculations [solo@gatelys.com]
-
-* Make ActiveRecord::Base#save! return true instead of nil on success.  #4173 [johan@johansorensen.com]
-
-* Dynamically set allow_concurrency.  #4044 [Stefan Kaes]
-
-* Added Base#to_xml that'll turn the current record into a XML representation [David Heinemeier Hansson]. Example:
-
-    topic.to_xml
-
-  ...returns:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <topic>
-      <title>The First Topic</title>
-      <author-name>David</author-name>
-      <id type="integer">1</id>
-      <approved type="boolean">false</approved>
-      <replies-count type="integer">0</replies-count>
-      <bonus-time type="datetime">2000-01-01 08:28:00</bonus-time>
-      <written-on type="datetime">2003-07-16 09:28:00</written-on>
-      <content>Have a nice day</content>
-      <author-email-address>david@loudthinking.com</author-email-address>
-      <parent-id></parent-id>
-      <last-read type="date">2004-04-15</last-read>
-    </topic>
-
-  ...and you can configure with:
-
-    topic.to_xml(:skip_instruct => true, :except => [ :id, bonus_time, :written_on, replies_count ])
-
-  ...that'll return:
-
-    <topic>
-      <title>The First Topic</title>
-      <author-name>David</author-name>
-      <approved type="boolean">false</approved>
-      <content>Have a nice day</content>
-      <author-email-address>david@loudthinking.com</author-email-address>
-      <parent-id></parent-id>
-      <last-read type="date">2004-04-15</last-read>
-    </topic>
-
-  You can even do load first-level associations as part of the document:
-
-    firm.to_xml :include => [ :account, :clients ]
-
-  ...that'll return something like:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <firm>
-      <id type="integer">1</id>
-      <rating type="integer">1</rating>
-      <name>37signals</name>
-      <clients>
-        <client>
-          <rating type="integer">1</rating>
-          <name>Summit</name>
-        </client>
-        <client>
-          <rating type="integer">1</rating>
-          <name>Microsoft</name>
-        </client>
-      </clients>
-      <account>
-        <id type="integer">1</id>
-        <credit-limit type="integer">50</credit-limit>
-      </account>
-    </firm>
-
-* Allow :counter_cache to take a column name for custom counter cache columns [Jamis Buck]
-
-* Documentation fixes for :dependent [robby@planetargon.com]
-
-* Stop the MySQL adapter crashing when views are present. #3782 [Jonathan Viney]
-
-* Don't classify the belongs_to class, it is already singular #4117 [keithm@infused.org]
-
-* Allow set_fixture_class to take Classes instead of strings for a class in a module.  Raise FixtureClassNotFound if a fixture can't load.  [Rick Olson]
-
-* Fix quoting of inheritance column for STI eager loading #4098 [Jonathan Viney <jonathan@bluewire.net.nz>]
-
-* Added smarter table aliasing for eager associations for multiple self joins #3580 [Rick Olson]
-
-    * The first time a table is referenced in a join, no alias is used.
-    * After that, the parent class name and the reflection name are used.
-
-        Tree.find(:all, :include => :children) # LEFT OUTER JOIN trees AS tree_children ...
-
-    * Any additional join references get a numerical suffix like '_2', '_3', etc.
-
-* Fixed eager loading problems with single-table inheritance #3580 [Rick Olson]. Post.find(:all, :include => :special_comments) now returns all posts, and any special comments that the posts may have. And made STI work with has_many :through and polymorphic belongs_to.
-
-* Added cascading eager loading that allows for queries like Author.find(:all, :include=> { :posts=> :comments }), which will fetch all authors, their posts, and the comments belonging to those posts in a single query (using LEFT OUTER JOIN) #3913 [anna@wota.jp]. Examples:
-
-    # cascaded in two levels
-    >> Author.find(:all, :include=>{:posts=>:comments})
-    => authors
-         +- posts
-              +- comments
-
-    # cascaded in two levels and normal association
-    >> Author.find(:all, :include=>[{:posts=>:comments}, :categorizations])
-    => authors
-         +- posts
-              +- comments
-         +- categorizations
-
-    # cascaded in two levels with two has_many associations
-    >> Author.find(:all, :include=>{:posts=>[:comments, :categorizations]})
-    => authors
-         +- posts
-              +- comments
-              +- categorizations
-
-    # cascaded in three levels
-    >> Company.find(:all, :include=>{:groups=>{:members=>{:favorites}}})
-    => companies
-         +- groups
-              +- members
-                   +- favorites
-
-* Make counter cache work when replacing an association #3245 [eugenol@gmail.com]
-
-* Make migrations verbose [Jamis Buck]
-
-* Make counter_cache work with polymorphic belongs_to [Jamis Buck]
-
-* Fixed that calling HasOneProxy#build_model repeatedly would cause saving to happen #4058 [anna@wota.jp]
-
-* Added Sybase database adapter that relies on the Sybase Open Client bindings (see http://raa.ruby-lang.org/project/sybase-ctlib) #3765 [John Sheets]. It's almost completely Active Record compliant (including migrations), but has the following caveats:
-
-    * Does not support DATE SQL column types; use DATETIME instead.
-    * Date columns on HABTM join tables are returned as String, not Time.
-    * Insertions are potentially broken for :polymorphic join tables
-    * BLOB column access not yet fully supported
-
-* Clear stale, cached connections left behind by defunct threads. [Jeremy Kemper]
-
-* CHANGED DEFAULT: set ActiveRecord::Base.allow_concurrency to false.  Most AR usage is in single-threaded applications. [Jeremy Kemper]
-
-* Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 [Michael Schoen]
-
-* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [David Heinemeier Hansson]
-
-* Speed up class -> connection caching and stale connection verification.  #3979 [Stefan Kaes]
-
-* Add set_fixture_class to allow the use of table name accessors with models which use set_table_name. [Kevin Clark]
-
-* Added that fixtures to placed in subdirectories of the main fixture files are also loaded #3937 [dblack@wobblini.net]
-
-* Define attribute query methods to avoid method_missing calls. #3677 [Jonathan Viney]
-
-* ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 [Simon Stapleton, Tom Ward]
-
-* Added support for nested scopes #3407 [anna@wota.jp]. Examples:
-
-    Developer.with_scope(:find => { :conditions => "salary > 10000", :limit => 10 }) do
-      Developer.find(:all)     # => SELECT * FROM developers WHERE (salary > 10000) LIMIT 10
-
-      # inner rule is used. (all previous parameters are ignored)
-      Developer.with_exclusive_scope(:find => { :conditions => "name = 'Jamis'" }) do
-        Developer.find(:all)   # => SELECT * FROM developers WHERE (name = 'Jamis')
-      end
-
-      # parameters are merged
-      Developer.with_scope(:find => { :conditions => "name = 'Jamis'" }) do
-        Developer.find(:all)   # => SELECT * FROM developers WHERE (( salary > 10000 ) AND ( name = 'Jamis' )) LIMIT 10
-      end
-    end
-
-* Fixed db2 connection with empty user_name and auth options #3622 [phurley@gmail.com]
-
-* Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 [Masao Mutoh]
-
-* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [Lars Pind]
-
-* Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
-
-    Person.average :age
-    Person.minimum :age
-    Person.maximum :age
-    Person.sum :salary, :group => :last_name
-
-* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [Luke Redpath]
-
-* Reflections don't attempt to resolve module nesting of association classes. Simplify type computation. [Jeremy Kemper]
-
-* Improved the Oracle OCI Adapter with better performance for column reflection (from #3210), fixes to migrations (from #3476 and #3742), tweaks to unit tests (from #3610), and improved documentation (from #2446) #3879 [Aggregated by schoenm@earthlink.net]
-
-* Fixed that the schema_info table used by ActiveRecord::Schema.define should respect table pre- and suffixes #3834 [rubyonrails@atyp.de]
-
-* Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 [Stefan Kaes]
-
-* Correct syntax error in mysql DDL,  and make AAACreateTablesTest run first [Bob Silva]
-
-* Allow :include to be used with has_many :through associations #3611 [Michael Schoen]
-
-* PostgreSQL: smarter schema dumps using pk_and_sequence_for(table).  #2920 [Blair Zajac]
-
-* SQLServer: more compatible limit/offset emulation.  #3779 [Tom Ward]
-
-* Polymorphic join support for has_one associations (has_one :foo, :as => :bar)  #3785 [Rick Olson]
-
-* PostgreSQL: correctly parse negative integer column defaults.  #3776 [bellis@deepthought.org]
-
-* Fix problems with count when used with :include [Jeremy Hopple and Kevin Clark]
-
-* ActiveRecord::RecordInvalid now states which validations failed in its default error message [Tobias Lütke]
-
-* Using AssociationCollection#build with arrays of hashes should call build, not create [David Heinemeier Hansson]
-
-* Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. [Nicholas Seckar]
-
-* Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 [Maik Schmidt]
-
-* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [Shugo Maeda]
-
-* Add documentation for add_index and remove_index. #3600 [Manfred Stienstra <m.stienstra@fngtps.com>]
-
-* If the OCI library is not available, raise an exception indicating as much. #3593 [Michael Schoen]
-
-* Add explicit :order in finder tests as postgresql orders results differently by default. #3577. [Rick Olson]
-
-* Make dynamic finders honor additional passed in :conditions. #3569 [Oleg Pudeyev <pudeyo@rpi.edu>, Marcel Molina Jr.]
-
-* Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. [Nicholas Seckar]
-
-* Make .count work for has_many associations with multi line finder sql [Michael Schoen]
-
-* Add AR::Base.base_class for querying the ancestor AR::Base subclass [Jamis Buck]
-
-* Allow configuration of the column used for optimistic locking [wilsonb@gmail.com]
-
-* Don't hardcode 'id' in acts as list.  [ror@philippeapril.com]
-
-* Fix date errors for SQLServer in association tests. #3406 [Kevin Clark]
-
-* Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
-
-* Disambiguate table names for columns in validates_uniqueness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]
-
-* .with_scope imposed create parameters now bypass attr_protected [Tobias Lütke]
-
-* Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. [Marcel Molina Jr.]
-
-* Multiple enhancements and adjustments to DB2 adaptor. #3377 [contact@maik-schmidt.de]
-
-* Sanitize scoped conditions. [Marcel Molina Jr.]
-
-* Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) [David Heinemeier Hansson]
-
-* Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. [Tobias Lütke]
-
-* SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. [Tobias Lütke]
-
-* Fixed that saving a model with multiple habtm associations would only save the first one.  #3244 [yanowitz-rubyonrails@quantumfoam.org, Florian Weber]
-
-* Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 [wejn@box.cz, Rick Olson, Scott Barron]
-
-* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Lütke]
-
-* made method missing delegation to class methods on relation target work on :through associations. [Tobias Lütke]
-
-* made .find() work on :through relations. [Tobias Lütke]
-
-* Fix typo in association docs. #3296. [Blair Zajac]
-
-* Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Lütke]
-
-*1.13.2* (December 13th, 2005)
-
-* Become part of Rails 1.0
-
-* MySQL: allow encoding option for mysql.rb driver.  [Jeremy Kemper]
-
-* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]. Example:
-
-    class Post
-      has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
-    end
-
-    post.recent_comments.find(:all) # Uses LIMIT 10 and includes authors
-    post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
-    post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
-
-* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]
-
-* MySQL: fixes for the bundled mysql.rb driver.  #3160 [Justin Forder]
-
-* SQLServer: fix obscure optimistic locking bug.  #3068 [kajism@yahoo.com]
-
-* SQLServer: support uniqueidentifier columns.  #2930 [keithm@infused.org]
-
-* SQLServer: cope with tables names qualified by owner.  #3067 [jeff@ministrycentered.com]
-
-* SQLServer: cope with columns with "desc" in the name.  #1950 [Ron Lusk, Ryan Tomayko]
-
-* SQLServer: cope with primary keys with "select" in the name.  #3057 [rdifrango@captechventures.com]
-
-* Oracle: active? performs a select instead of a commit.  #3133 [Michael Schoen]
-
-* MySQL: more robust test for nullified result hashes.  #3124 [Stefan Kaes]
-
-* Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausoleil]
-
-* Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
-
-* PostgreSQL: more robust sequence name discovery.  #3087 [Rick Olson]
-
-* Oracle: use syntax compatible with Oracle 8.  #3131 [Michael Schoen]
-
-* MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat.  Eliminate usage of mysql.ping because it doesn't guarantee reconnect.  Explicitly close and reopen the connection instead.  [Jeremy Kemper]
-
-* Added preliminary support for polymorphic associations [David Heinemeier Hansson]
-
-* Added preliminary support for join models [David Heinemeier Hansson]
-
-* Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. [jeremy@jthopple.com, Marcel Molina Jr.]
-
-* Firebird: active? and reconnect! methods for handling stale connections.  #428 [Ken Kunz <kennethkunz@gmail.com>]
-
-* Firebird: updated for FireRuby 0.4.0.  #3009 [Ken Kunz <kennethkunz@gmail.com>]
-
-* MySQL and PostgreSQL: active? compatibility with the pure-Ruby driver.  #428 [Jeremy Kemper]
-
-* Oracle: active? check pings the database rather than testing the last command status.  #428 [Michael Schoen]
-
-* SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find.  #2974 [kajism@yahoo.com]
-
-* Reloading a model doesn't lose track of its connection.  #2996 [junk@miriamtech.com, Jeremy Kemper]
-
-* Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 [colman@rominato.com, Florian Weber, Michael Schoen]
-
-* MySQL, PostgreSQL: reconnect! also reconfigures the connection.  Otherwise, the connection 'loses' its settings if it times out and is reconnected.  #2978 [Shugo Maeda]
-
-* has_and_belongs_to_many: use JOIN instead of LEFT JOIN.  [Jeremy Kemper]
-
-* MySQL: introduce :encoding option to specify the character set for client, connection, and results.  Only available for MySQL 4.1 and later with the mysql-ruby driver.  Do SHOW CHARACTER SET in mysql client to see available encodings.  #2975 [Shugo Maeda]
-
-* Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. [Marcel Molina Jr.]
-
-* Correct boolean handling in generated reader methods.  #2945 [Don Park, Stefan Kaes]
-
-* Don't generate read methods for columns whose names are not valid ruby method names.  #2946 [Stefan Kaes]
-
-* Document :force option to create_table.  #2921 [Blair Zajac <blair@orcaware.com>]
-
-* Don't add the same conditions twice in has_one finder sql.  #2916 [Jeremy Evans]
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-* Introducing the Firebird adapter.  Quote columns and use attribute_condition more consistently.  Setup guide: http://wiki.rubyonrails.com/rails/pages/Firebird+Adapter  #1874 [Ken Kunz <kennethkunz@gmail.com>]
-
-* SQLServer: active? and reconnect! methods for handling stale connections.  #428 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]
-
-* Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array.  #1345 [MarkusQ@reality.com]
-
-* SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  #2866 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]
-
-* Oracle: active? and reconnect! methods for handling stale connections.  Optionally retry queries after reconnect.  #428 [Michael Schoen <schoenm@earthlink.net>]
-
-* Correct documentation for Base.delete_all.  #1568 [Newhydra]
-
-* Oracle: test case for column default parsing.  #2788 [Michael Schoen <schoenm@earthlink.net>]
-
-* Update documentation for Migrations.  #2861 [Tom Werner <tom@cube6media.com>]
-
-* When AbstractAdapter#log rescues an exception, attempt to detect and reconnect to an inactive database connection.  Connection adapter must respond to the active? and reconnect! instance methods.  Initial support for PostgreSQL, MySQL, and SQLite.  Make certain that all statements which may need reconnection are performed within a logged block: for example, this means no avoiding log(sql, name) { } if @logger.nil?  #428 [Jeremy Kemper]
-
-* Oracle: Much faster column reflection.  #2848 [Michael Schoen <schoenm@earthlink.net>]
-
-* Base.reset_sequence_name analogous to reset_table_name (mostly useful for testing).  Base.define_attr_method allows nil values.  [Jeremy Kemper]
-
-* PostgreSQL: smarter sequence name defaults, stricter last_insert_id, warn on pk without sequence.  [Jeremy Kemper]
-
-* PostgreSQL: correctly discover custom primary key sequences.  #2594 [Blair Zajac <blair@orcaware.com>, meadow.nnick@gmail.com, Jeremy Kemper]
-
-* SQLServer: don't report limits for unsupported field types.  #2835 [Ryan Tomayko]
-
-* Include the Enumerable module in ActiveRecord::Errors.  [Rick Bradley <rick@rickbradley.com>]
-
-* Add :group option, correspond to GROUP BY, to the find method and to the has_many association.  #2818 [rubyonrails@atyp.de]
-
-* Don't cast nil or empty strings to a dummy date.  #2789 [Rick Bradley <rick@rickbradley.com>]
-
-* acts_as_list plays nicely with inheritance by remembering the class which declared it.  #2811 [rephorm@rephorm.com]
-
-* Fix sqlite adaptor's detection of missing dbfile or database declaration. [Nicholas Seckar]
-
-* Fixed acts_as_list for definitions without an explicit :order #2803 [Jonathan Viney]
-
-* Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support.  Local change [301] is now a part of the main driver; reapplied local change [2182].  Removed GC.start from Result.free.  [tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper]
-
-* Correct handling of complex order clauses with SQL Server limit emulation.  #2770 [Tom Ward <tom@popdog.net>, Matt B.]
-
-* Correct whitespace problem in Oracle default column value parsing.  #2788 [rick@rickbradley.com]
-
-* Destroy associated has_and_belongs_to_many records after all before_destroy callbacks but before destroy.  This allows you to act on the habtm association as you please while preserving referential integrity.  #2065 [larrywilliams1@gmail.com, sam.kirchmeier@gmail.com, elliot@townx.org, Jeremy Kemper]
-
-* Deprecate the old, confusing :exclusively_dependent option in favor of :dependent => :delete_all.  [Jeremy Kemper]
-
-* More compatible Oracle column reflection.  #2771 [Ryan Davis <ryand-ruby@zenspider.com>, Michael Schoen <schoenm@earthlink.net>]
-
-
-*1.13.0* (November 7th, 2005)
-
-* Fixed faulty regex in get_table_name method (SQLServerAdapter) #2639 [Ryan Tomayko]
-
-* Added :include as an option for association declarations [David Heinemeier Hansson]. Example:
-
-    has_many :posts, :include => [ :author, :comments ]
-
-* Rename Base.constrain to Base.with_scope so it doesn't conflict with existing concept of database constraints.  Make scoping more robust: uniform method => parameters, validated method names and supported finder parameters, raise exception on nested scopes.  [Jeremy Kemper]  Example:
-
-    Comment.with_scope(:find => { :conditions => 'active=true' }, :create => { :post_id => 5 }) do
-      # Find where name = ? and active=true
-      Comment.find :all, :conditions => ['name = ?', name]
-      # Create comment associated with :post_id
-      Comment.create :body => "Hello world"
-    end
-
-* Fixed that SQL Server should ignore :size declarations on anything but integer and string in the agnostic schema representation #2756 [Ryan Tomayko]
-
-* Added constrain scoping for creates using a hash of attributes bound to the :creation key [David Heinemeier Hansson]. Example:
-
-    Comment.constrain(:creation => { :post_id => 5 }) do
-      # Associated with :post_id
-      Comment.create :body => "Hello world"
-    end
-
-  This is rarely used directly, but allows for find_or_create on associations. So you can do:
-
-    # If the tag doesn't exist, a new one is created that's associated with the person
-    person.tags.find_or_create_by_name("Summer")
-
-* Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [David Heinemeier Hansson]. Example:
-
-    # No 'Summer' tag exists
-    Tag.find_or_create_by_name("Summer") # equal to Tag.create(:name => "Summer")
-
-    # Now the 'Summer' tag does exist
-    Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
-
-* Added extension capabilities to has_many and has_and_belongs_to_many proxies [David Heinemeier Hansson]. Example:
-
-    class Account < ActiveRecord::Base
-      has_many :people do
-        def find_or_create_by_name(name)
-          first_name, *last_name = name.split
-          last_name = last_name.join " "
-
-          find_or_create_by_first_name_and_last_name(first_name, last_name)
-        end
-      end
-    end
-
-    person = Account.find(:first).people.find_or_create_by_name("David Heinemeier Hansson")
-    person.first_name # => "David"
-    person.last_name  # => "Heinemeier Hansson"
-
-  Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
-
-* Omit internal dtproperties table from SQLServer table list.  #2729 [Ryan Tomayko]
-
-* Quote column names in generated SQL.  #2728 [Ryan Tomayko]
-
-* Correct the pure-Ruby MySQL 4.1.1 shim's version test.  #2718 [Jeremy Kemper]
-
-* Add Model.create! to match existing model.save! method.  When save! raises RecordInvalid, you can catch the exception, retrieve the invalid record (invalid_exception.record), and see its errors (invalid_exception.record.errors).  [Jeremy Kemper]
-
-* Correct fixture behavior when table name pluralization is off.  #2719 [Rick Bradley <rick@rickbradley.com>]
-
-* Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) #2644 [Dan Peterson]
-
-* Added migration support for Oracle #2647 [Michael Schoen]
-
-* Worked around that connection can't be reset if allow_concurrency is off.  #2648 [Michael Schoen <schoenm@earthlink.net>]
-
-* Fixed SQL Server adapter to pass even more tests and do even better #2634 [Ryan Tomayko]
-
-* Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 [Tom Ward]
-
-* Added migration support to SQL Server adapter (please someone do the same for Oracle and DB2) #2625 [Tom Ward]
-
-* Use AR::Base.silence rather than AR::Base.logger.silence in fixtures to preserve Log4r compatibility.  #2618 [dansketcher@gmail.com]
-
-* Constraints are cloned so they can't be inadvertently modified while they're
-in effect.  Added :readonly finder constraint.  Calling an association collection's class method (Part.foobar via item.parts.foobar) constrains :readonly => false since the collection's :joins constraint would otherwise force it to true.  [Jeremy Kemper <rails@bitsweat.net>]
-
-* Added :offset and :limit to the kinds of options that Base.constrain can use #2466 [duane.johnson@gmail.com]
-
-* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [Michael Schoen]
-
-* Added quoted_true and quoted_false methods and tables to db2_adapter and cleaned up tests for DB2 #2493, #2624 [maik schmidt]
-
-
-*1.12.2* (October 26th, 2005)
-
-* Allow symbols to rename columns when using SQLite adapter. #2531 [Kevin Clark]
-
-* Map Active Record time to SQL TIME.  #2575, #2576 [Robby Russell <robby@planetargon.com>]
-
-* Clarify semantics of ActiveRecord::Base#respond_to?  #2560 [Stefan Kaes]
-
-* Fixed Association#clear for associations which have not yet been accessed. #2524 [Patrick Lenz <patrick@lenz.sh>]
-
-* HABTM finders shouldn't return readonly records.  #2525 [Patrick Lenz <patrick@lenz.sh>]
-
-* Make all tests runnable on their own. #2521. [Blair Zajac <blair@orcaware.com>]
-
-
-*1.12.1* (October 19th, 2005)
-
-* Always parenthesize :conditions options so they may be safely combined with STI and constraints.
-
-* Correct PostgreSQL primary key sequence detection.  #2507 [tmornini@infomania.com]
-
-* Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
-
-
-*1.12.0* (October 16th, 2005)
-
-* Update/clean up documentation (rdoc)
-
-* PostgreSQL sequence support.  Use set_sequence_name in your model class to specify its primary key sequence.  #2292 [Rick Olson <technoweenie@gmail.com>, Robby Russell <robby@planetargon.com>]
-
-* Change default logging colors to work on both white and black backgrounds. [Sam Stephenson]
-
-* YAML fixtures support ordered hashes for fixtures with foreign key dependencies in the same table.  #1896 [purestorm@ggnore.net]
-
-* :dependent now accepts :nullify option. Sets the foreign key of the related objects to NULL instead of deleting them. #2015 [Robby Russell <robby@planetargon.com>]
-
-* Introduce read-only records.  If you call object.readonly! then it will mark the object as read-only and raise ReadOnlyRecord if you call object.save.  object.readonly? reports whether the object is read-only.  Passing :readonly => true to any finder method will mark returned records as read-only.  The :joins option now implies :readonly, so if you use this option, saving the same record will now fail.  Use find_by_sql to work around.
-
-* Avoid memleak in dev mode when using fcgi
-
-* Simplified .clear on active record associations by using the existing delete_records method. #1906 [Caleb <me@cpb.ca>]
-
-* Delegate access to a customized primary key to the conventional id method. #2444. [Blair Zajac <blair@orcaware.com>]
-
-* Fix errors caused by assigning a has-one or belongs-to property to itself
-
-* Add ActiveRecord::Base.schema_format setting which specifies how databases should be dumped [Sam Stephenson]
-
-* Update DB2 adapter. #2206. [contact@maik-schmidt.de]
-
-* Corrections to SQLServer native data types. #2267.  [rails.20.clarry@spamgourmet.com]
-
-* Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency.
-
-* Protect id attribute from mass assigment even when the primary key is set to something else. #2438. [Blair Zajac <blair@orcaware.com>]
-
-* Misc doc fixes (typos/grammar/etc.). #2430. [coffee2code]
-
-* Add test coverage for content_columns. #2432. [coffee2code]
-
-* Speed up for unthreaded environments. #2431. [Stefan Kaes]
-
-* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. [Stefan Kaes]
-
-* Speed up the setting of table_name. #2428. [Stefan Kaes]
-
-* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Fix typo of 'constrains' to 'contraints'. #2069. [Michael Schuerig <michael@schuerig.de>]
-
-* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. [Michael Schuerig <michael@schuerig.de>]
-
-* Add geometric type for postgresql adapter. #2233 [Andrew Kaspick]
-
-* Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Add convenience predicate methods on Column class. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Raise errors when invalid hash keys are passed to ActiveRecord::Base.find. #2363  [Chad Fowler <chad@chadfowler.com>, Nicholas Seckar]
-
-* Added :force option to create_table that'll try to drop the table if it already exists before creating
-
-* Fix transactions so that calling return while inside a transaction will not leave an open transaction on the connection. [Nicholas Seckar]
-
-* Use foreign_key inflection uniformly.  #2156 [Blair Zajac <blair@orcaware.com>]
-
-* model.association.clear should destroy associated objects if :dependent => true instead of nullifying their foreign keys.  #2221 [joergd@pobox.com, ObieFernandez <obiefernandez@gmail.com>]
-
-* Returning false from before_destroy should cancel the action.  #1829 [Jeremy Huffman]
-
-* Recognize PostgreSQL NOW() default as equivalent to CURRENT_TIMESTAMP or CURRENT_DATE, depending on the column's type.  #2256 [mat <mat@absolight.fr>]
-
-* Extensive documentation for the abstract database adapter.  #2250 [François Beausoleil <fbeausoleil@ftml.net>]
-
-* Clean up Fixtures.reset_sequences for PostgreSQL.  Handle tables with no rows and models with custom primary keys.  #2174, #2183 [jay@jay.fm, Blair Zajac <blair@orcaware.com>]
-
-* Improve error message when nil is assigned to an attr which validates_size_of within a range.  #2022 [Manuel Holtgrewe <purestorm@ggnore.net>]
-
-* Make update_attribute use the same writer method that update_attributes uses.
- #2237 [trevor@protocool.com]
-
-* Make migrations honor table name prefixes and suffixes. #2298 [Jakob Skjerning, Marcel Molina Jr.]
-
-* Correct and optimize PostgreSQL bytea escaping.  #1745, #1837 [dave@cherryville.org, ken@miriamtech.com, bellis@deepthought.org]
-
-* Fixtures should only reset a PostgreSQL sequence if it corresponds to an integer primary key named id.  #1749 [chris@chrisbrinker.com]
-
-* Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior)
-
-* Added new symbol-driven approach to activating observers with Base#observers= [David Heinemeier Hansson]. Example:
-
-    ActiveRecord::Base.observers = :cacher, :garbage_collector
-
-* Added AbstractAdapter#select_value and AbstractAdapter#select_values as convenience methods for selecting single values, instead of hashes, of the first column in a SELECT #2283 [solo@gatelys.com]
-
-* Wrap :conditions in parentheses to prevent problems with OR's #1871 [Jamis Buck]
-
-* Allow the postgresql adapter to work with the SchemaDumper. [Jamis Buck]
-
-* Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases. [Jamis Buck]
-
-* Fixed migrations for Windows when using more than 10 [David Naseby]
-
-* Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 [Florian Weber]
-
-* Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Lütke]
-
-* Improved migrations' behavior when the schema_info table is empty. [Nicholas Seckar]
-
-* Fixed that Observers didn't observe sub-classes #627 [Florian Weber]
-
-* Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 [Marcel Molina Jr.]
-
-* Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 [skae]
-
-* Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 [Florian Weber]
-
-* Added better exception error when unknown column types are used with migrations #1814 [François Beausoleil]
-
-* Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 [kajism@yahoo.com]
-
-* Fixed comparison of Active Record objects so two new objects are not equal #2099 [deberg]
-
-* Fixed that the SQL Server adapter would sometimes return DBI::Timestamp objects instead of Time #2127 [Tom Ward]
-
-* Added the instance methods #root and #ancestors on acts_as_tree and fixed siblings to not include the current node #2142, #2140 [coffee2code]
-
-* Fixed that Active Record would call SHOW FIELDS twice (or more) for the same model when the cached results were available #1947 [sd@notso.net]
-
-* Added log_level and use_silence parameter to ActiveRecord::Base.benchmark. The first controls at what level the benchmark statement will be logged (now as debug, instead of info) and the second that can be passed false to include all logging statements during the benchmark block/
-
-* Make sure the schema_info table is created before querying the current version #1903
-
-* Fixtures ignore table name prefix and suffix #1987 [Jakob Skjerning]
-
-* Add documentation for index_type argument to add_index method for migrations #2005 [Blaine]
-
-* Modify read_attribute to allow a symbol argument #2024 [Ken Kunz]
-
-* Make destroy return self #1913 [Sebastian Kanthak]
-
-* Fix typo in validations documentation #1938 [court3nay]
-
-* Make acts_as_list work for insert_at(1) #1966 [hensleyl@papermountain.org]
-
-* Fix typo in count_by_sql documentation #1969 [Alexey Verkhovsky]
-
-* Allow add_column and create_table to specify NOT NULL #1712 [emptysands@gmail.com]
-
-* Fix create_table so that id column is implicitly added [Rick Olson]
-
-* Default sequence names for Oracle changed to #{table_name}_seq, which is the most commonly used standard. In addition, a new method ActiveRecord::Base#set_sequence_name allows the developer to set the sequence name per model. This is a non-backwards-compatible change -- anyone using the old-style "rails_sequence" will need to either create new sequences, or set: ActiveRecord::Base.set_sequence_name = "rails_sequence" #1798
-
-* OCIAdapter now properly handles synonyms, which are commonly used to separate out the schema owner from the application user #1798
-
-* Fixed the handling of camelCase columns names in Oracle #1798
-
-* Implemented for OCI the Rakefile tasks of :clone_structure_to_test, :db_structure_dump, and :purge_test_database, which enable Oracle folks to enjoy all the agile goodness of Rails for testing. Note that the current implementation is fairly limited -- only tables and sequences are cloned, not constraints or indexes. A full clone in Oracle generally requires some manual effort, and is version-specific. Post 9i, Oracle recommends the use of the DBMS_METADATA package, though that approach requires editing of the physical characteristics generated #1798
-
-* Fixed the handling of multiple blob columns in Oracle if one or more of them are null #1798
-
-* Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 [Tobias Lütke]
-
-    class Comment < AR:B
-      def self.search(q)
-        find(:all, :conditions => ["body = ?", q])
-      end
-    end
-
-    class Post < AR:B
-      has_many :comments
-    end
-
-    Post.find(1).comments.search('hi') # => SELECT * from comments WHERE post_id = 1 AND body = 'hi'
-
-  NOTICE: This patch changes the underlying SQL generated by has_and_belongs_to_many queries. If your relying on that, such as
-  by explicitly referencing the old t and j aliases, you'll need to update your code. Of course, you _shouldn't_ be relying on
-  details like that no less than you should be diving in to touch private variables. But just in case you do, consider yourself
-  noticed :)
-
-* Added migration support for SQLite (using temporary tables to simulate ALTER TABLE) #1771 [Sam Stephenson]
-
-* Remove extra definition of supports_migrations? from abstract_adaptor.rb [Nicholas Seckar]
-
-* Fix acts_as_list so that moving next-to-last item to the bottom does not result in duplicate item positions
-
-* Fixed incompatibility in DB2 adapter with the new limit/offset approach #1718 [Maik Schmidt]
-
-* Added :select option to find which can specify a different value than the default *, like find(:all, :select => "first_name, last_name"), if you either only want to select part of the columns or exclude columns otherwise included from a join #1338 [Stefan Kaes]
-
-
-*1.11.1* (11 July, 2005)
-
-* Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olson]
-
-* Fixed that assume_bottom_position (in acts_as_list) could be called on items already last in the list and they would move one position away from the list #1648 [tyler@kianta.com]
-
-* Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 [Sam Stephenson]
-
-* Correct reflected table name for singular associations.  #1688 [court3nay]
-
-* Fixed optimistic locking with SQL Server #1660 [tom@popdog.net]
-
-* Added ActiveRecord::Migrator.migrate that can figure out whether to go up or down based on the target version and the current
-
-* Added better error message for "packets out of order" #1630 [court3nay]
-
-* Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
-
-
-*1.11.0* (6 July, 2005)
-
-* Fixed that Yaml error message in fixtures hid the real error #1623 [Nicholas Seckar]
-
-* Changed logging of SQL statements to use the DEBUG level instead of INFO
-
-* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Lütke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
-
-* Added callback hooks to association collections #1549 [Florian Weber]. Example:
-
-    class Project
-      has_and_belongs_to_many :developers, :before_add => :evaluate_velocity
-
-      def evaluate_velocity(developer)
-        ...
-      end
-    end
-
-  ..raising an exception will cause the object not to be added (or removed, with before_remove).
-
-
-* Fixed Base.content_columns call for SQL Server adapter #1450 [DeLynn Berry]
-
-* Fixed Base#write_attribute to work with both symbols and strings #1190 [Paul Legato]
-
-* Fixed that has_and_belongs_to_many didn't respect single table inheritance types #1081 [Florian Weber]
-
-* Speed up ActiveRecord#method_missing for the common case (read_attribute).
-
-* Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 [Stefan Kaes]
-
-* Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath]
-
-* Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 [raidel@onemail.at]
-
-* Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [Michael Schuerig]
-
-* Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 [DeLynn Berry]
-
-* Added support for ODBC connections to MS SQL Server so you can connect from a non-Windows machine #1569 [Mark Imbriaco/DeLynn Berry]
-
-* Fixed that multiparameter posts ignored attr_protected #1532 [alec+rails@veryclever.net]
-
-* Fixed problem with eager loading when using a has_and_belongs_to_many association using :association_foreign_key #1504 [flash@vanklinkenbergsoftware.nl]
-
-* Fixed Base#find to honor the documentation on how :joins work and make them consistent with Base#count #1405 [pritchie@gmail.com]. What used to be:
-
-    Developer.find :all, :joins => 'developers_projects', :conditions => 'id=developer_id AND project_id=1'
-
-  ...should instead be:
-
-    Developer.find(
-      :all,
-      :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
-      :conditions => 'project_id=1'
-    )
-
-* Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 [Marcel Molina Jr.]
-
-* Fixed that clear_association_cache doesn't delete new associations on new records (so you can safely place new records in the session with Action Pack without having new associations wiped) #1494 [cluon]
-
-* Fixed that calling Model.find([]) returns [] and doesn't throw an exception #1379
-
-* Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 [Alisdair McDiarmid]
-
-* Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
-
-* Allow any Enumerable, not just Array, to work as bind variables #1344 [Jeremy Kemper]
-
-* Added actual database-changing behavior to collection assigment for has_many and has_and_belongs_to_many #1425 [Sebastian Kanthak].
-  Example:
-
-    david.projects = [Project.find(1), Project.new("name" => "ActionWebSearch")]
-    david.save
-
-  If david.projects already contain the project with ID 1, this is left unchanged. Any other projects are dropped. And the new
-  project is saved when david.save is called.
-
-  Also included is a way to do assignments through IDs, which is perfect for checkbox updating, so you get to do:
-
-    david.project_ids = [1, 5, 7]
-
-* Corrected typo in find SQL for has_and_belongs_to_many.  #1312 [ben@bensinclair.com]
-
-* Fixed sanitized conditions for has_many finder method.  #1281 [jackc@hylesanderson.com, pragdave, Tobias Lütke]
-
-* Comprehensive PostgreSQL schema support.  Use the optional schema_search_path directive in database.yml to give a comma-separated list of schemas to search for your tables.  This allows you, for example, to have tables in a shared schema without having to use a custom table name.  See http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html to learn more.  #827 [dave@cherryville.org]
-
-* Corrected @@configurations typo #1410 [david@ruppconsulting.com]
-
-* Return PostgreSQL columns in the order they were declared #1374 [perlguy@gmail.com]
-
-* Allow before/after update hooks to work on models using optimistic locking
-
-* Eager loading of dependent has_one associations won't delete the association #1212
-
-* Added a second parameter to the build and create method for has_one that controls whether the existing association should be replaced (which means nullifying its foreign key as well). By default this is true, but false can be passed to prevent it.
-
-* Using transactional fixtures now causes the data to be loaded only once.
-
-* Added fixture accessor methods that can be used when instantiated fixtures are disabled.
-
-    fixtures :web_sites
-
-    def test_something
-      assert_equal "Ruby on Rails", web_sites(:rubyonrails).name
-    end
-
-* Added DoubleRenderError exception that'll be raised if render* is called twice #518 [Nicholas Seckar]
-
-* Fixed exceptions occuring after render has been called #1096 [Nicholas Seckar]
-
-* CHANGED: validates_presence_of now uses Errors#add_on_blank, which will make "  " fail the validation where it didn't before #1309
-
-* Added Errors#add_on_blank which works like Errors#add_on_empty, but uses Object#blank? instead
-
-* Added the :if option to all validations that can either use a block or a method pointer to determine whether the validation should be run or not. #1324 [Duane Johnson/jhosteny]. Examples:
-
-  Conditional validations such as the following are made possible:
-    validates_numericality_of :income, :if => :employed?
-
-  Conditional validations can also solve the salted login generator problem:
-    validates_confirmation_of :password, :if => :new_password?
-
-  Using blocks:
-    validates_presence_of :username, :if => Proc.new { |user| user.signup_step > 1 }
-
-* Fixed use of construct_finder_sql when using :join #1288 [dwlt@dwlt.net]
-
-* Fixed that :delete_sql in has_and_belongs_to_many associations couldn't access record properties #1299 [Rick Olson]
-
-* Fixed that clone would break when an aggregate had the same name as one of its attributes #1307 [Jeremy Kemper]
-
-* Changed that destroying an object will only freeze the attributes hash, which keeps the object from having attributes changed (as that wouldn't make sense), but allows for the querying of associations after it has been destroyed.
-
-* Changed the callbacks such that observers are notified before the in-object callbacks are triggered. Without this change, it wasn't possible to act on the whole object in something like a before_destroy observer without having the objects own callbacks (like deleting associations) called first.
-
-* Added option for passing an array to the find_all version of the dynamic finders and have it evaluated as an IN fragment. Example:
-
-    # SELECT * FROM topics WHERE title IN ('First', 'Second')
-    Topic.find_all_by_title(["First", "Second"])
-
-* Added compatibility with camelCase column names for dynamic finders #533 [Dee Zsombor]
-
-* Fixed extraneous comma in count() function that made it not work with joins #1156 [Jarkko Laine/Dee Zsombor]
-
-* Fixed incompatibility with Base#find with an array of ids that would fail when using eager loading #1186 [Alisdair McDiarmid]
-
-* Fixed that validate_length_of lost :on option when :within was specified #1195 [jhosteny@mac.com]
-
-* Added encoding and min_messages options for PostgreSQL #1205 [Shugo Maeda]. Configuration example:
-
-    development:
-      adapter: postgresql
-      database: rails_development
-      host: localhost
-      username: postgres
-      password:
-      encoding: UTF8
-      min_messages: ERROR
-
-* Fixed acts_as_list where deleting an item that was removed from the list would ruin the positioning of other list items #1197 [Jamis Buck]
-
-* Added validates_exclusion_of as a negative of validates_inclusion_of
-
-* Optimized counting of has_many associations by setting the association to empty if the count is 0 so repeated calls doesn't trigger database calls
-
-
-*1.10.1* (20th April, 2005)
-
-* Fixed frivilous database queries being triggered with eager loading on empty associations and other things
-
-* Fixed order of loading in eager associations
-
-* Fixed stray comma when using eager loading and ordering together from has_many associations #1143
-
-
-*1.10.0* (19th April, 2005)
-
-* Added eager loading of associations as a way to solve the N+1 problem more gracefully without piggy-back queries. Example:
-
-    for post in Post.find(:all, :limit => 100)
-      puts "Post:            " + post.title
-      puts "Written by:      " + post.author.name
-      puts "Last comment on: " + post.comments.first.created_on
-    end
-
-  This used to generate 301 database queries if all 100 posts had both author and comments. It can now be written as:
-
-    for post in Post.find(:all, :limit => 100, :include => [ :author, :comments ])
-
-  ...and the number of database queries needed is now 1.
-
-* Added new unified Base.find API and deprecated the use of find_first and find_all. See the documentation for Base.find. Examples:
-
-    Person.find(1, :conditions => "administrator = 1", :order => "created_on DESC")
-    Person.find(1, 5, 6, :conditions => "administrator = 1", :order => "created_on DESC")
-    Person.find(:first, :order => "created_on DESC", :offset => 5)
-    Person.find(:all, :conditions => [ "category IN (?)", categories], :limit => 50)
-    Person.find(:all, :offset => 10, :limit => 10)
-
-* Added acts_as_nested_set #1000 [wschenk]. Introduction:
-
-    This acts provides Nested Set functionality.  Nested Set is similiar to Tree, but with
-    the added feature that you can select the children and all of it's descendants with
-    a single query.  A good use case for this is a threaded post system, where you want
-    to display every reply to a comment without multiple selects.
-
-* Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid [Dave Thomas]
-
-* Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 [gnuman1@gmail.com]
-
-* Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 [andrew.john.peters@gmail.com]
-
-* Fixed loading of fixtures in to be in the right order (or PostgreSQL would bark) #1047 [stephenh@chase3000.com]
-
-* Fixed page caching for non-vhost applications living underneath the root #1004 [Ben Schumacher]
-
-* Fixes a problem with the SQL Adapter which was resulting in IDENTITY_INSERT not being set to ON when it should be #1104 [adelle]
-
-* Added the option to specify the acceptance string in validates_acceptance_of #1106 [caleb@aei-tech.com]
-
-* Added insert_at(position) to acts_as_list #1083 [DeLynnB]
-
-* Removed the default order by id on has_and_belongs_to_many queries as it could kill performance on large sets (you can still specify by hand with :order)
-
-* Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 [yon@milliped.com]
-
-* Fixed boolean saving on Oracle #1093 [mparrish@pearware.org]
-
-* Moved build_association and create_association for has_one and belongs_to out of deprecation as they work when the association is nil unlike association.build and association.create, which require the association to be already in place #864
-
-* Added rollbacks of transactions if they're active as the dispatcher is killed gracefully (TERM signal) #1054 [Leon Bredt]
-
-* Added quoting of column names for fixtures #997 [jcfischer@gmail.com]
-
-* Fixed counter_sql when no records exist in database for PostgreSQL (would give error, not 0) #1039 [Caleb Tennis]
-
-* Fixed that benchmarking times for rendering included db runtimes #987 [Stefan Kaes]
-
-* Fixed boolean queries for t/f fields in PostgreSQL #995 [dave@cherryville.org]
-
-* Added that model.items.delete(child) will delete the child, not just set the foreign key to nil, if the child is dependent on the model #978 [Jeremy Kemper]
-
-* Fixed auto-stamping of dates (created_on/updated_on) for PostgreSQL #985 [dave@cherryville.org]
-
-* Fixed Base.silence/benchmark to only log if a logger has been configured #986 [Stefan Kaes]
-
-* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [Stefan Kaes]
-
-* Fixed bug in Base#hash method that would treat records with the same string-based id as different [Dave Thomas]
-
-* Renamed DateHelper#distance_of_time_in_words_to_now to DateHelper#time_ago_in_words (old method name is still available as a deprecated alias)
-
-
-*1.9.1* (27th March, 2005)
-
-* Fixed that Active Record objects with float attribute could not be cloned #808
-
-* Fixed that MissingSourceFile's wasn't properly detected in production mode #925 [Nicholas Seckar]
-
-* Fixed that :counter_cache option would look for a line_items_count column for a LineItem object instead of lineitems_count
-
-* Fixed that AR exists?() would explode on postgresql if the passed id did not match the PK type #900 [Scott Barron]
-
-* Fixed the MS SQL adapter to work with the new limit/offset approach and with binary data (still suffering from 7KB limit, though) #901 [delynnb]
-
-
-*1.9.0* (22th March, 2005)
-
-* Added adapter independent limit clause as a two-element array with the first being the limit, the second being the offset #795 [Sam Stephenson]. Example:
-
-    Developer.find_all nil, 'id ASC', 5      # return the first five developers
-    Developer.find_all nil, 'id ASC', [3, 8] # return three developers, starting from #8 and forward
-
-  This doesn't yet work with the DB2 or MS SQL adapters. Patches to make that happen are encouraged.
-
-* Added alias_method :to_param, :id to Base, such that Active Record objects to be used as URL parameters in Action Pack automatically #812 [Nicholas Seckar/Sam Stephenson]
-
-* Improved the performance of the OCI8 adapter for Oracle #723 [pilx/gjenkins]
-
-* Added type conversion before saving a record, so string-based values like "10.0" aren't left for the database to convert #820 [dave@cherryville.org]
-
-* Added with additional settings for working with transactional fixtures and pre-loaded test databases #865 [mindel]
-
-* Fixed acts_as_list to trigger remove_from_list on destroy after the fact, not before, so a unique position can be maintained #871 [Alisdair McDiarmid]
-
-* Added the possibility of specifying fixtures in multiple calls #816 [kim@tinker.com]
-
-* Added Base.exists?(id) that'll return true if an object of the class with the given id exists #854 [stian@grytoyr.net]
-
-* Added optionally allow for nil or empty strings with validates_numericality_of #801 [Sebastian Kanthak]
-
-* Fixed problem with using slashes in validates_format_of regular expressions #801 [Sebastian Kanthak]
-
-* Fixed that SQLite3 exceptions are caught and reported properly #823 [yerejm]
-
-* Added that all types of after_find/after_initialized callbacks are triggered if the explicit implementation is present, not only the explicit implementation itself
-
-* Fixed that symbols can be used on attribute assignment, like page.emails.create(:subject => data.subject, :body => data.body)
-
-
-*1.8.0* (7th March, 2005)
-
-* Added ActiveRecord::Base.colorize_logging to control whether to use colors in logs or not (on by default)
-
-* Added support for timestamp with time zone in PostgreSQL #560 [Scott Barron]
-
-* Added MultiparameterAssignmentErrors and AttributeAssignmentError exceptions #777 [demetrius]. Documentation:
-
-   * +MultiparameterAssignmentErrors+ -- collection of errors that occurred during a mass assignment using the
-     +attributes=+ method. The +errors+ property of this exception contains an array of +AttributeAssignmentError+
-     objects that should be inspected to determine which attributes triggered the errors.
-   * +AttributeAssignmentError+ -- an error occurred while doing a mass assignment through the +attributes=+ method.
-     You can inspect the +attribute+ property of the exception object to determine which attribute triggered the error.
-
-* Fixed that postgresql adapter would fails when reading bytea fields with null value #771 [rodrigo k]
-
-* Added transactional fixtures that uses rollback to undo changes to fixtures instead of DELETE/INSERT -- it's much faster. See documentation under Fixtures #760 [Jeremy Kemper]
-
-* Added destruction of dependent objects in has_one associations when a new assignment happens #742 [mindel]. Example:
-
-    class Account < ActiveRecord::Base
-      has_one :credit_card, :dependent => true
-    end
-    class CreditCard < ActiveRecord::Base
-      belongs_to :account
-    end
-
-    account.credit_card # => returns existing credit card, lets say id = 12
-    account.credit_card = CreditCard.create("number" => "123")
-    account.save # => CC with id = 12 is destroyed
-
-
-* Added validates_numericality_of #716 [Sebastian Kanthak/Chris McGrath]. Docuemntation:
-
-    Validates whether the value of the specified attribute is numeric by trying to convert it to
-    a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
-    <tt>/^[\+\-]?\d+$/</tt> (if <tt>integer</tt> is set to true).
-
-      class Person < ActiveRecord::Base
-        validates_numericality_of :value, :on => :create
-      end
-
-    Configuration options:
-    * <tt>message</tt> - A custom error message (default is: "is not a number")
-    * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
-    * <tt>only_integer</tt> Specifies whether the value has to be an integer, e.g. an integral value (default is false)
-
-
-* Fixed that HasManyAssociation#count was using :finder_sql rather than :counter_sql if it was available #445 [Scott Barron]
-
-* Added better defaults for composed_of, so statements like composed_of :time_zone, :mapping => %w( time_zone time_zone ) can be written without the mapping part (it's now assumed)
-
-* Added MacroReflection#macro which will return a symbol describing the macro used (like :composed_of or :has_many) #718, #248 [james@slashetc.com]
-
-
-*1.7.0* (24th February, 2005)
-
-* Changed the auto-timestamping feature to use ActiveRecord::Base.default_timezone instead of entertaining the parallel ActiveRecord::Base.timestamps_gmt method. The latter is now deprecated and will throw a warning on use (but still work) #710 [Jamis Buck]
-
-* Added a OCI8-based Oracle adapter that has been verified to work with Oracle 8 and 9 #629 [Graham Jenkins]. Usage notes:
-
-    1.  Key generation uses a sequence "rails_sequence" for all tables. (I couldn't find a simple
-        and safe way of passing table-specific sequence information to the adapter.)
-    2.  Oracle uses DATE or TIMESTAMP datatypes for both dates and times. Consequently I have had to
-        resort to some hacks to get data converted to Date or Time in Ruby.
-        If the column_name ends in _at (like created_at, updated_at) it's created as a Ruby Time. Else if the
-        hours/minutes/seconds are 0, I make it a Ruby Date. Else it's a Ruby Time.
-        This is nasty - but if you use Duck Typing you'll probably not care very much.
-        In 9i it's tempting to map DATE to Date and TIMESTAMP to Time but I don't think that is
-        valid - too many databases use DATE for both.
-        Timezones and sub-second precision on timestamps are not supported.
-    3.  Default values that are functions (such as "SYSDATE") are not supported. This is a
-        restriction of the way active record supports default values.
-    4.  Referential integrity constraints are not fully supported. Under at least
-        some circumstances, active record appears to delete parent and child records out of
-        sequence and out of transaction scope. (Or this may just be a problem of test setup.)
-
-  The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/
-
-* Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 [YuriSchimke]
-
-* Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 [yerejm]
-
-* Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 [tonka]
-
-* Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 [Nicholas Seckar]
-
-* Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 [daniel@nightrunner.com]
-
-* Added automatic dropping/creating of test tables for running the unit tests on all databases #587 [adelle@bullet.net.au]
-
-* Fixed that find_by_* would fail when column names had numbers #670 [demetrius]
-
-* Fixed the SQL Server adapter on a bunch of issues #667 [DeLynn]
-
-    1. Created a new columns method that is much cleaner.
-    2. Corrected a problem with the select and select_all methods
-       that didn't account for the LIMIT clause being passed into raw SQL statements.
-    3. Implemented the string_to_time method in order to create proper instances of the time class.
-    4. Added logic to the simplified_type method that allows the database to specify the scale of float data.
-    5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
-
-* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow]
-
-* Added validates_each that validates each specified attribute against a block #610 [Jeremy Kemper]. Example:
-
-    class Person < ActiveRecord::Base
-      validates_each :first_name, :last_name do |record, attr|
-        record.errors.add attr, 'starts with z.' if attr[0] == ?z
-      end
-    end
-
-* Added :allow_nil as an explicit option for validates_length_of, so unless that's set to true having the attribute as nil will also return an error if a range is specified as :within #610 [Jeremy Kemper]
-
-* Added that validates_* now accept blocks to perform validations #618 [Tim Bates]. Example:
-
-    class Person < ActiveRecord::Base
-      validate { |person| person.errors.add("title", "will never be valid") if SHOULD_NEVER_BE_VALID }
-    end
-
-* Addded validation for validate all the associated objects before declaring failure with validates_associated #618 [Tim Bates]
-
-* Added keyword-style approach to defining the custom relational bindings #545 [Jamis Buck]. Example:
-
-    class Project < ActiveRecord::Base
-      primary_key "sysid"
-      table_name "XYZ_PROJECT"
-      inheritance_column { original_inheritance_column + "_id" }
-    end
-
-* Fixed Base#clone for use with PostgreSQL #565 [hanson@surgery.wisc.edu]
-
-
-*1.6.0* (January 25th, 2005)
-
-* Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.
-
-* Added that Base#delete and Base#destroy both can take an array of ids to delete/destroy #336
-
-* Added the option of supplying an array of attributes to Base#create, so that multiple records can be created at once.
-
-* Added the option of supplying an array of ids and attributes to Base#update, so that multiple records can be updated at once (inspired by #526/Duane Johnson). Example
-
-    people = { 1 => { "first_name" => "David" }, 2 => { "first_name" => "Jeremy"} }
-    Person.update(people.keys, people.values)
-
-* Added ActiveRecord::Base.timestamps_gmt that can be set to true to make the automated timestamping use GMT instead of local time #520 [Scott Baron]
-
-* Added that update_all calls sanitize_sql on its updates argument, so stuff like MyRecord.update_all(['time = ?', Time.now]) works #519 [notahat]
-
-* Fixed that the dynamic finders didn't treat nil as a "IS NULL" but rather "= NULL" case #515 [Demetrius]
-
-* Added bind-named arrays for interpolating a group of ids or strings in conditions #528 [Jeremy Kemper]
-
-* Added that has_and_belongs_to_many associations with additional attributes also can be created between unsaved objects and only committed to the database when Base#save is called on the associator #524 [Eric Anderson]
-
-* Fixed that records fetched with piggy-back attributes or through rich has_and_belongs_to_many associations couldn't be saved due to the extra attributes not part of the table #522 [Eric Anderson]
-
-* Added mass-assignment protection for the inheritance column -- regardless of a custom column is used or not
-
-* Fixed that association proxies would fail === tests like PremiumSubscription === @account.subscription
-
-* Fixed that column aliases didn't work as expected with the new MySql411 driver #507 [Demetrius]
-
-* Fixed that find_all would produce invalid sql when called sequentialy #490 [Scott Baron]
-
-
-*1.5.1* (January 18th, 2005)
-
-* Fixed that the belongs_to and has_one proxy would fail a test like 'if project.manager' -- this unfortunately also means that you can't call methods like project.manager.build unless there already is a manager on the project #492 [Tim Bates]
-
-* Fixed that the Ruby/MySQL adapter wouldn't connect if the password was empty #503 [Pelle]
-
-
-*1.5.0* (January 17th, 2005)
-
-* Fixed that unit tests for MySQL are now run as the "rails" user instead of root #455 [Eric Hodel]
-
-* Added validates_associated that enables validation of objects in an unsaved association #398 [Tim Bates]. Example:
-
-    class Book < ActiveRecord::Base
-      has_many :pages
-      belongs_to :library
-
-      validates_associated :pages, :library
-    end
-
-* Added support for associating unsaved objects #402 [Tim Bates]. Rules that govern this addition:
-
-    == Unsaved objects and associations
-
-    You can manipulate objects and associations before they are saved to the database, but there is some special behaviour you should be
-    aware of, mostly involving the saving of associated objects.
-
-    === One-to-one associations
-
-    * Assigning an object to a has_one association automatically saves that object, and the object being replaced (if there is one), in
-      order to update their primary keys - except if the parent object is unsaved (new_record? == true).
-    * If either of these saves fail (due to one of the objects being invalid) the assignment statement returns false and the assignment
-      is cancelled.
-    * If you wish to assign an object to a has_one association without saving it, use the #association.build method (documented below).
-    * Assigning an object to a belongs_to association does not save the object, since the foreign key field belongs on the parent. It does
-      not save the parent either.
-
-    === Collections
-
-    * Adding an object to a collection (has_many or has_and_belongs_to_many) automatically saves that object, except if the parent object
-      (the owner of the collection) is not yet stored in the database.
-    * If saving any of the objects being added to a collection (via #push or similar) fails, then #push returns false.
-    * You can add an object to a collection without automatically saving it by using the #collection.build method (documented below).
-    * All unsaved (new_record? == true) members of the collection are automatically saved when the parent is saved.
-
-* Added replace to associations, so you can do project.manager.replace(new_manager) or project.milestones.replace(new_milestones) #402 [Tim Bates]
-
-* Added build and create methods to has_one and belongs_to associations, so you can now do project.manager.build(attributes) #402 [Tim Bates]
-
-* Added that if a before_* callback returns false, all the later callbacks and the associated action are cancelled. If an after_* callback returns false, all the later callbacks are cancelled. Callbacks are generally run in the order they are defined, with the exception of callbacks defined as methods on the model, which are called last. #402 [Tim Bates]
-
-* Fixed that Base#== wouldn't work for multiple references to the same unsaved object #402 [Tim Bates]
-
-* Fixed binary support for PostgreSQL #444 [alex@byzantine.no]
-
-* Added a differenciation between AssociationCollection#size and -length. Now AssociationCollection#size returns the size of the
-  collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and calling collection.size if it has. If
-  it's more likely than not that the collection does have a size larger than zero and you need to fetch that collection afterwards,
-  it'll take one less SELECT query if you use length.
-
-* Added Base#attributes that returns a hash of all the attributes with their names as keys and clones of their objects as values #433 [atyp.de]
-
-* Fixed that foreign keys named the same as the association would cause stack overflow #437 [Eric Anderson]
-
-* Fixed default scope of acts_as_list from "1" to "1 = 1", so it'll work in PostgreSQL (among other places) #427 [Alexey]
-
-* Added Base#reload that reloads the attributes of an object from the database #422 [Andreas Schwarz]
-
-* Added SQLite3 compatibility through the sqlite3-ruby adapter by Jamis Buck #381 [Jeremy Kemper]
-
-* Added support for the new protocol spoken by MySQL 4.1.1+ servers for the Ruby/MySQL adapter that ships with Rails #440 [Matt Mower]
-
-* Added that Observers can use the observes class method instead of overwriting self.observed_class().
-
-    Before:
-      class ListSweeper < ActiveRecord::Base
-        def self.observed_class() [ List, Item ]
-      end
-
-    After:
-      class ListSweeper < ActiveRecord::Base
-        observes List, Item
-      end
-
-* Fixed that conditions in has_many and has_and_belongs_to_many should be interpolated just like the finder_sql is
-
-* Fixed Base#update_attribute to be indifferent to whether a string or symbol is used to describe the name
-
-* Added Base#toggle(attribute) and Base#toggle!(attribute) that makes it easier to flip a switch or flag.
-
-    Before: topic.update_attribute(:approved, !approved?)
-    After : topic.toggle!(:approved)
-
-* Added Base#increment!(attribute) and Base#decrement!(attribute) that also saves the records. Example:
-
-    page.views # => 1
-    page.increment!(:views) # executes an UPDATE statement
-    page.views # => 2
-
-    page.increment(:views).increment!(:views)
-    page.views # => 4
-
-* Added Base#increment(attribute) and Base#decrement(attribute) that encapsulates the += 1 and -= 1 patterns.
-
-
-
-
-*1.14.2* (April 9th, 2005)
-
-* Fixed calculations for the Oracle Adapter (closes #4626) [Michael Schoen]
-
-
-*1.14.1* (April 6th, 2006)
-
-* Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
-
-* Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) [Lars Pind]
-
-* Enable Limit/Offset in Calculations (closes #4558) [lmarlow]
-
-* Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) [Rick Olson]
-
-* Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 [lagroue@free.fr]
-
-* Allow AR::Base#respond_to? to behave when @attributes is nil [Ryan Davis]
-
-* Support eager includes when going through a polymorphic has_many association. [Rick Olson]
-
-* Added support for eagerly including polymorphic has_one associations. (closes #4525) [Rick Olson]
-
-    class Post < ActiveRecord::Base
-      has_one :tagging, :as => :taggable
-    end
-
-    Post.find :all, :include => :tagging
-
-* Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many [Rick Olson]
-
-* Added support for going through a polymorphic has_many association: (closes #4401) [Rick Olson]
-
-    class PhotoCollection < ActiveRecord::Base
-      has_many :photos, :as => :photographic
-      belongs_to :firm
-    end
-
-    class Firm < ActiveRecord::Base
-      has_many :photo_collections
-      has_many :photos, :through => :photo_collections
-    end
-
-* Multiple fixes and optimizations in PostgreSQL adapter, allowing ruby-postgres gem to work properly. [ruben.nine@gmail.com]
-
-* Fixed that AssociationCollection#delete_all should work even if the records of the association are not loaded yet. [Florian Weber]
-
-* Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations.  (closes #4456) [Stefan]
-
-* Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) [Rick Olson]
-
-* DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model [David Heinemeier Hansson]
-
-* Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) [David Heinemeier Hansson]
-
-* Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). [Marcel Mollina Jr.]
-
-* Fixed broken OCIAdapter #4457 [Michael Schoen]
-
-
-*1.14.0* (March 27th, 2006)
-
-* Replace 'rescue Object' with a finer grained rescue. Closes #4431. [Nicholas Seckar]
-
-* Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table [Rick Olson]
-
-* Add support for :include to with_scope [andrew@redlinesoftware.com]
-
-* Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 [Michael Schoen]
-
-* Change periods (.) in table aliases to _'s.  Closes #4251 [jeff@ministrycentered.com]
-
-* Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 [Rick Olson]
-
-* Fixed issue that kept :select options from being scoped [Rick Olson]
-
-* Fixed db_schema_import when binary types are present #3101 [David Heinemeier Hansson]
-
-* Fixed that MySQL enums should always be returned as strings #3501 [David Heinemeier Hansson]
-
-* Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. [Rick Olson]
-
-    class Connection < ActiveRecord::Base
-      belongs_to :user
-      belongs_to :channel
-    end
-
-    class Channel < ActiveRecord::Base
-      has_many :connections
-      has_many :contacts, :through => :connections, :class_name => 'User' # OLD
-      has_many :contacts, :through => :connections, :source => :user      # NEW
-    end
-
-* Fixed DB2 adapter so nullable columns will be determines correctly now and quotes from column default values will be removed #4350 [contact@maik-schmidt.de]
-
-* Allow overriding of find parameters in scoped has_many :through calls [Rick Olson]
-
-  In this example, :include => false disables the default eager association from loading.  :select changes the standard
-  select clause.  :joins specifies a join that is added to the end of the has_many :through query.
-
-    class Post < ActiveRecord::Base
-      has_many :tags, :through => :taggings, :include => :tagging do
-        def add_joins_and_select
-          find :all, :select => 'tags.*, authors.id as author_id', :include => false,
-            :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
-        end
-      end
-    end
-
-* Fixed that schema changes while the database was open would break any connections to an SQLite database (now we reconnect if that error is throw) [David Heinemeier Hansson]
-
-* Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) [Jonathan Viney]
-
-* Quit ignoring default :include options in has_many :through calls [Mark James]
-
-* Allow has_many :through associations to find the source association by setting a custom class (closes #4307) [Jonathan Viney]
-
-* Eager Loading support added for has_many :through => :has_many associations (see below).  [Rick Olson]
-
-* Allow has_many :through to work on has_many associations (closes #3864) [sco@scottraymond.net]  Example:
-
-    class Firm < ActiveRecord::Base
-      has_many :clients
-      has_many :invoices, :through => :clients
-    end
-
-    class Client < ActiveRecord::Base
-      belongs_to :firm
-      has_many   :invoices
-    end
-
-    class Invoice < ActiveRecord::Base
-      belongs_to :client
-    end
-
-* Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) [Josh Susser]
-
-* Fixed has_many :through to include :conditions set on the :through association. closes #4020 [Jonathan Viney]
-
-* Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) [andylien@gmail.com / Rick Olson]
-
-* SQL Server adapter gets some love #4298 [Ryan Tomayko]
-
-* Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 [derrickspell@cdmplus.com]
-
-* Rework table aliasing to account for truncated table aliases.  Add smarter table aliasing when doing eager loading of STI associations. This allows you to use the association name in the order/where clause. [Jonathan Viney / Rick Olson] #4108 Example (SpecialComment is using STI):
-
-    Author.find(:all, :include => { :posts => :special_comments }, :order => 'special_comments.body')
-
-* Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. [Rick Olson]
-
-* Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 [Michael Koziarski]
-
-* Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 [Michael Koziarski]
-
-* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom Ward]
-
-* Fixed that Migration#execute would have the table name prefix appended to its query #4110 [mark.imbriaco@pobox.com]
-
-* Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) [Jamis Buck]
-
-* Use association's :conditions when eager loading. [Jeremy Evans] #4144
-
-* Alias the has_and_belongs_to_many join table on eager includes. #4106 [Jeremy Evans]
-
-  This statement would normally error because the projects_developers table is joined twice, and therefore joined_on would be ambiguous.
-
-    Developer.find(:all, :include => {:projects => :developers}, :conditions => 'join_project_developers.joined_on IS NOT NULL')
-
-* Oracle adapter gets some love #4230 [Michael Schoen]
-
-    * Changes :text to CLOB rather than BLOB [Moses Hohman]
-    * Fixes an issue with nil numeric length/scales (several)
-    * Implements support for XMLTYPE columns [wilig / Kubo Takehiro]
-    * Tweaks a unit test to get it all green again
-    * Adds support for #current_database
-
-* Added Base.abstract_class? that marks which classes are not part of the Active Record hierarchy #3704 [Rick Olson]
-
-    class CachedModel < ActiveRecord::Base
-      self.abstract_class = true
-    end
-
-    class Post < CachedModel
-    end
-
-    CachedModel.abstract_class?
-    => true
-
-    Post.abstract_class?
-    => false
-
-    Post.base_class
-    => Post
-
-    Post.table_name
-    => 'posts'
-
-* Allow :dependent options to be used with polymorphic joins. #3820 [Rick Olson]
-
-    class Foo < ActiveRecord::Base
-      has_many :attachments, :as => :attachable, :dependent => :delete_all
-    end
-
-* Nicer error message on has_many :through when :through reflection can not be found. #4042 [court3nay]
-
-* Upgrade to Transaction::Simple 1.3 [Jamis Buck]
-
-* Catch FixtureClassNotFound when using instantiated fixtures on a fixture that has no ActiveRecord model [Rick Olson]
-
-* Allow ordering of calculated results and/or grouped fields in calculations [solo@gatelys.com]
-
-* Make ActiveRecord::Base#save! return true instead of nil on success.  #4173 [johan@johansorensen.com]
-
-* Dynamically set allow_concurrency.  #4044 [Stefan Kaes]
-
-* Added Base#to_xml that'll turn the current record into a XML representation [David Heinemeier Hansson]. Example:
-
-    topic.to_xml
-
-  ...returns:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <topic>
-      <title>The First Topic</title>
-      <author-name>David</author-name>
-      <id type="integer">1</id>
-      <approved type="boolean">false</approved>
-      <replies-count type="integer">0</replies-count>
-      <bonus-time type="datetime">2000-01-01 08:28:00</bonus-time>
-      <written-on type="datetime">2003-07-16 09:28:00</written-on>
-      <content>Have a nice day</content>
-      <author-email-address>david@loudthinking.com</author-email-address>
-      <parent-id></parent-id>
-      <last-read type="date">2004-04-15</last-read>
-    </topic>
-
-  ...and you can configure with:
-
-    topic.to_xml(:skip_instruct => true, :except => [ :id, bonus_time, :written_on, replies_count ])
-
-  ...that'll return:
-
-    <topic>
-      <title>The First Topic</title>
-      <author-name>David</author-name>
-      <approved type="boolean">false</approved>
-      <content>Have a nice day</content>
-      <author-email-address>david@loudthinking.com</author-email-address>
-      <parent-id></parent-id>
-      <last-read type="date">2004-04-15</last-read>
-    </topic>
-
-  You can even do load first-level associations as part of the document:
-
-    firm.to_xml :include => [ :account, :clients ]
-
-  ...that'll return something like:
-
-    <?xml version="1.0" encoding="UTF-8"?>
-    <firm>
-      <id type="integer">1</id>
-      <rating type="integer">1</rating>
-      <name>37signals</name>
-      <clients>
-        <client>
-          <rating type="integer">1</rating>
-          <name>Summit</name>
-        </client>
-        <client>
-          <rating type="integer">1</rating>
-          <name>Microsoft</name>
-        </client>
-      </clients>
-      <account>
-        <id type="integer">1</id>
-        <credit-limit type="integer">50</credit-limit>
-      </account>
-    </firm>
-
-* Allow :counter_cache to take a column name for custom counter cache columns [Jamis Buck]
-
-* Documentation fixes for :dependent [robby@planetargon.com]
-
-* Stop the MySQL adapter crashing when views are present. #3782 [Jonathan Viney]
-
-* Don't classify the belongs_to class, it is already singular #4117 [keithm@infused.org]
-
-* Allow set_fixture_class to take Classes instead of strings for a class in a module.  Raise FixtureClassNotFound if a fixture can't load.  [Rick Olson]
-
-* Fix quoting of inheritance column for STI eager loading #4098 [Jonathan Viney <jonathan@bluewire.net.nz>]
-
-* Added smarter table aliasing for eager associations for multiple self joins #3580 [Rick Olson]
-
-    * The first time a table is referenced in a join, no alias is used.
-    * After that, the parent class name and the reflection name are used.
-
-        Tree.find(:all, :include => :children) # LEFT OUTER JOIN trees AS tree_children ...
-
-    * Any additional join references get a numerical suffix like '_2', '_3', etc.
-
-* Fixed eager loading problems with single-table inheritance #3580 [Rick Olson]. Post.find(:all, :include => :special_comments) now returns all posts, and any special comments that the posts may have. And made STI work with has_many :through and polymorphic belongs_to.
-
-* Added cascading eager loading that allows for queries like Author.find(:all, :include=> { :posts=> :comments }), which will fetch all authors, their posts, and the comments belonging to those posts in a single query (using LEFT OUTER JOIN) #3913 [anna@wota.jp]. Examples:
-
-    # cascaded in two levels
-    >> Author.find(:all, :include=>{:posts=>:comments})
-    => authors
-         +- posts
-              +- comments
-
-    # cascaded in two levels and normal association
-    >> Author.find(:all, :include=>[{:posts=>:comments}, :categorizations])
-    => authors
-         +- posts
-              +- comments
-         +- categorizations
-
-    # cascaded in two levels with two has_many associations
-    >> Author.find(:all, :include=>{:posts=>[:comments, :categorizations]})
-    => authors
-         +- posts
-              +- comments
-              +- categorizations
-
-    # cascaded in three levels
-    >> Company.find(:all, :include=>{:groups=>{:members=>{:favorites}}})
-    => companies
-         +- groups
-              +- members
-                   +- favorites
-
-* Make counter cache work when replacing an association #3245 [eugenol@gmail.com]
-
-* Make migrations verbose [Jamis Buck]
-
-* Make counter_cache work with polymorphic belongs_to [Jamis Buck]
-
-* Fixed that calling HasOneProxy#build_model repeatedly would cause saving to happen #4058 [anna@wota.jp]
-
-* Added Sybase database adapter that relies on the Sybase Open Client bindings (see http://raa.ruby-lang.org/project/sybase-ctlib) #3765 [John Sheets]. It's almost completely Active Record compliant (including migrations), but has the following caveats:
-
-    * Does not support DATE SQL column types; use DATETIME instead.
-    * Date columns on HABTM join tables are returned as String, not Time.
-    * Insertions are potentially broken for :polymorphic join tables
-    * BLOB column access not yet fully supported
-
-* Clear stale, cached connections left behind by defunct threads. [Jeremy Kemper]
-
-* CHANGED DEFAULT: set ActiveRecord::Base.allow_concurrency to false.  Most AR usage is in single-threaded applications. [Jeremy Kemper]
-
-* Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 [Michael Schoen]
-
-* Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 [David Heinemeier Hansson]
-
-* Speed up class -> connection caching and stale connection verification.  #3979 [Stefan Kaes]
-
-* Add set_fixture_class to allow the use of table name accessors with models which use set_table_name. [Kevin Clark]
-
-* Added that fixtures to placed in subdirectories of the main fixture files are also loaded #3937 [dblack@wobblini.net]
-
-* Define attribute query methods to avoid method_missing calls. #3677 [Jonathan Viney]
-
-* ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 [Simon Stapleton, Tom Ward]
-
-* Added support for nested scopes #3407 [anna@wota.jp]. Examples:
-
-    Developer.with_scope(:find => { :conditions => "salary > 10000", :limit => 10 }) do
-      Developer.find(:all)     # => SELECT * FROM developers WHERE (salary > 10000) LIMIT 10
-
-      # inner rule is used. (all previous parameters are ignored)
-      Developer.with_exclusive_scope(:find => { :conditions => "name = 'Jamis'" }) do
-        Developer.find(:all)   # => SELECT * FROM developers WHERE (name = 'Jamis')
-      end
-
-      # parameters are merged
-      Developer.with_scope(:find => { :conditions => "name = 'Jamis'" }) do
-        Developer.find(:all)   # => SELECT * FROM developers WHERE (( salary > 10000 ) AND ( name = 'Jamis' )) LIMIT 10
-      end
-    end
-
-* Fixed db2 connection with empty user_name and auth options #3622 [phurley@gmail.com]
-
-* Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 [Masao Mutoh]
-
-* Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 [Lars Pind]
-
-* Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
-
-    Person.average :age
-    Person.minimum :age
-    Person.maximum :age
-    Person.sum :salary, :group => :last_name
-
-* Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 [Luke Redpath]
-
-* Reflections don't attempt to resolve module nesting of association classes. Simplify type computation. [Jeremy Kemper]
-
-* Improved the Oracle OCI Adapter with better performance for column reflection (from #3210), fixes to migrations (from #3476 and #3742), tweaks to unit tests (from #3610), and improved documentation (from #2446) #3879 [Aggregated by schoenm@earthlink.net]
-
-* Fixed that the schema_info table used by ActiveRecord::Schema.define should respect table pre- and suffixes #3834 [rubyonrails@atyp.de]
-
-* Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 [Stefan Kaes]
-
-* Correct syntax error in mysql DDL,  and make AAACreateTablesTest run first [Bob Silva]
-
-* Allow :include to be used with has_many :through associations #3611 [Michael Schoen]
-
-* PostgreSQL: smarter schema dumps using pk_and_sequence_for(table).  #2920 [Blair Zajac]
-
-* SQLServer: more compatible limit/offset emulation.  #3779 [Tom Ward]
-
-* Polymorphic join support for has_one associations (has_one :foo, :as => :bar)  #3785 [Rick Olson]
-
-* PostgreSQL: correctly parse negative integer column defaults.  #3776 [bellis@deepthought.org]
-
-* Fix problems with count when used with :include [Jeremy Hopple and Kevin Clark]
-
-* ActiveRecord::RecordInvalid now states which validations failed in its default error message [Tobias Lütke]
-
-* Using AssociationCollection#build with arrays of hashes should call build, not create [David Heinemeier Hansson]
-
-* Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. [Nicholas Seckar]
-
-* Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 [Maik Schmidt]
-
-* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [Shugo Maeda]
-
-* Add documentation for add_index and remove_index. #3600 [Manfred Stienstra <m.stienstra@fngtps.com>]
-
-* If the OCI library is not available, raise an exception indicating as much. #3593 [Michael Schoen]
-
-* Add explicit :order in finder tests as postgresql orders results differently by default. #3577. [Rick Olson]
-
-* Make dynamic finders honor additional passed in :conditions. #3569 [Oleg Pudeyev <pudeyo@rpi.edu>, Marcel Molina Jr.]
-
-* Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. [Nicholas Seckar]
-
-* Make .count work for has_many associations with multi line finder sql [Michael Schoen]
-
-* Add AR::Base.base_class for querying the ancestor AR::Base subclass [Jamis Buck]
-
-* Allow configuration of the column used for optimistic locking [wilsonb@gmail.com]
-
-* Don't hardcode 'id' in acts as list.  [ror@philippeapril.com]
-
-* Fix date errors for SQLServer in association tests. #3406 [Kevin Clark]
-
-* Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
-
-* Disambiguate table names for columns in validates_uniqueness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]
-
-* .with_scope imposed create parameters now bypass attr_protected [Tobias Lütke]
-
-* Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. [Marcel Molina Jr.]
-
-* Multiple enhancements and adjustments to DB2 adaptor. #3377 [contact@maik-schmidt.de]
-
-* Sanitize scoped conditions. [Marcel Molina Jr.]
-
-* Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) [David Heinemeier Hansson]
-
-* Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. [Tobias Lütke]
-
-* SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. [Tobias Lütke]
-
-* Fixed that saving a model with multiple habtm associations would only save the first one.  #3244 [yanowitz-rubyonrails@quantumfoam.org, Florian Weber]
-
-* Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 [wejn@box.cz, Rick Olson, Scott Barron]
-
-* removed :piggyback in favor of just allowing :select on :through associations. [Tobias Lütke]
-
-* made method missing delegation to class methods on relation target work on :through associations. [Tobias Lütke]
-
-* made .find() work on :through relations. [Tobias Lütke]
-
-* Fix typo in association docs. #3296. [Blair Zajac]
-
-* Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Lütke]
-
-*1.13.2* (December 13th, 2005)
-
-* Become part of Rails 1.0
-
-* MySQL: allow encoding option for mysql.rb driver.  [Jeremy Kemper]
-
-* Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]. Example:
-
-    class Post
-      has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
-    end
-
-    post.recent_comments.find(:all) # Uses LIMIT 10 and includes authors
-    post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
-    post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
-
-* Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]
-
-* MySQL: fixes for the bundled mysql.rb driver.  #3160 [Justin Forder]
-
-* SQLServer: fix obscure optimistic locking bug.  #3068 [kajism@yahoo.com]
-
-* SQLServer: support uniqueidentifier columns.  #2930 [keithm@infused.org]
-
-* SQLServer: cope with tables names qualified by owner.  #3067 [jeff@ministrycentered.com]
-
-* SQLServer: cope with columns with "desc" in the name.  #1950 [Ron Lusk, Ryan Tomayko]
-
-* SQLServer: cope with primary keys with "select" in the name.  #3057 [rdifrango@captechventures.com]
-
-* Oracle: active? performs a select instead of a commit.  #3133 [Michael Schoen]
-
-* MySQL: more robust test for nullified result hashes.  #3124 [Stefan Kaes]
-
-* Reloading an instance refreshes its aggregations as well as its associations.  #3024 [François Beausoleil]
-
-* Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
-
-* PostgreSQL: more robust sequence name discovery.  #3087 [Rick Olson]
-
-* Oracle: use syntax compatible with Oracle 8.  #3131 [Michael Schoen]
-
-* MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat.  Eliminate usage of mysql.ping because it doesn't guarantee reconnect.  Explicitly close and reopen the connection instead.  [Jeremy Kemper]
-
-* Added preliminary support for polymorphic associations [David Heinemeier Hansson]
-
-* Added preliminary support for join models [David Heinemeier Hansson]
-
-* Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. [jeremy@jthopple.com, Marcel Molina Jr.]
-
-* Firebird: active? and reconnect! methods for handling stale connections.  #428 [Ken Kunz <kennethkunz@gmail.com>]
-
-* Firebird: updated for FireRuby 0.4.0.  #3009 [Ken Kunz <kennethkunz@gmail.com>]
-
-* MySQL and PostgreSQL: active? compatibility with the pure-Ruby driver.  #428 [Jeremy Kemper]
-
-* Oracle: active? check pings the database rather than testing the last command status.  #428 [Michael Schoen]
-
-* SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find.  #2974 [kajism@yahoo.com]
-
-* Reloading a model doesn't lose track of its connection.  #2996 [junk@miriamtech.com, Jeremy Kemper]
-
-* Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 [colman@rominato.com, Florian Weber, Michael Schoen]
-
-* MySQL, PostgreSQL: reconnect! also reconfigures the connection.  Otherwise, the connection 'loses' its settings if it times out and is reconnected.  #2978 [Shugo Maeda]
-
-* has_and_belongs_to_many: use JOIN instead of LEFT JOIN.  [Jeremy Kemper]
-
-* MySQL: introduce :encoding option to specify the character set for client, connection, and results.  Only available for MySQL 4.1 and later with the mysql-ruby driver.  Do SHOW CHARACTER SET in mysql client to see available encodings.  #2975 [Shugo Maeda]
-
-* Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. [Marcel Molina Jr.]
-
-* Correct boolean handling in generated reader methods.  #2945 [Don Park, Stefan Kaes]
-
-* Don't generate read methods for columns whose names are not valid ruby method names.  #2946 [Stefan Kaes]
-
-* Document :force option to create_table.  #2921 [Blair Zajac <blair@orcaware.com>]
-
-* Don't add the same conditions twice in has_one finder sql.  #2916 [Jeremy Evans]
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-* Introducing the Firebird adapter.  Quote columns and use attribute_condition more consistently.  Setup guide: http://wiki.rubyonrails.com/rails/pages/Firebird+Adapter  #1874 [Ken Kunz <kennethkunz@gmail.com>]
-
-* SQLServer: active? and reconnect! methods for handling stale connections.  #428 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]
-
-* Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array.  #1345 [MarkusQ@reality.com]
-
-* SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  #2866 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]
-
-* Oracle: active? and reconnect! methods for handling stale connections.  Optionally retry queries after reconnect.  #428 [Michael Schoen <schoenm@earthlink.net>]
-
-* Correct documentation for Base.delete_all.  #1568 [Newhydra]
-
-* Oracle: test case for column default parsing.  #2788 [Michael Schoen <schoenm@earthlink.net>]
-
-* Update documentation for Migrations.  #2861 [Tom Werner <tom@cube6media.com>]
-
-* When AbstractAdapter#log rescues an exception, attempt to detect and reconnect to an inactive database connection.  Connection adapter must respond to the active? and reconnect! instance methods.  Initial support for PostgreSQL, MySQL, and SQLite.  Make certain that all statements which may need reconnection are performed within a logged block: for example, this means no avoiding log(sql, name) { } if @logger.nil?  #428 [Jeremy Kemper]
-
-* Oracle: Much faster column reflection.  #2848 [Michael Schoen <schoenm@earthlink.net>]
-
-* Base.reset_sequence_name analogous to reset_table_name (mostly useful for testing).  Base.define_attr_method allows nil values.  [Jeremy Kemper]
-
-* PostgreSQL: smarter sequence name defaults, stricter last_insert_id, warn on pk without sequence.  [Jeremy Kemper]
-
-* PostgreSQL: correctly discover custom primary key sequences.  #2594 [Blair Zajac <blair@orcaware.com>, meadow.nnick@gmail.com, Jeremy Kemper]
-
-* SQLServer: don't report limits for unsupported field types.  #2835 [Ryan Tomayko]
-
-* Include the Enumerable module in ActiveRecord::Errors.  [Rick Bradley <rick@rickbradley.com>]
-
-* Add :group option, correspond to GROUP BY, to the find method and to the has_many association.  #2818 [rubyonrails@atyp.de]
-
-* Don't cast nil or empty strings to a dummy date.  #2789 [Rick Bradley <rick@rickbradley.com>]
-
-* acts_as_list plays nicely with inheritance by remembering the class which declared it.  #2811 [rephorm@rephorm.com]
-
-* Fix sqlite adaptor's detection of missing dbfile or database declaration. [Nicholas Seckar]
-
-* Fixed acts_as_list for definitions without an explicit :order #2803 [Jonathan Viney]
-
-* Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support.  Local change [301] is now a part of the main driver; reapplied local change [2182].  Removed GC.start from Result.free.  [tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper]
-
-* Correct handling of complex order clauses with SQL Server limit emulation.  #2770 [Tom Ward <tom@popdog.net>, Matt B.]
-
-* Correct whitespace problem in Oracle default column value parsing.  #2788 [rick@rickbradley.com]
-
-* Destroy associated has_and_belongs_to_many records after all before_destroy callbacks but before destroy.  This allows you to act on the habtm association as you please while preserving referential integrity.  #2065 [larrywilliams1@gmail.com, sam.kirchmeier@gmail.com, elliot@townx.org, Jeremy Kemper]
-
-* Deprecate the old, confusing :exclusively_dependent option in favor of :dependent => :delete_all.  [Jeremy Kemper]
-
-* More compatible Oracle column reflection.  #2771 [Ryan Davis <ryand-ruby@zenspider.com>, Michael Schoen <schoenm@earthlink.net>]
-
-
-*1.13.0* (November 7th, 2005)
-
-* Fixed faulty regex in get_table_name method (SQLServerAdapter) #2639 [Ryan Tomayko]
-
-* Added :include as an option for association declarations [David Heinemeier Hansson]. Example:
-
-    has_many :posts, :include => [ :author, :comments ]
-
-* Rename Base.constrain to Base.with_scope so it doesn't conflict with existing concept of database constraints.  Make scoping more robust: uniform method => parameters, validated method names and supported finder parameters, raise exception on nested scopes.  [Jeremy Kemper]  Example:
-
-    Comment.with_scope(:find => { :conditions => 'active=true' }, :create => { :post_id => 5 }) do
-      # Find where name = ? and active=true
-      Comment.find :all, :conditions => ['name = ?', name]
-      # Create comment associated with :post_id
-      Comment.create :body => "Hello world"
-    end
-
-* Fixed that SQL Server should ignore :size declarations on anything but integer and string in the agnostic schema representation #2756 [Ryan Tomayko]
-
-* Added constrain scoping for creates using a hash of attributes bound to the :creation key [David Heinemeier Hansson]. Example:
-
-    Comment.constrain(:creation => { :post_id => 5 }) do
-      # Associated with :post_id
-      Comment.create :body => "Hello world"
-    end
-
-  This is rarely used directly, but allows for find_or_create on associations. So you can do:
-
-    # If the tag doesn't exist, a new one is created that's associated with the person
-    person.tags.find_or_create_by_name("Summer")
-
-* Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [David Heinemeier Hansson]. Example:
-
-    # No 'Summer' tag exists
-    Tag.find_or_create_by_name("Summer") # equal to Tag.create(:name => "Summer")
-
-    # Now the 'Summer' tag does exist
-    Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
-
-* Added extension capabilities to has_many and has_and_belongs_to_many proxies [David Heinemeier Hansson]. Example:
-
-    class Account < ActiveRecord::Base
-      has_many :people do
-        def find_or_create_by_name(name)
-          first_name, *last_name = name.split
-          last_name = last_name.join " "
-
-          find_or_create_by_first_name_and_last_name(first_name, last_name)
-        end
-      end
-    end
-
-    person = Account.find(:first).people.find_or_create_by_name("David Heinemeier Hansson")
-    person.first_name # => "David"
-    person.last_name  # => "Heinemeier Hansson"
-
-  Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
-
-* Omit internal dtproperties table from SQLServer table list.  #2729 [Ryan Tomayko]
-
-* Quote column names in generated SQL.  #2728 [Ryan Tomayko]
-
-* Correct the pure-Ruby MySQL 4.1.1 shim's version test.  #2718 [Jeremy Kemper]
-
-* Add Model.create! to match existing model.save! method.  When save! raises RecordInvalid, you can catch the exception, retrieve the invalid record (invalid_exception.record), and see its errors (invalid_exception.record.errors).  [Jeremy Kemper]
-
-* Correct fixture behavior when table name pluralization is off.  #2719 [Rick Bradley <rick@rickbradley.com>]
-
-* Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) #2644 [Dan Peterson]
-
-* Added migration support for Oracle #2647 [Michael Schoen]
-
-* Worked around that connection can't be reset if allow_concurrency is off.  #2648 [Michael Schoen <schoenm@earthlink.net>]
-
-* Fixed SQL Server adapter to pass even more tests and do even better #2634 [Ryan Tomayko]
-
-* Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 [Tom Ward]
-
-* Added migration support to SQL Server adapter (please someone do the same for Oracle and DB2) #2625 [Tom Ward]
-
-* Use AR::Base.silence rather than AR::Base.logger.silence in fixtures to preserve Log4r compatibility.  #2618 [dansketcher@gmail.com]
-
-* Constraints are cloned so they can't be inadvertently modified while they're
-in effect.  Added :readonly finder constraint.  Calling an association collection's class method (Part.foobar via item.parts.foobar) constrains :readonly => false since the collection's :joins constraint would otherwise force it to true.  [Jeremy Kemper <rails@bitsweat.net>]
-
-* Added :offset and :limit to the kinds of options that Base.constrain can use #2466 [duane.johnson@gmail.com]
-
-* Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 [Michael Schoen]
-
-* Added quoted_true and quoted_false methods and tables to db2_adapter and cleaned up tests for DB2 #2493, #2624 [maik schmidt]
-
-
-*1.12.2* (October 26th, 2005)
-
-* Allow symbols to rename columns when using SQLite adapter. #2531 [Kevin Clark]
-
-* Map Active Record time to SQL TIME.  #2575, #2576 [Robby Russell <robby@planetargon.com>]
-
-* Clarify semantics of ActiveRecord::Base#respond_to?  #2560 [Stefan Kaes]
-
-* Fixed Association#clear for associations which have not yet been accessed. #2524 [Patrick Lenz <patrick@lenz.sh>]
-
-* HABTM finders shouldn't return readonly records.  #2525 [Patrick Lenz <patrick@lenz.sh>]
-
-* Make all tests runnable on their own. #2521. [Blair Zajac <blair@orcaware.com>]
-
-
-*1.12.1* (October 19th, 2005)
-
-* Always parenthesize :conditions options so they may be safely combined with STI and constraints.
-
-* Correct PostgreSQL primary key sequence detection.  #2507 [tmornini@infomania.com]
-
-* Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
-
-
-*1.12.0* (October 16th, 2005)
-
-* Update/clean up documentation (rdoc)
-
-* PostgreSQL sequence support.  Use set_sequence_name in your model class to specify its primary key sequence.  #2292 [Rick Olson <technoweenie@gmail.com>, Robby Russell <robby@planetargon.com>]
-
-* Change default logging colors to work on both white and black backgrounds. [Sam Stephenson]
-
-* YAML fixtures support ordered hashes for fixtures with foreign key dependencies in the same table.  #1896 [purestorm@ggnore.net]
-
-* :dependent now accepts :nullify option. Sets the foreign key of the related objects to NULL instead of deleting them. #2015 [Robby Russell <robby@planetargon.com>]
-
-* Introduce read-only records.  If you call object.readonly! then it will mark the object as read-only and raise ReadOnlyRecord if you call object.save.  object.readonly? reports whether the object is read-only.  Passing :readonly => true to any finder method will mark returned records as read-only.  The :joins option now implies :readonly, so if you use this option, saving the same record will now fail.  Use find_by_sql to work around.
-
-* Avoid memleak in dev mode when using fcgi
-
-* Simplified .clear on active record associations by using the existing delete_records method. #1906 [Caleb <me@cpb.ca>]
-
-* Delegate access to a customized primary key to the conventional id method. #2444. [Blair Zajac <blair@orcaware.com>]
-
-* Fix errors caused by assigning a has-one or belongs-to property to itself
-
-* Add ActiveRecord::Base.schema_format setting which specifies how databases should be dumped [Sam Stephenson]
-
-* Update DB2 adapter. #2206. [contact@maik-schmidt.de]
-
-* Corrections to SQLServer native data types. #2267.  [rails.20.clarry@spamgourmet.com]
-
-* Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency.
-
-* Protect id attribute from mass assigment even when the primary key is set to something else. #2438. [Blair Zajac <blair@orcaware.com>]
-
-* Misc doc fixes (typos/grammar/etc.). #2430. [coffee2code]
-
-* Add test coverage for content_columns. #2432. [coffee2code]
-
-* Speed up for unthreaded environments. #2431. [Stefan Kaes]
-
-* Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. [Stefan Kaes]
-
-* Speed up the setting of table_name. #2428. [Stefan Kaes]
-
-* Optimize instantiation of STI subclass records. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Fix typo of 'constrains' to 'contraints'. #2069. [Michael Schuerig <michael@schuerig.de>]
-
-* Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. [Michael Schuerig <michael@schuerig.de>]
-
-* Add geometric type for postgresql adapter. #2233 [Andrew Kaspick]
-
-* Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Add convenience predicate methods on Column class. In partial fullfilment of #1236. [Stefan Kaes]
-
-* Raise errors when invalid hash keys are passed to ActiveRecord::Base.find. #2363  [Chad Fowler <chad@chadfowler.com>, Nicholas Seckar]
-
-* Added :force option to create_table that'll try to drop the table if it already exists before creating
-
-* Fix transactions so that calling return while inside a transaction will not leave an open transaction on the connection. [Nicholas Seckar]
-
-* Use foreign_key inflection uniformly.  #2156 [Blair Zajac <blair@orcaware.com>]
-
-* model.association.clear should destroy associated objects if :dependent => true instead of nullifying their foreign keys.  #2221 [joergd@pobox.com, ObieFernandez <obiefernandez@gmail.com>]
-
-* Returning false from before_destroy should cancel the action.  #1829 [Jeremy Huffman]
-
-* Recognize PostgreSQL NOW() default as equivalent to CURRENT_TIMESTAMP or CURRENT_DATE, depending on the column's type.  #2256 [mat <mat@absolight.fr>]
-
-* Extensive documentation for the abstract database adapter.  #2250 [François Beausoleil <fbeausoleil@ftml.net>]
-
-* Clean up Fixtures.reset_sequences for PostgreSQL.  Handle tables with no rows and models with custom primary keys.  #2174, #2183 [jay@jay.fm, Blair Zajac <blair@orcaware.com>]
-
-* Improve error message when nil is assigned to an attr which validates_size_of within a range.  #2022 [Manuel Holtgrewe <purestorm@ggnore.net>]
-
-* Make update_attribute use the same writer method that update_attributes uses.
- #2237 [trevor@protocool.com]
-
-* Make migrations honor table name prefixes and suffixes. #2298 [Jakob Skjerning, Marcel Molina Jr.]
-
-* Correct and optimize PostgreSQL bytea escaping.  #1745, #1837 [dave@cherryville.org, ken@miriamtech.com, bellis@deepthought.org]
-
-* Fixtures should only reset a PostgreSQL sequence if it corresponds to an integer primary key named id.  #1749 [chris@chrisbrinker.com]
-
-* Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior)
-
-* Added new symbol-driven approach to activating observers with Base#observers= [David Heinemeier Hansson]. Example:
-
-    ActiveRecord::Base.observers = :cacher, :garbage_collector
-
-* Added AbstractAdapter#select_value and AbstractAdapter#select_values as convenience methods for selecting single values, instead of hashes, of the first column in a SELECT #2283 [solo@gatelys.com]
-
-* Wrap :conditions in parentheses to prevent problems with OR's #1871 [Jamis Buck]
-
-* Allow the postgresql adapter to work with the SchemaDumper. [Jamis Buck]
-
-* Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases. [Jamis Buck]
-
-* Fixed migrations for Windows when using more than 10 [David Naseby]
-
-* Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 [Florian Weber]
-
-* Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 [Tobias Lütke]
-
-* Improved migrations' behavior when the schema_info table is empty. [Nicholas Seckar]
-
-* Fixed that Observers didn't observe sub-classes #627 [Florian Weber]
-
-* Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 [Marcel Molina Jr.]
-
-* Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 [skae]
-
-* Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 [Florian Weber]
-
-* Added better exception error when unknown column types are used with migrations #1814 [François Beausoleil]
-
-* Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 [kajism@yahoo.com]
-
-* Fixed comparison of Active Record objects so two new objects are not equal #2099 [deberg]
-
-* Fixed that the SQL Server adapter would sometimes return DBI::Timestamp objects instead of Time #2127 [Tom Ward]
-
-* Added the instance methods #root and #ancestors on acts_as_tree and fixed siblings to not include the current node #2142, #2140 [coffee2code]
-
-* Fixed that Active Record would call SHOW FIELDS twice (or more) for the same model when the cached results were available #1947 [sd@notso.net]
-
-* Added log_level and use_silence parameter to ActiveRecord::Base.benchmark. The first controls at what level the benchmark statement will be logged (now as debug, instead of info) and the second that can be passed false to include all logging statements during the benchmark block/
-
-* Make sure the schema_info table is created before querying the current version #1903
-
-* Fixtures ignore table name prefix and suffix #1987 [Jakob Skjerning]
-
-* Add documentation for index_type argument to add_index method for migrations #2005 [Blaine]
-
-* Modify read_attribute to allow a symbol argument #2024 [Ken Kunz]
-
-* Make destroy return self #1913 [Sebastian Kanthak]
-
-* Fix typo in validations documentation #1938 [court3nay]
-
-* Make acts_as_list work for insert_at(1) #1966 [hensleyl@papermountain.org]
-
-* Fix typo in count_by_sql documentation #1969 [Alexey Verkhovsky]
-
-* Allow add_column and create_table to specify NOT NULL #1712 [emptysands@gmail.com]
-
-* Fix create_table so that id column is implicitly added [Rick Olson]
-
-* Default sequence names for Oracle changed to #{table_name}_seq, which is the most commonly used standard. In addition, a new method ActiveRecord::Base#set_sequence_name allows the developer to set the sequence name per model. This is a non-backwards-compatible change -- anyone using the old-style "rails_sequence" will need to either create new sequences, or set: ActiveRecord::Base.set_sequence_name = "rails_sequence" #1798
-
-* OCIAdapter now properly handles synonyms, which are commonly used to separate out the schema owner from the application user #1798
-
-* Fixed the handling of camelCase columns names in Oracle #1798
-
-* Implemented for OCI the Rakefile tasks of :clone_structure_to_test, :db_structure_dump, and :purge_test_database, which enable Oracle folks to enjoy all the agile goodness of Rails for testing. Note that the current implementation is fairly limited -- only tables and sequences are cloned, not constraints or indexes. A full clone in Oracle generally requires some manual effort, and is version-specific. Post 9i, Oracle recommends the use of the DBMS_METADATA package, though that approach requires editing of the physical characteristics generated #1798
-
-* Fixed the handling of multiple blob columns in Oracle if one or more of them are null #1798
-
-* Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 [Tobias Lütke]
-
-    class Comment < AR:B
-      def self.search(q)
-        find(:all, :conditions => ["body = ?", q])
-      end
-    end
-
-    class Post < AR:B
-      has_many :comments
-    end
-
-    Post.find(1).comments.search('hi') # => SELECT * from comments WHERE post_id = 1 AND body = 'hi'
-
-  NOTICE: This patch changes the underlying SQL generated by has_and_belongs_to_many queries. If your relying on that, such as
-  by explicitly referencing the old t and j aliases, you'll need to update your code. Of course, you _shouldn't_ be relying on
-  details like that no less than you should be diving in to touch private variables. But just in case you do, consider yourself
-  noticed :)
-
-* Added migration support for SQLite (using temporary tables to simulate ALTER TABLE) #1771 [Sam Stephenson]
-
-* Remove extra definition of supports_migrations? from abstract_adaptor.rb [Nicholas Seckar]
-
-* Fix acts_as_list so that moving next-to-last item to the bottom does not result in duplicate item positions
-
-* Fixed incompatibility in DB2 adapter with the new limit/offset approach #1718 [Maik Schmidt]
-
-* Added :select option to find which can specify a different value than the default *, like find(:all, :select => "first_name, last_name"), if you either only want to select part of the columns or exclude columns otherwise included from a join #1338 [Stefan Kaes]
-
-
-*1.11.1* (11 July, 2005)
-
-* Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 [Rick Olson]
-
-* Fixed that assume_bottom_position (in acts_as_list) could be called on items already last in the list and they would move one position away from the list #1648 [tyler@kianta.com]
-
-* Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 [Sam Stephenson]
-
-* Correct reflected table name for singular associations.  #1688 [court3nay]
-
-* Fixed optimistic locking with SQL Server #1660 [tom@popdog.net]
-
-* Added ActiveRecord::Migrator.migrate that can figure out whether to go up or down based on the target version and the current
-
-* Added better error message for "packets out of order" #1630 [court3nay]
-
-* Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
-
-
-*1.11.0* (6 July, 2005)
-
-* Fixed that Yaml error message in fixtures hid the real error #1623 [Nicholas Seckar]
-
-* Changed logging of SQL statements to use the DEBUG level instead of INFO
-
-* Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Lütke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
-
-* Added callback hooks to association collections #1549 [Florian Weber]. Example:
-
-    class Project
-      has_and_belongs_to_many :developers, :before_add => :evaluate_velocity
-
-      def evaluate_velocity(developer)
-        ...
-      end
-    end
-
-  ..raising an exception will cause the object not to be added (or removed, with before_remove).
-
-
-* Fixed Base.content_columns call for SQL Server adapter #1450 [DeLynn Berry]
-
-* Fixed Base#write_attribute to work with both symbols and strings #1190 [Paul Legato]
-
-* Fixed that has_and_belongs_to_many didn't respect single table inheritance types #1081 [Florian Weber]
-
-* Speed up ActiveRecord#method_missing for the common case (read_attribute).
-
-* Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 [Stefan Kaes]
-
-* Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 [Chris McGrath]
-
-* Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 [raidel@onemail.at]
-
-* Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 [Michael Schuerig]
-
-* Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 [DeLynn Berry]
-
-* Added support for ODBC connections to MS SQL Server so you can connect from a non-Windows machine #1569 [Mark Imbriaco/DeLynn Berry]
-
-* Fixed that multiparameter posts ignored attr_protected #1532 [alec+rails@veryclever.net]
-
-* Fixed problem with eager loading when using a has_and_belongs_to_many association using :association_foreign_key #1504 [flash@vanklinkenbergsoftware.nl]
-
-* Fixed Base#find to honor the documentation on how :joins work and make them consistent with Base#count #1405 [pritchie@gmail.com]. What used to be:
-
-    Developer.find :all, :joins => 'developers_projects', :conditions => 'id=developer_id AND project_id=1'
-
-  ...should instead be:
-
-    Developer.find(
-      :all,
-      :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
-      :conditions => 'project_id=1'
-    )
-
-* Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 [Marcel Molina Jr.]
-
-* Fixed that clear_association_cache doesn't delete new associations on new records (so you can safely place new records in the session with Action Pack without having new associations wiped) #1494 [cluon]
-
-* Fixed that calling Model.find([]) returns [] and doesn't throw an exception #1379
-
-* Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 [Alisdair McDiarmid]
-
-* Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
-
-* Allow any Enumerable, not just Array, to work as bind variables #1344 [Jeremy Kemper]
-
-* Added actual database-changing behavior to collection assigment for has_many and has_and_belongs_to_many #1425 [Sebastian Kanthak].
-  Example:
-
-    david.projects = [Project.find(1), Project.new("name" => "ActionWebSearch")]
-    david.save
-
-  If david.projects already contain the project with ID 1, this is left unchanged. Any other projects are dropped. And the new
-  project is saved when david.save is called.
-
-  Also included is a way to do assignments through IDs, which is perfect for checkbox updating, so you get to do:
-
-    david.project_ids = [1, 5, 7]
-
-* Corrected typo in find SQL for has_and_belongs_to_many.  #1312 [ben@bensinclair.com]
-
-* Fixed sanitized conditions for has_many finder method.  #1281 [jackc@hylesanderson.com, pragdave, Tobias Lütke]
-
-* Comprehensive PostgreSQL schema support.  Use the optional schema_search_path directive in database.yml to give a comma-separated list of schemas to search for your tables.  This allows you, for example, to have tables in a shared schema without having to use a custom table name.  See http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html to learn more.  #827 [dave@cherryville.org]
-
-* Corrected @@configurations typo #1410 [david@ruppconsulting.com]
-
-* Return PostgreSQL columns in the order they were declared #1374 [perlguy@gmail.com]
-
-* Allow before/after update hooks to work on models using optimistic locking
-
-* Eager loading of dependent has_one associations won't delete the association #1212
-
-* Added a second parameter to the build and create method for has_one that controls whether the existing association should be replaced (which means nullifying its foreign key as well). By default this is true, but false can be passed to prevent it.
-
-* Using transactional fixtures now causes the data to be loaded only once.
-
-* Added fixture accessor methods that can be used when instantiated fixtures are disabled.
-
-    fixtures :web_sites
-
-    def test_something
-      assert_equal "Ruby on Rails", web_sites(:rubyonrails).name
-    end
-
-* Added DoubleRenderError exception that'll be raised if render* is called twice #518 [Nicholas Seckar]
-
-* Fixed exceptions occuring after render has been called #1096 [Nicholas Seckar]
-
-* CHANGED: validates_presence_of now uses Errors#add_on_blank, which will make "  " fail the validation where it didn't before #1309
-
-* Added Errors#add_on_blank which works like Errors#add_on_empty, but uses Object#blank? instead
-
-* Added the :if option to all validations that can either use a block or a method pointer to determine whether the validation should be run or not. #1324 [Duane Johnson/jhosteny]. Examples:
-
-  Conditional validations such as the following are made possible:
-    validates_numericality_of :income, :if => :employed?
-
-  Conditional validations can also solve the salted login generator problem:
-    validates_confirmation_of :password, :if => :new_password?
-
-  Using blocks:
-    validates_presence_of :username, :if => Proc.new { |user| user.signup_step > 1 }
-
-* Fixed use of construct_finder_sql when using :join #1288 [dwlt@dwlt.net]
-
-* Fixed that :delete_sql in has_and_belongs_to_many associations couldn't access record properties #1299 [Rick Olson]
-
-* Fixed that clone would break when an aggregate had the same name as one of its attributes #1307 [Jeremy Kemper]
-
-* Changed that destroying an object will only freeze the attributes hash, which keeps the object from having attributes changed (as that wouldn't make sense), but allows for the querying of associations after it has been destroyed.
-
-* Changed the callbacks such that observers are notified before the in-object callbacks are triggered. Without this change, it wasn't possible to act on the whole object in something like a before_destroy observer without having the objects own callbacks (like deleting associations) called first.
-
-* Added option for passing an array to the find_all version of the dynamic finders and have it evaluated as an IN fragment. Example:
-
-    # SELECT * FROM topics WHERE title IN ('First', 'Second')
-    Topic.find_all_by_title(["First", "Second"])
-
-* Added compatibility with camelCase column names for dynamic finders #533 [Dee Zsombor]
-
-* Fixed extraneous comma in count() function that made it not work with joins #1156 [Jarkko Laine/Dee Zsombor]
-
-* Fixed incompatibility with Base#find with an array of ids that would fail when using eager loading #1186 [Alisdair McDiarmid]
-
-* Fixed that validate_length_of lost :on option when :within was specified #1195 [jhosteny@mac.com]
-
-* Added encoding and min_messages options for PostgreSQL #1205 [Shugo Maeda]. Configuration example:
-
-    development:
-      adapter: postgresql
-      database: rails_development
-      host: localhost
-      username: postgres
-      password:
-      encoding: UTF8
-      min_messages: ERROR
-
-* Fixed acts_as_list where deleting an item that was removed from the list would ruin the positioning of other list items #1197 [Jamis Buck]
-
-* Added validates_exclusion_of as a negative of validates_inclusion_of
-
-* Optimized counting of has_many associations by setting the association to empty if the count is 0 so repeated calls doesn't trigger database calls
-
-
-*1.10.1* (20th April, 2005)
-
-* Fixed frivilous database queries being triggered with eager loading on empty associations and other things
-
-* Fixed order of loading in eager associations
-
-* Fixed stray comma when using eager loading and ordering together from has_many associations #1143
-
-
-*1.10.0* (19th April, 2005)
-
-* Added eager loading of associations as a way to solve the N+1 problem more gracefully without piggy-back queries. Example:
-
-    for post in Post.find(:all, :limit => 100)
-      puts "Post:            " + post.title
-      puts "Written by:      " + post.author.name
-      puts "Last comment on: " + post.comments.first.created_on
-    end
-
-  This used to generate 301 database queries if all 100 posts had both author and comments. It can now be written as:
-
-    for post in Post.find(:all, :limit => 100, :include => [ :author, :comments ])
-
-  ...and the number of database queries needed is now 1.
-
-* Added new unified Base.find API and deprecated the use of find_first and find_all. See the documentation for Base.find. Examples:
-
-    Person.find(1, :conditions => "administrator = 1", :order => "created_on DESC")
-    Person.find(1, 5, 6, :conditions => "administrator = 1", :order => "created_on DESC")
-    Person.find(:first, :order => "created_on DESC", :offset => 5)
-    Person.find(:all, :conditions => [ "category IN (?)", categories], :limit => 50)
-    Person.find(:all, :offset => 10, :limit => 10)
-
-* Added acts_as_nested_set #1000 [wschenk]. Introduction:
-
-    This acts provides Nested Set functionality.  Nested Set is similiar to Tree, but with
-    the added feature that you can select the children and all of it's descendants with
-    a single query.  A good use case for this is a threaded post system, where you want
-    to display every reply to a comment without multiple selects.
-
-* Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid [Dave Thomas]
-
-* Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 [gnuman1@gmail.com]
-
-* Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 [andrew.john.peters@gmail.com]
-
-* Fixed loading of fixtures in to be in the right order (or PostgreSQL would bark) #1047 [stephenh@chase3000.com]
-
-* Fixed page caching for non-vhost applications living underneath the root #1004 [Ben Schumacher]
-
-* Fixes a problem with the SQL Adapter which was resulting in IDENTITY_INSERT not being set to ON when it should be #1104 [adelle]
-
-* Added the option to specify the acceptance string in validates_acceptance_of #1106 [caleb@aei-tech.com]
-
-* Added insert_at(position) to acts_as_list #1083 [DeLynnB]
-
-* Removed the default order by id on has_and_belongs_to_many queries as it could kill performance on large sets (you can still specify by hand with :order)
-
-* Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 [yon@milliped.com]
-
-* Fixed boolean saving on Oracle #1093 [mparrish@pearware.org]
-
-* Moved build_association and create_association for has_one and belongs_to out of deprecation as they work when the association is nil unlike association.build and association.create, which require the association to be already in place #864
-
-* Added rollbacks of transactions if they're active as the dispatcher is killed gracefully (TERM signal) #1054 [Leon Bredt]
-
-* Added quoting of column names for fixtures #997 [jcfischer@gmail.com]
-
-* Fixed counter_sql when no records exist in database for PostgreSQL (would give error, not 0) #1039 [Caleb Tennis]
-
-* Fixed that benchmarking times for rendering included db runtimes #987 [Stefan Kaes]
-
-* Fixed boolean queries for t/f fields in PostgreSQL #995 [dave@cherryville.org]
-
-* Added that model.items.delete(child) will delete the child, not just set the foreign key to nil, if the child is dependent on the model #978 [Jeremy Kemper]
-
-* Fixed auto-stamping of dates (created_on/updated_on) for PostgreSQL #985 [dave@cherryville.org]
-
-* Fixed Base.silence/benchmark to only log if a logger has been configured #986 [Stefan Kaes]
-
-* Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 [Stefan Kaes]
-
-* Fixed bug in Base#hash method that would treat records with the same string-based id as different [Dave Thomas]
-
-* Renamed DateHelper#distance_of_time_in_words_to_now to DateHelper#time_ago_in_words (old method name is still available as a deprecated alias)
-
-
-*1.9.1* (27th March, 2005)
-
-* Fixed that Active Record objects with float attribute could not be cloned #808
-
-* Fixed that MissingSourceFile's wasn't properly detected in production mode #925 [Nicholas Seckar]
-
-* Fixed that :counter_cache option would look for a line_items_count column for a LineItem object instead of lineitems_count
-
-* Fixed that AR exists?() would explode on postgresql if the passed id did not match the PK type #900 [Scott Barron]
-
-* Fixed the MS SQL adapter to work with the new limit/offset approach and with binary data (still suffering from 7KB limit, though) #901 [delynnb]
-
-
-*1.9.0* (22th March, 2005)
-
-* Added adapter independent limit clause as a two-element array with the first being the limit, the second being the offset #795 [Sam Stephenson]. Example:
-
-    Developer.find_all nil, 'id ASC', 5      # return the first five developers
-    Developer.find_all nil, 'id ASC', [3, 8] # return three developers, starting from #8 and forward
-
-  This doesn't yet work with the DB2 or MS SQL adapters. Patches to make that happen are encouraged.
-
-* Added alias_method :to_param, :id to Base, such that Active Record objects to be used as URL parameters in Action Pack automatically #812 [Nicholas Seckar/Sam Stephenson]
-
-* Improved the performance of the OCI8 adapter for Oracle #723 [pilx/gjenkins]
-
-* Added type conversion before saving a record, so string-based values like "10.0" aren't left for the database to convert #820 [dave@cherryville.org]
-
-* Added with additional settings for working with transactional fixtures and pre-loaded test databases #865 [mindel]
-
-* Fixed acts_as_list to trigger remove_from_list on destroy after the fact, not before, so a unique position can be maintained #871 [Alisdair McDiarmid]
-
-* Added the possibility of specifying fixtures in multiple calls #816 [kim@tinker.com]
-
-* Added Base.exists?(id) that'll return true if an object of the class with the given id exists #854 [stian@grytoyr.net]
-
-* Added optionally allow for nil or empty strings with validates_numericality_of #801 [Sebastian Kanthak]
-
-* Fixed problem with using slashes in validates_format_of regular expressions #801 [Sebastian Kanthak]
-
-* Fixed that SQLite3 exceptions are caught and reported properly #823 [yerejm]
-
-* Added that all types of after_find/after_initialized callbacks are triggered if the explicit implementation is present, not only the explicit implementation itself
-
-* Fixed that symbols can be used on attribute assignment, like page.emails.create(:subject => data.subject, :body => data.body)
-
-
-*1.8.0* (7th March, 2005)
-
-* Added ActiveRecord::Base.colorize_logging to control whether to use colors in logs or not (on by default)
-
-* Added support for timestamp with time zone in PostgreSQL #560 [Scott Barron]
-
-* Added MultiparameterAssignmentErrors and AttributeAssignmentError exceptions #777 [demetrius]. Documentation:
-
-   * +MultiparameterAssignmentErrors+ -- collection of errors that occurred during a mass assignment using the
-     +attributes=+ method. The +errors+ property of this exception contains an array of +AttributeAssignmentError+
-     objects that should be inspected to determine which attributes triggered the errors.
-   * +AttributeAssignmentError+ -- an error occurred while doing a mass assignment through the +attributes=+ method.
-     You can inspect the +attribute+ property of the exception object to determine which attribute triggered the error.
-
-* Fixed that postgresql adapter would fails when reading bytea fields with null value #771 [rodrigo k]
-
-* Added transactional fixtures that uses rollback to undo changes to fixtures instead of DELETE/INSERT -- it's much faster. See documentation under Fixtures #760 [Jeremy Kemper]
-
-* Added destruction of dependent objects in has_one associations when a new assignment happens #742 [mindel]. Example:
-
-    class Account < ActiveRecord::Base
-      has_one :credit_card, :dependent => true
-    end
-    class CreditCard < ActiveRecord::Base
-      belongs_to :account
-    end
-
-    account.credit_card # => returns existing credit card, lets say id = 12
-    account.credit_card = CreditCard.create("number" => "123")
-    account.save # => CC with id = 12 is destroyed
-
-
-* Added validates_numericality_of #716 [Sebastian Kanthak/Chris McGrath]. Docuemntation:
-
-    Validates whether the value of the specified attribute is numeric by trying to convert it to
-    a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
-    <tt>/^[\+\-]?\d+$/</tt> (if <tt>integer</tt> is set to true).
-
-      class Person < ActiveRecord::Base
-        validates_numericality_of :value, :on => :create
-      end
-
-    Configuration options:
-    * <tt>message</tt> - A custom error message (default is: "is not a number")
-    * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
-    * <tt>only_integer</tt> Specifies whether the value has to be an integer, e.g. an integral value (default is false)
-
-
-* Fixed that HasManyAssociation#count was using :finder_sql rather than :counter_sql if it was available #445 [Scott Barron]
-
-* Added better defaults for composed_of, so statements like composed_of :time_zone, :mapping => %w( time_zone time_zone ) can be written without the mapping part (it's now assumed)
-
-* Added MacroReflection#macro which will return a symbol describing the macro used (like :composed_of or :has_many) #718, #248 [james@slashetc.com]
-
-
-*1.7.0* (24th February, 2005)
-
-* Changed the auto-timestamping feature to use ActiveRecord::Base.default_timezone instead of entertaining the parallel ActiveRecord::Base.timestamps_gmt method. The latter is now deprecated and will throw a warning on use (but still work) #710 [Jamis Buck]
-
-* Added a OCI8-based Oracle adapter that has been verified to work with Oracle 8 and 9 #629 [Graham Jenkins]. Usage notes:
-
-    1.  Key generation uses a sequence "rails_sequence" for all tables. (I couldn't find a simple
-        and safe way of passing table-specific sequence information to the adapter.)
-    2.  Oracle uses DATE or TIMESTAMP datatypes for both dates and times. Consequently I have had to
-        resort to some hacks to get data converted to Date or Time in Ruby.
-        If the column_name ends in _at (like created_at, updated_at) it's created as a Ruby Time. Else if the
-        hours/minutes/seconds are 0, I make it a Ruby Date. Else it's a Ruby Time.
-        This is nasty - but if you use Duck Typing you'll probably not care very much.
-        In 9i it's tempting to map DATE to Date and TIMESTAMP to Time but I don't think that is
-        valid - too many databases use DATE for both.
-        Timezones and sub-second precision on timestamps are not supported.
-    3.  Default values that are functions (such as "SYSDATE") are not supported. This is a
-        restriction of the way active record supports default values.
-    4.  Referential integrity constraints are not fully supported. Under at least
-        some circumstances, active record appears to delete parent and child records out of
-        sequence and out of transaction scope. (Or this may just be a problem of test setup.)
-
-  The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/
-
-* Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 [YuriSchimke]
-
-* Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 [yerejm]
-
-* Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 [tonka]
-
-* Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 [Nicholas Seckar]
-
-* Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 [daniel@nightrunner.com]
-
-* Added automatic dropping/creating of test tables for running the unit tests on all databases #587 [adelle@bullet.net.au]
-
-* Fixed that find_by_* would fail when column names had numbers #670 [demetrius]
-
-* Fixed the SQL Server adapter on a bunch of issues #667 [DeLynn]
-
-    1. Created a new columns method that is much cleaner.
-    2. Corrected a problem with the select and select_all methods
-       that didn't account for the LIMIT clause being passed into raw SQL statements.
-    3. Implemented the string_to_time method in order to create proper instances of the time class.
-    4. Added logic to the simplified_type method that allows the database to specify the scale of float data.
-    5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
-
-* Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 [lmarlow]
-
-* Added validates_each that validates each specified attribute against a block #610 [Jeremy Kemper]. Example:
-
-    class Person < ActiveRecord::Base
-      validates_each :first_name, :last_name do |record, attr|
-        record.errors.add attr, 'starts with z.' if attr[0] == ?z
-      end
-    end
-
-* Added :allow_nil as an explicit option for validates_length_of, so unless that's set to true having the attribute as nil will also return an error if a range is specified as :within #610 [Jeremy Kemper]
-
-* Added that validates_* now accept blocks to perform validations #618 [Tim Bates]. Example:
-
-    class Person < ActiveRecord::Base
-      validate { |person| person.errors.add("title", "will never be valid") if SHOULD_NEVER_BE_VALID }
-    end
-
-* Addded validation for validate all the associated objects before declaring failure with validates_associated #618 [Tim Bates]
-
-* Added keyword-style approach to defining the custom relational bindings #545 [Jamis Buck]. Example:
-
-    class Project < ActiveRecord::Base
-      primary_key "sysid"
-      table_name "XYZ_PROJECT"
-      inheritance_column { original_inheritance_column + "_id" }
-    end
-
-* Fixed Base#clone for use with PostgreSQL #565 [hanson@surgery.wisc.edu]
-
-
-*1.6.0* (January 25th, 2005)
-
-* Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.
-
-* Added that Base#delete and Base#destroy both can take an array of ids to delete/destroy #336
-
-* Added the option of supplying an array of attributes to Base#create, so that multiple records can be created at once.
-
-* Added the option of supplying an array of ids and attributes to Base#update, so that multiple records can be updated at once (inspired by #526/Duane Johnson). Example
-
-    people = { 1 => { "first_name" => "David" }, 2 => { "first_name" => "Jeremy"} }
-    Person.update(people.keys, people.values)
-
-* Added ActiveRecord::Base.timestamps_gmt that can be set to true to make the automated timestamping use GMT instead of local time #520 [Scott Baron]
-
-* Added that update_all calls sanitize_sql on its updates argument, so stuff like MyRecord.update_all(['time = ?', Time.now]) works #519 [notahat]
-
-* Fixed that the dynamic finders didn't treat nil as a "IS NULL" but rather "= NULL" case #515 [Demetrius]
-
-* Added bind-named arrays for interpolating a group of ids or strings in conditions #528 [Jeremy Kemper]
-
-* Added that has_and_belongs_to_many associations with additional attributes also can be created between unsaved objects and only committed to the database when Base#save is called on the associator #524 [Eric Anderson]
-
-* Fixed that records fetched with piggy-back attributes or through rich has_and_belongs_to_many associations couldn't be saved due to the extra attributes not part of the table #522 [Eric Anderson]
-
-* Added mass-assignment protection for the inheritance column -- regardless of a custom column is used or not
-
-* Fixed that association proxies would fail === tests like PremiumSubscription === @account.subscription
-
-* Fixed that column aliases didn't work as expected with the new MySql411 driver #507 [Demetrius]
-
-* Fixed that find_all would produce invalid sql when called sequentialy #490 [Scott Baron]
-
-
-*1.5.1* (January 18th, 2005)
-
-* Fixed that the belongs_to and has_one proxy would fail a test like 'if project.manager' -- this unfortunately also means that you can't call methods like project.manager.build unless there already is a manager on the project #492 [Tim Bates]
-
-* Fixed that the Ruby/MySQL adapter wouldn't connect if the password was empty #503 [Pelle]
-
-
-*1.5.0* (January 17th, 2005)
-
-* Fixed that unit tests for MySQL are now run as the "rails" user instead of root #455 [Eric Hodel]
-
-* Added validates_associated that enables validation of objects in an unsaved association #398 [Tim Bates]. Example:
-
-    class Book < ActiveRecord::Base
-      has_many :pages
-      belongs_to :library
-
-      validates_associated :pages, :library
-    end
-
-* Added support for associating unsaved objects #402 [Tim Bates]. Rules that govern this addition:
-
-    == Unsaved objects and associations
-
-    You can manipulate objects and associations before they are saved to the database, but there is some special behaviour you should be
-    aware of, mostly involving the saving of associated objects.
-
-    === One-to-one associations
-
-    * Assigning an object to a has_one association automatically saves that object, and the object being replaced (if there is one), in
-      order to update their primary keys - except if the parent object is unsaved (new_record? == true).
-    * If either of these saves fail (due to one of the objects being invalid) the assignment statement returns false and the assignment
-      is cancelled.
-    * If you wish to assign an object to a has_one association without saving it, use the #association.build method (documented below).
-    * Assigning an object to a belongs_to association does not save the object, since the foreign key field belongs on the parent. It does
-      not save the parent either.
-
-    === Collections
-
-    * Adding an object to a collection (has_many or has_and_belongs_to_many) automatically saves that object, except if the parent object
-      (the owner of the collection) is not yet stored in the database.
-    * If saving any of the objects being added to a collection (via #push or similar) fails, then #push returns false.
-    * You can add an object to a collection without automatically saving it by using the #collection.build method (documented below).
-    * All unsaved (new_record? == true) members of the collection are automatically saved when the parent is saved.
-
-* Added replace to associations, so you can do project.manager.replace(new_manager) or project.milestones.replace(new_milestones) #402 [Tim Bates]
-
-* Added build and create methods to has_one and belongs_to associations, so you can now do project.manager.build(attributes) #402 [Tim Bates]
-
-* Added that if a before_* callback returns false, all the later callbacks and the associated action are cancelled. If an after_* callback returns false, all the later callbacks are cancelled. Callbacks are generally run in the order they are defined, with the exception of callbacks defined as methods on the model, which are called last. #402 [Tim Bates]
-
-* Fixed that Base#== wouldn't work for multiple references to the same unsaved object #402 [Tim Bates]
-
-* Fixed binary support for PostgreSQL #444 [alex@byzantine.no]
-
-* Added a differenciation between AssociationCollection#size and -length. Now AssociationCollection#size returns the size of the
-  collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and calling collection.size if it has. If
-  it's more likely than not that the collection does have a size larger than zero and you need to fetch that collection afterwards,
-  it'll take one less SELECT query if you use length.
-
-* Added Base#attributes that returns a hash of all the attributes with their names as keys and clones of their objects as values #433 [atyp.de]
-
-* Fixed that foreign keys named the same as the association would cause stack overflow #437 [Eric Anderson]
-
-* Fixed default scope of acts_as_list from "1" to "1 = 1", so it'll work in PostgreSQL (among other places) #427 [Alexey]
-
-* Added Base#reload that reloads the attributes of an object from the database #422 [Andreas Schwarz]
-
-* Added SQLite3 compatibility through the sqlite3-ruby adapter by Jamis Buck #381 [Jeremy Kemper]
-
-* Added support for the new protocol spoken by MySQL 4.1.1+ servers for the Ruby/MySQL adapter that ships with Rails #440 [Matt Mower]
-
-* Added that Observers can use the observes class method instead of overwriting self.observed_class().
-
-    Before:
-      class ListSweeper < ActiveRecord::Base
-        def self.observed_class() [ List, Item ]
-      end
-
-    After:
-      class ListSweeper < ActiveRecord::Base
-        observes List, Item
-      end
-
-* Fixed that conditions in has_many and has_and_belongs_to_many should be interpolated just like the finder_sql is
-
-* Fixed Base#update_attribute to be indifferent to whether a string or symbol is used to describe the name
-
-* Added Base#toggle(attribute) and Base#toggle!(attribute) that makes it easier to flip a switch or flag.
-
-    Before: topic.update_attribute(:approved, !approved?)
-    After : topic.toggle!(:approved)
-
-* Added Base#increment!(attribute) and Base#decrement!(attribute) that also saves the records. Example:
-
-    page.views # => 1
-    page.increment!(:views) # executes an UPDATE statement
-    page.views # => 2
-
-    page.increment(:views).increment!(:views)
-    page.views # => 4
-
-* Added Base#increment(attribute) and Base#decrement(attribute) that encapsulates the += 1 and -= 1 patterns.
-
-
-*1.4.0* (January 4th, 2005)
-
-* Added automated optimistic locking if the field <tt>lock_version</tt> is present.  Each update to the
-  record increments the lock_version column and the locking facilities ensure that records instantiated twice
-  will let the last one saved raise a StaleObjectError if the first was also updated. Example:
-
-    p1 = Person.find(1)
-    p2 = Person.find(1)
-
-    p1.first_name = "Michael"
-    p1.save
-
-    p2.first_name = "should fail"
-    p2.save # Raises a ActiveRecord::StaleObjectError
-
-  You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging,
-  or otherwise apply the business logic needed to resolve the conflict.
-
-  #384 [Michael Koziarski]
-
-* Added dynamic attribute-based finders as a cleaner way of getting objects by simple queries without turning to SQL.
-  They work by appending the name of an attribute to <tt>find_by_</tt>, so you get finders like <tt>Person.find_by_user_name,
-  Payment.find_by_transaction_id</tt>. So instead of writing <tt>Person.find_first(["user_name = ?", user_name])</tt>, you just do
-  <tt>Person.find_by_user_name(user_name)</tt>.
-
-  It's also possible to use multiple attributes in the same find by separating them with "_and_", so you get finders like
-  <tt>Person.find_by_user_name_and_password</tt> or even <tt>Payment.find_by_purchaser_and_state_and_country</tt>. So instead of writing
-  <tt>Person.find_first(["user_name = ? AND password = ?", user_name, password])</tt>, you just do
-  <tt>Person.find_by_user_name_and_password(user_name, password)</tt>.
-
-  While primarily a construct for easier find_firsts, it can also be used as a construct for find_all by using calls like
-  <tt>Payment.find_all_by_amount(50)</tt> that is turned into <tt>Payment.find_all(["amount = ?", 50])</tt>. This is something not as equally useful,
-  though, as it's not possible to specify the order in which the objects are returned.
-
-* Added block-style for callbacks #332 [Jeremy Kemper].
-
-    Before:
-      before_destroy(Proc.new{ |record| Person.destroy_all "firm_id = #{record.id}" })
-
-    After:
-      before_destroy { |record| Person.destroy_all "firm_id = #{record.id}" }
-
-* Added :counter_cache option to acts_as_tree that works just like the one you can define on belongs_to #371 [Josh Peek]
-
-* Added Base.default_timezone accessor that determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates
-  and times from the database. This is set to :local by default.
-
-* Added the possibility for adapters to overwrite add_limit! to implement a different limiting scheme than "LIMIT X" used by MySQL, PostgreSQL, and SQLite.
-
-* Added the possibility of having objects with acts_as_list created before their scope is available or...
-
-* Added a db2 adapter that only depends on the Ruby/DB2 bindings (http://raa.ruby-lang.org/project/ruby-db2/) #386 [Maik Schmidt]
-
-* Added the final touches to the Microsoft SQL Server adapter by Joey Gibson that makes it suitable for actual use #394 [DeLynn Barry]
-
-* Added that Base#find takes an optional options hash, including :conditions. Base#find_on_conditions deprecated in favor of #find with :conditions #407 [Jeremy Kemper]
-
-* Added HasManyAssociation#count that works like Base#count #413 [intinig]
-
-* Fixed handling of binary content in blobs and similar fields for Ruby/MySQL and SQLite #409 [xal]
-
-* Fixed a bug in the Ruby/MySQL that caused binary content to be escaped badly and come back mangled #405 [Tobias Lütke]
-
-* Fixed that the const_missing autoload assumes the requested constant is set by require_association and calls const_get to retrieve it.
-  If require_association did not set the constant then const_get will call const_missing, resulting in an infinite loop #380 [Jeremy Kemper]
-
-* Fixed broken transactions that were actually only running object-level and not db level transactions [andreas]
-
-* Fixed that validates_uniqueness_of used 'id' instead of defined primary key #406
-
-* Fixed that the overwritten respond_to? method didn't take two parameters like the original #391
-
-* Fixed quoting in validates_format_of that would allow some rules to pass regardless of input #390 [Dmitry V. Sabanin]
-
-
-*1.3.0* (December 23, 2004)
-
-* Added a require_association hook on const_missing that makes it possible to use any model class without requiring it first. This makes STI look like:
-
-    before:
-      require_association 'person'
-      class Employee < Person
-      end
-
-    after:
-      class Employee < Person
-      end
-
-  This also reduces the usefulness of Controller.model in Action Pack to currently only being for documentation purposes.
-
-* Added that Base.update_all and Base.delete_all return an integer of the number of affected rows #341
-
-* Added scope option to validation_uniqueness #349 [Kent Sibilev]
-
-* Added respondence to *_before_type_cast for all attributes to return their string-state before they were type casted by the column type.
-  This is helpful for getting "100,000" back on a integer-based validation where the value would normally be "100".
-
-* Added allow_nil options to validates_inclusion_of so that validation is only triggered if the attribute is not nil [what-a-day]
-
-* Added work-around for PostgreSQL and the problem of getting fixtures to be created from id 1 on each test case.
-  This only works for auto-incrementing primary keys called "id" for now #359 [Scott Baron]
-
-* Added Base#clear_association_cache to empty all the cached associations #347 [Tobias Lütke]
-
-* Added more informative exceptions in establish_connection #356 [Jeremy Kemper]
-
-* Added Base#update_attributes that'll accept a hash of attributes and save the record (returning true if it passed validation, false otherwise).
-
-    Before:
-      person.attributes = @params["person"]
-      person.save
-
-    Now:
-      person.update_attributes(@params["person"])
-
-* Added Base.destroy and Base.delete to remove records without holding a reference to them first.
-
-* Added that query benchmarking will only happen if its going to be logged anyway #344
-
-* Added higher_item and lower_item as public methods for acts_as_list #342 [Tobias Lütke]
-
-* Fixed that options[:counter_sql] was overwritten with interpolated sql rather than original sql #355 [Jeremy Kemper]
-
-* Fixed that overriding an attribute's accessor would be disregarded by add_on_empty and add_on_boundary_breaking because they simply used
-  the attributes[] hash instead of checking for @base.respond_to?(attr.to_s). [Marten]
-
-* Fixed that Base.table_name would expect a parameter when used in has_and_belongs_to_many joins [Anna Lissa Cruz]
-
-* Fixed that nested transactions now work by letting the outer most transaction have the responsibilty of starting and rolling back the transaction.
-  If any of the inner transactions swallow the exception raised, though, the transaction will not be rolled back. So always let the transaction
-  bubble up even when you've dealt with local issues. Closes #231 and #340.
-
-* Fixed validates_{confirmation,acceptance}_of to only happen when the virtual attributes are not nil #348 [dpiddy@gmail.com]
-
-* Changed the interface on AbstractAdapter to require that adapters return the number of affected rows on delete and update operations.
-
-* Fixed the automated timestamping feature when running under Rails' development environment that resets the inheritable attributes on each request.
-
-
-
-*1.2.0*
-
-* Added Base.validates_inclusion_of that validates whether the value of the specified attribute is available in a particular enumerable
-  object. [what-a-day]
-
-    class Person < ActiveRecord::Base
-      validates_inclusion_of :gender, :in=>%w( m f ), :message=>"woah! what are you then!??!!"
-      validates_inclusion_of :age, :in=>0..99
-    end
-
-* Added acts_as_list that can decorates an existing class with methods like move_higher/lower, move_to_top/bottom. [Tobias Lütke] Example:
-
-    class TodoItem < ActiveRecord::Base
-      acts_as_list :scope => :todo_list_id
-      belongs_to :todo_list
-    end
-
-* Added acts_as_tree that can decorates an existing class with a many to many relationship with itself. Perfect for categories in
-  categories and the likes. [Tobias Lütke]
-
-* Added that Active Records will automatically record creation and/or update timestamps of database objects if fields of the names
-  created_at/created_on or updated_at/updated_on are present. [Tobias Lütke]
-
-* Added Base.default_error_messages as a hash of all the error messages used in the validates_*_of so they can be changed in one place [Tobias Lütke]
-
-* Added automatic transaction block around AssociationCollection.<<, AssociationCollection.delete, and AssociationCollection.destroy_all
-
-* Fixed that Base#find will return an array if given an array -- regardless of the number of elements #270 [Marten]
-
-* Fixed that has_and_belongs_to_many would generate bad sql when naming conventions differed from using vanilla "id" everywhere [RedTerror]
-
-* Added a better exception for when a type column is used in a table without the intention of triggering single-table inheritance. Example:
-
-    ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'bad_class!'.
-    This error is raised because the column 'type' is reserved for storing the class in case of inheritance.
-    Please rename this column if you didn't intend it to be used for storing the inheritance class or
-    overwrite Company.inheritance_column to use another column for that information.
-
-* Added that single-table inheritance will only kick in if the inheritance_column (by default "type") is present. Otherwise, inheritance won't
-  have any magic side effects.
-
-* Added the possibility of marking fields as being in error without adding a message (using nil) to it that'll get displayed wth full_messages #208 [mjobin]
-
-* Fixed Base.errors to be indifferent as to whether strings or symbols are used. Examples:
-
-    Before:
-      errors.add(:name, "must be shorter") if name.size > 10
-      errors.on(:name)  # => "must be shorter"
-      errors.on("name") # => nil
-
-    After:
-      errors.add(:name, "must be shorter") if name.size > 10
-      errors.on(:name)  # => "must be shorter"
-      errors.on("name") # => "must be shorter"
-
-* Added Base.validates_format_of that Validates whether the value of the specified attribute is of the correct form by matching
-  it against the regular expression provided. [Marcel Molina Jr.]
-
-    class Person < ActiveRecord::Base
-      validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :on => :create
-    end
-
-* Added Base.validates_length_of that delegates to add_on_boundary_breaking #312 [Tobias Lütke]. Example:
-
-    Validates that the specified attribute matches the length restrictions supplied in either:
-
-      - configuration[:minimum]
-      - configuration[:maximum]
-      - configuration[:is]
-      - configuration[:within] (aka. configuration[:in])
-
-    Only one option can be used at a time.
-
-      class Person < ActiveRecord::Base
-        validates_length_of :first_name, :maximum=>30
-        validates_length_of :last_name, :maximum=>30, :message=>"less than %d if you don't mind"
-        validates_length_of :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name"
-        validates_length_of :fav_bra_size, :minimum=>1, :too_short=>"please enter at least %d character"
-        validates_length_of :smurf_leader, :is=>4, :message=>"papa is spelled with %d characters... don't play me."
-      end
-
-* Added Base.validate_presence as an alternative to implementing validate and doing errors.add_on_empty yourself.
-
-* Added Base.validates_uniqueness_of that alidates whether the value of the specified attributes are unique across the system.
-  Useful for making sure that only one user can be named "davidhh".
-
-    class Person < ActiveRecord::Base
-      validates_uniqueness_of :user_name
-    end
-
-  When the record is created, a check is performed to make sure that no record exist in the database with the given value for the specified
-  attribute (that maps to a column). When the record is updated, the same check is made but disregarding the record itself.
-
-
-* Added Base.validates_confirmation_of that encapsulates the pattern of wanting to validate a password or email address field with a confirmation. Example:
-
-     Model:
-       class Person < ActiveRecord::Base
-         validates_confirmation_of :password
-       end
-
-     View:
-       <%= password_field "person", "password" %>
-       <%= password_field "person", "password_confirmation" %>
-
-   The person has to already have a password attribute (a column in the people table), but the password_confirmation is virtual.
-   It exists only as an in-memory variable for validating the password. This check is performed both on create and update.
-
-
-* Added Base.validates_acceptance_of that encapsulates the pattern of wanting to validate the acceptance of a terms of service check box (or similar agreement). Example:
-
-   class Person < ActiveRecord::Base
-     validates_acceptance_of :terms_of_service
-   end
-
-  The terms_of_service attribute is entirely virtual. No database column is needed. This check is performed both on create and update.
-
-  NOTE: The agreement is considered valid if it's set to the string "1". This makes it easy to relate it to an HTML checkbox.
-
-
-* Added validation macros to make the stackable just like the life cycle callbacks. Examples:
-
-    class Person < ActiveRecord::Base
-      validate { |record| record.errors.add("name", "too short") unless name.size > 10 }
-      validate { |record| record.errors.add("name", "too long")  unless name.size < 20 }
-      validate_on_create :validate_password
-
-      private
-        def validate_password
-          errors.add("password", "too short") unless password.size > 6
-        end
-    end
-
-* Added the option for sanitizing find_by_sql and the offset parts in regular finds [Sam Stephenson]. Examples:
-
-    Project.find_all ["category = ?", category_name], "created ASC", ["? OFFSET ?", 15, 20]
-    Post.find_by_sql ["SELECT * FROM posts WHERE author = ? AND created > ?", author_id, start_date]
-
-* Fixed value quoting in all generated SQL statements, so that integers are not surrounded in quotes and that all sanitation are happening
-  through the database's own quoting routine. This should hopefully make it lots easier for new adapters that doesn't accept '1' for integer
-  columns.
-
-* Fixed has_and_belongs_to_many guessing of foreign key so that keys are generated correctly for models like SomeVerySpecialClient
-  [Florian Weber]
-
-* Added counter_sql option for has_many associations [Jeremy Kemper]. Documentation:
-
-    <tt>:counter_sql</tt> - specify a complete SQL statement to fetch the size of the association. If +:finder_sql+ is
-    specified but +:counter_sql+, +:counter_sql+ will be generated by replacing SELECT ... FROM with SELECT COUNT(*) FROM.
-
-* Fixed that methods wrapped in callbacks still return their original result #260 [Jeremy Kemper]
-
-* Fixed the Inflector to handle the movie/movies pair correctly #261 [Scott Baron]
-
-* Added named bind-style variable interpolation #281 [Michael Koziarski]. Example:
-
-    Person.find(["id = :id and first_name = :first_name", { :id => 5, :first_name = "bob' or 1=1" }])
-
-* Added bind-style variable interpolation for the condition arrays that uses the adapter's quote method [Michael Koziarski]
-
-  Before:
-    find_first([ "user_name = '%s' AND password = '%s'", user_name, password ])]
-    find_first([ "firm_id = %s", firm_id ])] # unsafe!
-
-  After:
-    find_first([ "user_name = ? AND password = ?", user_name, password ])]
-    find_first([ "firm_id = ?", firm_id ])]
-
-* Added CSV format for fixtures #272 [what-a-day]. (See the new and expanded documentation on fixtures for more information)
-
-* Fixed fixtures using primary key fields called something else than "id" [dave]
-
-* Added proper handling of time fields that are turned into Time objects with the dummy date of 2000/1/1 [HariSeldon]
-
-* Added reverse order of deleting fixtures, so referential keys can be maintained #247 [Tim Bates]
-
-* Added relative path search for sqlite dbfiles in database.yml (if RAILS_ROOT is defined) #233 [Jeremy Kemper]
-
-* Added option to establish_connection where you'll be able to leave out the parameter to have it use the RAILS_ENV environment variable
-
-* Fixed problems with primary keys and postgresql sequences (#230) [Tim Bates]
-
-* Added reloading for associations 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 ActiveRecord::Base.reload_dependencies = false in production environments.
-
-  NOTE: This will only have an effect if you let the associations manage the requiring of model classes. All libraries loaded through
-  require will be "forever" cached. You can, however, use ActiveRecord::Base.load_or_require("library") to get this behavior outside of the
-  auto-loading associations.
-
-* Added ERB capabilities to the fixture files for dynamic fixture generation. You don't need to do anything, just include ERB blocks like:
-
-    david:
-      id: 1
-      name: David
-
-    jamis:
-      id: 2
-      name: Jamis
-
-    <% for digit in 3..10 %>
-    dev_<%= digit %>:
-      id: <%= digit %>
-      name: fixture_<%= digit %>
-    <% end %>
-
-* Changed the yaml fixture searcher to look in the root of the fixtures directory, so when you before could have something like:
-
-    fixtures/developers/fixtures.yaml
-    fixtures/accounts/fixtures.yaml
-
-  ...you now need to do:
-
-    fixtures/developers.yaml
-    fixtures/accounts.yaml
-
-* Changed the fixture format from:
-
-    name: david
-    data:
-     id: 1
-     name: David Heinemeier Hansson
-     birthday: 1979-10-15
-     profession: Systems development
-    ---
-    name: steve
-    data:
-     id: 2
-     name: Steve Ross Kellock
-     birthday: 1974-09-27
-     profession: guy with keyboard
-
-  ...to:
-
-    david:
-     id: 1
-     name: David Heinemeier Hansson
-     birthday: 1979-10-15
-     profession: Systems development
-
-    steve:
-     id: 2
-     name: Steve Ross Kellock
-     birthday: 1974-09-27
-     profession: guy with keyboard
-
-  The change is NOT backwards compatible. Fixtures written in the old YAML style needs to be rewritten!
-
-* All associations will now attempt to require the classes that they associate to. Relieving the need for most explicit 'require' statements.
-
-
-*1.1.0* (34)
-
-* Added automatic fixture setup and instance variable availability. Fixtures can also be automatically
-  instantiated in instance variables relating to their names using the following style:
-
-    class FixturesTest < Test::Unit::TestCase
-      fixtures :developers # you can add more with comma separation
-
-      def test_developers
-        assert_equal 3, @developers.size # the container for all the fixtures is automatically set
-        assert_kind_of Developer, @david # works like @developers["david"].find
-        assert_equal "David Heinemeier Hansson", @david.name
-      end
-    end
-
-* Added HasAndBelongsToManyAssociation#push_with_attributes(object, join_attributes) that can create associations in the join table with additional
-  attributes. This is really useful when you have information that's only relevant to the join itself, such as a "added_on" column for an association
-  between post and category. The added attributes will automatically be injected into objects retrieved through the association similar to the piggy-back
-  approach:
-
-    post.categories.push_with_attributes(category, :added_on => Date.today)
-    post.categories.first.added_on # => Date.today
-
-  NOTE: The categories table doesn't have a added_on column, it's the categories_post join table that does!
-
-* Fixed that :exclusively_dependent and :dependent can't be activated at the same time on has_many associations [Jeremy Kemper]
-
-* Fixed that database passwords couldn't be all numeric [Jeremy Kemper]
-
-* Fixed that calling id would create the instance variable for new_records preventing them from being saved correctly [Jeremy Kemper]
-
-* Added sanitization feature to HasManyAssociation#find_all so it works just like Base.find_all [Sam Stephenson/Jeremy Kemper]
-
-* Added that you can pass overlapping ids to find without getting duplicated records back [Jeremy Kemper]
-
-* Added that Base.benchmark returns the result of the block [Jeremy Kemper]
-
-* Fixed problem with unit tests on Windows with SQLite [paterno]
-
-* Fixed that quotes would break regular non-yaml fixtures [Dmitry Sabanin/daft]
-
-* Fixed fixtures on windows with line endings cause problems under unix / mac [Tobias Lütke]
-
-* Added HasAndBelongsToManyAssociation#find(id) that'll search inside the collection and find the object or record with that id
-
-* Added :conditions option to has_and_belongs_to_many that works just like the one on all the other associations
-
-* Added AssociationCollection#clear to remove all associations from has_many and has_and_belongs_to_many associations without destroying the records [geech]
-
-* Added type-checking and remove in 1-instead-of-N sql statements to AssociationCollection#delete [geech]
-
-* Added a return of self to AssociationCollection#<< so appending can be chained, like project << Milestone.create << Milestone.create [geech]
-
-* Added Base#hash and Base#eql? which means that all of the equality using features of array and other containers now works:
-
-    [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
-
-* Added :uniq as an option to has_and_belongs_to_many which will automatically ensure that AssociateCollection#uniq is called
-  before pulling records out of the association. This is especially useful for three-way (and above) has_and_belongs_to_many associations.
-
-* Added AssociateCollection#uniq which is especially useful for has_and_belongs_to_many associations that can include duplicates,
-  which is common on associations that also use metadata. Usage: post.categories.uniq
-
-* Fixed respond_to? to use a subclass specific hash instead of an Active Record-wide one
-
-* Fixed has_and_belongs_to_many to treat associations between classes in modules properly [Florian Weber]
-
-* Added a NoMethod exception to be raised when query and writer methods are called for attributes that doesn't exist [geech]
-
-* Added a more robust version of Fixtures that throws meaningful errors when on formatting issues [geech]
-
-* Added Base#transaction as a compliment to Base.transaction for prettier use in instance methods [geech]
-
-* Improved the speed of respond_to? by placing the dynamic methods lookup table in a hash [geech]
-
-* Added that any additional fields added to the join table in a has_and_belongs_to_many association
-  will be placed as attributes when pulling records out through has_and_belongs_to_many associations.
-  This is helpful when have information about the association itself that you want available on retrival.
-
-* Added better loading exception catching and RubyGems retries to the database adapters [alexeyv]
-
-* Fixed bug with per-model transactions [daniel]
-
-* Fixed Base#transaction so that it returns the result of the last expression in the transaction block [alexeyv]
-
-* Added Fixture#find to find the record corresponding to the fixture id. The record
-  class name is guessed by using Inflector#classify (also new) on the fixture directory name.
-
-    Before: Document.find(@documents["first"]["id"])
-    After : @documents["first"].find
-
-* Fixed that the table name part of column names ("TABLE.COLUMN") wasn't removed properly [Andreas Schwarz]
-
-* Fixed a bug with Base#size when a finder_sql was used that didn't capitalize SELECT and FROM [geech]
-
-* Fixed quoting problems on SQLite by adding quote_string to the AbstractAdapter that can be overwritten by the concrete
-  adapters for a call to the dbm. [Andreas Schwarz]
-
-* Removed RubyGems backup strategy for requiring SQLite-adapter -- if people want to use gems, they're already doing it with AR.
-
-
-*1.0.0 (35)*
-
-* Added OO-style associations methods [Florian Weber]. Examples:
-
-    Project#milestones_count       => Project#milestones.size
-    Project#build_to_milestones    => Project#milestones.build
-    Project#create_for_milestones  => Project#milestones.create
-    Project#find_in_milestones     => Project#milestones.find
-    Project#find_all_in_milestones => Project#milestones.find_all
-
-* Added serialize as a new class method to control when text attributes should be YAMLized or not. This means that automated
-  serialization of hashes, arrays, and so on WILL NO LONGER HAPPEN (#10). You need to do something like this:
-
-    class User < ActiveRecord::Base
-      serialize :settings
-    end
-
-  This will assume that settings is a text column and will now YAMLize any object put in that attribute. You can also specify
-  an optional :class_name option that'll raise an exception if a serialized object is retrieved as a descendant of a class not in
-  the hierarchy. Example:
-
-    class User < ActiveRecord::Base
-      serialize :settings, :class_name => "Hash"
-    end
-
-    user = User.create("settings" => %w( one two three ))
-    User.find(user.id).settings # => raises SerializationTypeMismatch
-
-* Added the option to connect to a different database for one model at a time. Just call establish_connection on the class
-  you want to have connected to another database than Base. This will automatically also connect decendents of that class
-  to the different database [Renald Buter].
-
-* Added transactional protection for Base#save. Validations can now check for values knowing that it happens in a transaction and callbacks
-  can raise exceptions knowing that the save will be rolled back. [Suggested by Alexey Verkhovsky]
-
-* Added column name quoting so reserved words, such as "references", can be used as column names [Ryan Platte]
-
-* Added the possibility to chain the return of what happened inside a logged block [geech]:
-
-    This now works:
-      log { ... }.map { ... }
-
-    Instead of doing:
-      result = []
-      log { result = ... }
-      result.map { ... }
-
-* Added "socket" option for the MySQL adapter, so you can change it to something else than "/tmp/mysql.sock" [Anna Lissa Cruz]
-
-* Added respond_to? answers for all the attribute methods. So if Person has a name attribute retrieved from the table schema,
-  person.respond_to? "name" will return true.
-
-* Added Base.benchmark which can be used to aggregate logging and benchmark, so you can measure and represent multiple statements in a single block.
-  Usage (hides all the SQL calls for the individual actions and calculates total runtime for them all):
-
-    Project.benchmark("Creating project") do
-      project = Project.create("name" => "stuff")
-      project.create_manager("name" => "David")
-      project.milestones << Milestone.find_all
-    end
-
-* Added logging of invalid SQL statements [Daniel Von Fange]
-
-* Added alias Errors#[] for Errors#on, so you can now say person.errors["name"] to retrieve the errors for name [Andreas Schwarz]
-
-* Added RubyGems require attempt if sqlite-ruby is not available through regular methods.
-
-* Added compatibility with 2.x series of sqlite-ruby drivers. [Jamis Buck]
-
-* Added type safety for association assignments, so a ActiveRecord::AssociationTypeMismatch will be raised if you attempt to
-  assign an object that's not of the associated class. This cures the problem with nil giving id = 4 and fixnums giving id = 1 on
-  mistaken association assignments. [Reported by Andreas Schwarz]
-
-* Added the option to keep many fixtures in one single YAML document [what-a-day]
-
-* Added the class method "inheritance_column" that can be overwritten to return the name of an alternative column than "type" for storing
-  the type for inheritance hierarchies. [Dave Steinberg]
-
-* Added [] and []= as an alternative way to access attributes when the regular methods have been overwritten [Dave Steinberg]
-
-* Added the option to observer more than one class at the time by specifying observed_class as an array
-
-* Added auto-id propagation support for tables with arbitrary primary keys that have autogenerated sequences associated with them
-  on PostgreSQL. [Dave Steinberg]
-
-* Changed that integer and floats set to "" through attributes= remain as NULL. This was especially a problem for scaffolding and postgresql. (#49)
-
-* Changed the MySQL Adapter to rely on MySQL for its defaults for socket, host, and port [Andreas Schwarz]
-
-* Changed ActionControllerError to decent from StandardError instead of Exception. It can now be caught by a generic rescue.
-
-* Changed class inheritable attributes to not use eval [Caio Chassot]
-
-* Changed Errors#add to now use "invalid" as the default message instead of true, which means full_messages work with those [Marcel Molina Jr.]
-
-* Fixed spelling on Base#add_on_boundry_breaking to Base#add_on_boundary_breaking (old naming still works) [Marcel Molina Jr.]
-
-* Fixed that entries in the has_and_belongs_to_many join table didn't get removed when an associated object was destroyed.
-
-* Fixed unnecessary calls to SET AUTOCOMMIT=0/1 for MySQL adapter [Andreas Schwarz]
-
-* Fixed PostgreSQL defaults are now handled gracefully [Dave Steinberg]
-
-* Fixed increment/decrement_counter are now atomic updates [Andreas Schwarz]
-
-* Fixed the problems the Inflector had turning Attachment into attuchments and Cases into Casis [radsaq/Florian Gross]
-
-* Fixed that cloned records would point attribute references on the parent object [Andreas Schwarz]
-
-* Fixed SQL for type call on inheritance hierarchies [Caio Chassot]
-
-* Fixed bug with typed inheritance [Florian Weber]
-
-* Fixed a bug where has_many collection_count wouldn't use the conditions specified for that association
-
-
-*0.9.5*
-
-* Expanded the table_name guessing rules immensely [Florian Green]. Documentation:
-
-    Guesses the table name (in forced lower-case) based on the name of the class in the inheritance hierarchy descending
-    directly from ActiveRecord. So if the hierarchy looks like: Reply < Message < ActiveRecord, then Message is used
-    to guess the table name from even when called on Reply. The guessing rules are as follows:
-    * Class name ends in "x", "ch" or "ss": "es" is appended, so a Search class becomes a searches table.
-    * Class name ends in "y" preceded by a consonant or "qu": The "y" is replaced with "ies",
-      so a Category class becomes a categories table.
-    * Class name ends in "fe": The "fe" is replaced with "ves", so a Wife class becomes a wives table.
-    * Class name ends in "lf" or "rf": The "f" is replaced with "ves", so a Half class becomes a halves table.
-    * Class name ends in "person": The "person" is replaced with "people", so a Salesperson class becomes a salespeople table.
-    * Class name ends in "man": The "man" is replaced with "men", so a Spokesman class becomes a spokesmen table.
-    * Class name ends in "sis": The "i" is replaced with an "e", so a Basis class becomes a bases table.
-    * Class name ends in "tum" or "ium": The "um" is replaced with an "a", so a Datum class becomes a data table.
-    * Class name ends in "child": The "child" is replaced with "children", so a NodeChild class becomes a node_children table.
-    * Class name ends in an "s": No additional characters are added or removed.
-    * Class name doesn't end in "s": An "s" is appended, so a Comment class becomes a comments table.
-    * Class name with word compositions: Compositions are underscored, so CreditCard class becomes a credit_cards table.
-    Additionally, the class-level table_name_prefix is prepended to the table_name and the table_name_suffix is appended.
-    So if you have "myapp_" as a prefix, the table name guess for an Account class becomes "myapp_accounts".
-
-    You can also overwrite this class method to allow for unguessable links, such as a Mouse class with a link to a
-    "mice" table. Example:
-
-      class Mouse < ActiveRecord::Base
-         def self.table_name() "mice" end
-      end
-
-  This conversion is now done through an external class called Inflector residing in lib/active_record/support/inflector.rb.
-
-* Added find_all_in_collection to has_many defined collections. Works like this:
-
-    class Firm < ActiveRecord::Base
-      has_many :clients
-    end
-
-    firm.id # => 1
-    firm.find_all_in_clients "revenue > 1000" # SELECT * FROM clients WHERE firm_id = 1 AND revenue > 1000
-
-  [Requested by Dave Thomas]
-
-* Fixed finders for inheritance hierarchies deeper than one level [Florian Weber]
-
-* Added add_on_boundry_breaking to errors to accompany add_on_empty as a default validation method. It's used like this:
-
-    class Person < ActiveRecord::Base
-      protected
-        def validation
-          errors.add_on_boundry_breaking "password", 3..20
-        end
-    end
-
-  This will add an error to the tune of "is too short (minimum is 3 characters)" or "is too long (minimum is 20 characters)" if
-  the password is outside the boundry. The messages can be changed by passing a third and forth parameter as message strings.
-
-* Implemented a clone method that works properly with AR. It returns a clone of the record that
-  hasn't been assigned an id yet and is treated as a new record.
-
-* Allow for domain sockets in PostgreSQL by not assuming localhost when no host is specified [Scott Barron]
-
-* Fixed that bignums are saved properly instead of attempted to be YAMLized [Andreas Schwartz]
-
-* Fixed a bug in the GEM where the rdoc options weren't being passed according to spec [Chad Fowler]
-
-* Fixed a bug with the exclusively_dependent option for has_many
-
-
-*0.9.4*
-
-* Correctly guesses the primary key when the class is inside a module [Dave Steinberg].
-
-* Added [] and []= as alternatives to read_attribute and write_attribute [Dave Steinberg]
-
-* has_and_belongs_to_many now accepts an :order key to determine in which order the collection is returned [radsaq].
-
-* The ids passed to find and find_on_conditions are now automatically sanitized.
-
-* Added escaping of plings in YAML content.
-
-* Multi-parameter assigns where all the parameters are empty will now be set to nil instead of a new instance of their class.
-
-* Proper type within an inheritance hierarchy is now ensured already at object initialization (instead of first at create)
-
-
-*0.9.3*
-
-* Fixed bug with using a different primary key name together with has_and_belongs_to_many [Investigation by Scott]
-
-* Added :exclusively_dependent option to the has_many association macro. The doc reads:
-
-    If set to true all the associated object are deleted in one SQL statement without having their
-    before_destroy callback run. This should only be used on associations that depend solely on
-    this class and don't need to do any clean-up in before_destroy. The upside is that it's much
-    faster, especially if there's a counter_cache involved.
-
-* Added :port key to connection options, so the PostgreSQL and MySQL adapters can connect to a database server
-  running on another port than the default.
-
-* Converted the new natural singleton methods that prevented AR objects from being saved by PStore
-  (and hence be placed in a Rails session) to a module. [Florian Weber]
-
-* Fixed the use of floats (was broken since 0.9.0+)
-
-* Fixed PostgreSQL adapter so default values are displayed properly when used in conjunction with
-  Action Pack scaffolding.
-
-* Fixed booleans support for PostgreSQL (use real true/false on boolean fields instead of 0/1 on tinyints) [radsaq]
-
-
-*0.9.2*
-
-* Added static method for instantly updating a record
-
-* Treat decimal and numeric as Ruby floats [Andreas Schwartz]
-
-* Treat chars as Ruby strings (fixes problem for Action Pack form helpers too)
-
-* Removed debugging output accidently left in (which would screw web applications)
-
-
-*0.9.1*
-
-* Added MIT license
-
-* Added natural object-style assignment for has_and_belongs_to_many associations. Consider the following model:
-
-    class Event < ActiveRecord::Base
-      has_one_and_belongs_to_many :sponsors
-    end
-
-    class Sponsor < ActiveRecord::Base
-      has_one_and_belongs_to_many :sponsors
-    end
-
-  Earlier, you'd have to use synthetic methods for creating associations between two objects of the above class:
-
-    roskilde_festival.add_to_sponsors(carlsberg)
-    roskilde_festival.remove_from_sponsors(carlsberg)
-
-    nike.add_to_events(world_cup)
-    nike.remove_from_events(world_cup)
-
-  Now you can use regular array-styled methods:
-
-    roskilde_festival.sponsors << carlsberg
-    roskilde_festival.sponsors.delete(carlsberg)
-
-    nike.events << world_cup
-    nike.events.delete(world_cup)
-
-* Added delete method for has_many associations. Using this will nullify an association between the has_many and the belonging
-  object by setting the foreign key to null. Consider this model:
-
-    class Post < ActiveRecord::Base
-      has_many :comments
-    end
-
-    class Comment < ActiveRecord::Base
-      belongs_to :post
-    end
-
-  You could do something like:
-
-    funny_comment.has_post? # => true
-    announcement.comments.delete(funny_comment)
-    funny_comment.has_post? # => false
-
-
-*0.9.0*
-
-* Active Record is now thread safe! (So you can use it with Cerise and WEBrick applications)
-  [Implementation idea by Michael Neumann, debugging assistance by Jamis Buck]
-
-* Improved performance by roughly 400% on a basic test case of pulling 100 records and querying one attribute.
-  This brings the tax for using Active Record instead of "riding on the metal" (using MySQL-ruby C-driver directly) down to ~50%.
-  Done by doing lazy type conversions and caching column information on the class-level.
-
-* Added callback objects and procs as options for implementing the target for callback macros.
-
-* Added "counter_cache" option to belongs_to that automates the usage of increment_counter and decrement_counter. Consider:
-
-    class Post < ActiveRecord::Base
-      has_many :comments
-    end
-
-    class Comment < ActiveRecord::Base
-      belongs_to :post
-    end
-
-  Iterating over 100 posts like this:
-
-    <% for post in @posts %>
-      <%= post.title %> has <%= post.comments_count %> comments
-    <% end %>
-
-  Will generate 100 SQL count queries -- one for each call to post.comments_count. If you instead add a "comments_count" int column
-  to the posts table and rewrite the comments association macro with:
-
-    class Comment < ActiveRecord::Base
-      belongs_to :post, :counter_cache => true
-    end
-
-  Those 100 SQL count queries will be reduced to zero. Beware that counter caching is only appropriate for objects that begin life
-  with the object it's specified to belong with and is destroyed like that as well. Typically objects where you would also specify
-  :dependent => true. If your objects switch from one belonging to another (like a post that can be move from one category to another),
-  you'll have to manage the counter yourself.
-
-* Added natural object-style assignment for has_one and belongs_to associations. Consider the following model:
-
-    class Project < ActiveRecord::Base
-      has_one :manager
-    end
-
-    class Manager < ActiveRecord::Base
-      belongs_to :project
-    end
-
-  Earlier, assignments would work like following regardless of which way the assignment told the best story:
-
-    active_record.manager_id = david.id
-
-  Now you can do it either from the belonging side:
-
-    david.project = active_record
-
-  ...or from the having side:
-
-    active_record.manager = david
-
-  If the assignment happens from the having side, the assigned object is automatically saved. So in the example above, the
-  project_id attribute on david would be set to the id of active_record, then david would be saved.
-
-* Added natural object-style assignment for has_many associations [Florian Weber]. Consider the following model:
-
-    class Project < ActiveRecord::Base
-      has_many :milestones
-    end
-
-    class Milestone < ActiveRecord::Base
-      belongs_to :project
-    end
-
-  Earlier, assignments would work like following regardless of which way the assignment told the best story:
-
-    deadline.project_id = active_record.id
-
-  Now you can do it either from the belonging side:
-
-    deadline.project = active_record
-
-  ...or from the having side:
-
-    active_record.milestones << deadline
-
-  The milestone is automatically saved with the new foreign key.
-
-* API CHANGE: Attributes for text (or blob or similar) columns will now have unknown classes stored using YAML instead of using
-  to_s. (Known classes that won't be yamelized are: String, NilClass, TrueClass, FalseClass, Fixnum, Date, and Time).
-  Likewise, data pulled out of text-based attributes will be attempted converged using Yaml if they have the "--- " header.
-  This was primarily done to be enable the storage of hashes and arrays without wrapping them in aggregations, so now you can do:
-
-    user = User.find(1)
-    user.preferences = { "background" => "black", "display" => large }
-    user.save
-
-    User.find(1).preferences # => { "background" => "black", "display" => large }
-
-  Please note that this method should only be used when you don't care about representing the object in proper columns in
-  the database. A money object consisting of an amount and a currency is still a much better fit for a value object done through
-  aggregations than this new option.
-
-* POSSIBLE CODE BREAKAGE: As a consequence of the lazy type conversions, it's a bad idea to reference the @attributes hash
-  directly (it always was, but now it's paramount that you don't). If you do, you won't get the type conversion. So to implement
-  new accessors for existing attributes, use read_attribute(attr_name) and write_attribute(attr_name, value) instead. Like this:
-
-    class Song < ActiveRecord::Base
-      # Uses an integer of seconds to hold the length of the song
-
-      def length=(minutes)
-        write_attribute("length", minutes * 60)
-      end
-
-      def length
-        read_attribute("length") / 60
-      end
-    end
-
-  The clever kid will notice that this opens a door to sidestep the automated type conversion by using @attributes directly.
-  This is not recommended as read/write_attribute may be granted additional responsibilities in the future, but if you think
-  you know what you're doing and aren't afraid of future consequences, this is an option.
-
-* Applied a few minor bug fixes reported by Daniel Von Fange.
-
-
-*0.8.4*
-
-_Reflection_
-
-* Added ActiveRecord::Reflection with a bunch of methods and classes for reflecting in aggregations and associations.
-
-* Added Base.columns and Base.content_columns which returns arrays of column description (type, default, etc) objects.
-
-* Added Base#attribute_names which returns an array of names for the attributes available on the object.
-
-* Added Base#column_for_attribute(name) which returns the column description object for the named attribute.
-
-
-_Misc_
-
-* Added multi-parameter assignment:
-
-    # Instantiate objects for all attribute classes that needs more than one constructor parameter. This is done
-    # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
-    # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
-    # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
-    # parenteses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
-    # s for String, and a for Array.
-
-  This is incredibly useful for assigning dates from HTML drop-downs of month, year, and day.
-
-* Fixed bug with custom primary key column name and Base.find on multiple parameters.
-
-* Fixed bug with dependent option on has_one associations if there was no associated object.
-
-
-*0.8.3*
-
-_Transactions_
-
-* Added transactional protection for destroy (important for the new :dependent option) [Suggested by Carl Youngblood]
-
-* Fixed so transactions are ignored on MyISAM tables for MySQL (use InnoDB to get transactions)
-
-* Changed transactions so only exceptions will cause a rollback, not returned false.
-
-
-_Mapping_
-
-* Added support for non-integer primary keys [Aredridel/earlier work by Michael Neumann]
-
-    User.find "jdoe"
-    Product.find "PDKEY-INT-12"
-
-* Added option to specify naming method for primary key column. ActiveRecord::Base.primary_key_prefix_type can either
-  be set to nil, :table_name, or :table_name_with_underscore. :table_name will assume that Product class has a primary key
-  of "productid" and :table_name_with_underscore will assume "product_id". The default nil will just give "id".
-
-* Added an overwriteable primary_key method that'll instruct AR to the name of the
-  id column [Aredridele/earlier work by Guan Yang]
-
-    class Project < ActiveRecord::Base
-      def self.primary_key() "project_id" end
-    end
-
-* Fixed that Active Records can safely associate inside and out of modules.
-
-    class MyApplication::Account < ActiveRecord::Base
-      has_many :clients # will look for MyApplication::Client
-      has_many :interests, :class_name => "Business::Interest" # will look for Business::Interest
-    end
-
-* Fixed that Active Records can safely live inside modules [Aredridel]
-
-    class MyApplication::Account < ActiveRecord::Base
-    end
-
-
-_Misc_
-
-* Added freeze call to value object assignments to ensure they remain immutable [Spotted by Gavin Sinclair]
-
-* Changed interface for specifying observed class in observers. Was OBSERVED_CLASS constant, now is
-  observed_class() class method. This is more consistant with things like self.table_name(). Works like this:
-
-    class AuditObserver < ActiveRecord::Observer
-      def self.observed_class() Account end
-      def after_update(account)
-        AuditTrail.new(account, "UPDATED")
-      end
-    end
-
-  [Suggested by Gavin Sinclair]
-
-* Create new Active Record objects by setting the attributes through a block. Like this:
-
-    person = Person.new do |p|
-      p.name = 'Freddy'
-      p.age  = 19
-    end
-
-  [Suggested by Gavin Sinclair]
-
-
-*0.8.2*
-
-* Added inheritable callback queues that can ensure that certain callback methods or inline fragments are
-  run throughout the entire inheritance hierarchy. Regardless of whether a descendant overwrites the callback
-  method:
-
-    class Topic < ActiveRecord::Base
-      before_destroy :destroy_author, 'puts "I'm an inline fragment"'
-    end
-
-  Learn more in link:classes/ActiveRecord/Callbacks.html
-
-* Added :dependent option to has_many and has_one, which will automatically destroy associated objects when
-  the holder is destroyed:
-
-    class Album < ActiveRecord::Base
-      has_many :tracks, :dependent => true
-    end
-
-  All the associated tracks are destroyed when the album is.
-
-* Added Base.create as a factory that'll create, save, and return a new object in one step.
-
-* Automatically convert strings in config hashes to symbols for the _connection methods. This allows you
-  to pass the argument hashes directly from yaml. (Luke)
-
-* Fixed the install.rb to include simple.rb [Spotted by Kevin Bullock]
-
-* Modified block syntax to better follow our code standards outlined in
-  http://www.rubyonrails.org/CodingStandards
-
-
-*0.8.1*
-
-* Added object-level transactions [Austin Ziegler]
-
-* Changed adapter-specific connection methods to use centralized ActiveRecord::Base.establish_connection,
-  which is parametized through a config hash with symbol keys instead of a regular parameter list.
-  This will allow for database connections to be opened in a more generic fashion. (Luke)
-
-  NOTE: This requires all *_connections to be updated! Read more in:
-  http://ar.rubyonrails.org/classes/ActiveRecord/Base.html#M000081
-
-* Fixed SQLite adapter so objects fetched from has_and_belongs_to_many have proper attributes
-  (t.name is now name). [Spotted by Garrett Rooney]
-
-* Fixed SQLite adapter so dates are returned as Date objects, not Time objects [Spotted by Gavin Sinclair]
-
-* Fixed requirement of date class, so date conversions are succesful regardless of whether you
-  manually require date or not.
-
-
-*0.8.0*
-
-* Added transactions
-
-* Changed Base.find to also accept either a list (1, 5, 6) or an array of ids ([5, 7])
-  as parameter and then return an array of objects instead of just an object
-
-* Fixed method has_collection? for has_and_belongs_to_many macro to behave as a
-  collection, not an association
-
-* Fixed SQLite adapter so empty or nil values in columns of datetime, date, or time type
-  aren't treated as current time [Spotted by Gavin Sinclair]
-
-
-*0.7.6*
-
-* Fixed the install.rb to create the lib/active_record/support directory [Spotted by Gavin Sinclair]
-* Fixed that has_association? would always return true [Daniel Von Fange]
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
new file mode 100644
index 0000000000..2b46a6a869
--- /dev/null
+++ b/activerecord/CHANGELOG.md
@@ -0,0 +1,6564 @@
+## Rails 3.2.0 (unreleased) ##
+
+*   Allow the :class_name option for associations to take a symbol (:Client) in addition to
+    a string ('Client').
+
+    This is to avoid confusing newbies, and to be consistent with the fact that other options
+    like :foreign_key already allow a symbol or a string.
+
+    *Jon Leighton*
+
+*   In development mode the db:drop task also drops the test database. For symmetry with
+    the db:create task. *Dmitriy Kiriyenko*
+
+*   Added ActiveRecord::Base.store for declaring simple single-column key/value stores *DHH*
+
+        class User < ActiveRecord::Base
+          store :settings, accessors: [ :color, :homepage ]
+        end
+
+        u = User.new(color: 'black', homepage: '37signals.com')
+        u.color                          # Accessor stored attribute
+        u.settings[:country] = 'Denmark' # Any attribute, even if not specified with an accessor
+
+
+*   MySQL: case-insensitive uniqueness validation avoids calling LOWER when
+    the column already uses a case-insensitive collation. Fixes #561.
+
+    *Joseph Palermo*
+
+*   Transactional fixtures enlist all active database connections. You can test
+    models on different connections without disabling transactional fixtures.
+
+    *Jeremy Kemper*
+
+*   Add first_or_create, first_or_create!, first_or_initialize methods to Active Record. This is a
+    better approach over the old find_or_create_by dynamic methods because it's clearer which
+    arguments are used to find the record and which are used to create it:
+
+        User.where(:first_name => "Scarlett").first_or_create!(:last_name => "Johansson")
+
+    *Andrés Mejía*
+
+*   Fix nested attributes bug where _destroy parameter is taken into account
+    during :reject_if => :all_blank (fixes #2937)
+
+    *Aaron Christy*
+
+## Rails 3.1.2 (unreleased) ##
+
+*   Fix bug where building the conditions of a nested through association could potentially
+    modify the conditions of the through and/or source association. If you have experienced
+    bugs with conditions appearing in the wrong queries when using nested through associations,
+    this probably solves your problems. *GH #3271*
+
+    *Jon Leighton*
+
+*   If a record is removed from a has_many :through, all of the join records relating to that
+    record should also be removed from the through association's target.
+
+    *Jon Leighton*
+
+*   Fix adding multiple instances of the same record to a has_many :through. *GH #3425*
+
+    *Jon Leighton*
+
+*   Fix creating records in a through association with a polymorphic source type. *GH #3247*
+
+    *Jon Leighton*
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   Add deprecation for the preload_associations method. Fixes #3022.
+
+    *Jon Leighton*
+
+*   Don't require a DB connection when loading a model that uses set_primary_key. GH #2807.
+
+    *Jon Leighton*
+
+*   Fix using select() with a habtm association, e.g. Person.friends.select(:name). GH #3030 and
+    \#2923.
+
+    *Hendy Tanata*
+
+*   Fix belongs_to polymorphic with custom primary key on target. GH #3104.
+
+    *Jon Leighton*
+
+*   CollectionProxy#replace should change the DB records rather than just mutating the array.
+    Fixes #3020.
+
+    *Jon Leighton*
+
+*   LRU cache in mysql and sqlite are now per-process caches.
+
+    * lib/active_record/connection_adapters/mysql_adapter.rb: LRU cache  	  keys are per process id.
+    * lib/active_record/connection_adapters/sqlite_adapter.rb: ditto
+    *Aaron Patterson*
+
+*   Support bulk change_table in mysql2 adapter, as well as the mysql one. *Jon Leighton*
+
+*   If multiple parameters are sent representing a date, and some are blank, the
+    resulting object is nil. In previous releases those values defaulted to 1. This    only affects existing but blank parameters, missing ones still raise an error.    [Akira Matsuda]
+*   ActiveRecord::Base.establish_connection now takes a string that contains
+    a URI that specifies the connection configuration.  For example:
+        ActiveRecord::Base.establish_connection 'postgres://localhost/foo'
+
+*   Active Record's dynamic finder will now raise the error if you passing in less number of arguments than what you call in method signature.
+
+    So if you were doing this and expecting the second argument to be nil:
+
+        User.find_by_username_and_group("sikachu")
+
+    You'll now get `ArgumentError: wrong number of arguments (1 for 2).` You'll then have to do this:
+
+        User.find_by_username_and_group("sikachu", nil)
+
+    *Prem Sichanugrist*
+
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   Add a proxy_association method to association proxies, which can be called by association
+    extensions to access information about the association. This replaces proxy_owner etc with
+    proxy_association.owner.
+
+    *Jon Leighton*
+
+*   ActiveRecord::MacroReflection::AssociationReflection#build_record has a new method signature.
+
+    Before: def build_association(*options)
+    After:  def build_association(*options, &block)
+
+    Users who are redefining this method to extend functionality should ensure that the block is
+    passed through to ActiveRecord::Base#new.
+
+    This change is necessary to fix https://github.com/rails/rails/issues/1842.
+
+    *Jon Leighton*
+
+*   AR#pluralize_table_names can be used to singularize/pluralize table name of an individual model:
+
+        class User < ActiveRecord::Base
+          self.pluralize_table_names = false
+        end
+
+    Previously this could only be set globally for all models through ActiveRecord::Base.pluralize_table_names. *Guillermo Iguaran*
+
+*   Add block setting of attributes to singular associations:
+
+        class User < ActiveRecord::Base
+          has_one :account
+        end
+
+        user.build_account{ |a| a.credit_limit => 100.0 }
+
+    The block is called after the instance has been initialized. *Andrew White*
+
+*   Add ActiveRecord::Base.attribute_names to return a list of attribute names. This will return an empty array if the model is abstract or table does not exists. *Prem Sichanugrist*
+
+*   CSV Fixtures are deprecated and support will be removed in Rails 3.2.0
+
+*   AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes! all accept a second hash as option that allows you
+    to specify which role to consider when assigning attributes. This is built on top of ActiveModel's
+    new mass assignment capabilities:
+
+        class Post < ActiveRecord::Base
+          attr_accessible :title
+          attr_accessible :title, :published_at, :as => :admin
+        end
+
+        Post.new(params[:post], :as => :admin)
+
+    assign_attributes() with similar API was also added and attributes=(params, guard) was deprecated.
+
+    Please note that this changes the method signatures for AR#new, AR#create, AR#create!, AR#update_attributes and AR#update_attributes!. If you have overwritten these methods you should update them accordingly.
+
+    *Josh Kalderimis*
+
+*   default_scope can take a block, lambda, or any other object which responds to `call` for lazy
+    evaluation:
+
+        default_scope { ... }
+        default_scope lambda { ... }
+        default_scope method(:foo)
+
+    This feature was originally implemented by Tim Morgan, but was then removed in favour of
+    defining a 'default_scope' class method, but has now been added back in by Jon Leighton.
+    The relevant lighthouse ticket is #1812.
+
+*   Default scopes are now evaluated at the latest possible moment, to avoid problems where
+    scopes would be created which would implicitly contain the default scope, which would then
+    be impossible to get rid of via Model.unscoped.
+
+    Note that this means that if you are inspecting the internal structure of an
+    ActiveRecord::Relation, it will *not* contain the default scope, though the resulting
+    query will do. You can get a relation containing the default scope by calling
+    ActiveRecord#with_default_scope, though this is not part of the public API.
+
+    *Jon Leighton*
+
+*   If you wish to merge default scopes in special ways, it is recommended to define your default
+    scope as a class method and use the standard techniques for sharing code (inheritance, mixins,
+    etc.):
+
+        class Post < ActiveRecord::Base
+          def self.default_scope
+            where(:published => true).where(:hidden => false)
+          end
+        end
+
+    *Jon Leighton*
+
+*   PostgreSQL adapter only supports PostgreSQL version 8.2 and higher.
+
+*   ConnectionManagement middleware is changed to clean up the connection pool
+    after the rack body has been flushed.
+
+*   Added an update_column method on ActiveRecord. This new method updates a given attribute on an object, skipping validations and callbacks.
+    It is recommended to use #update_attribute unless you are sure you do not want to execute any callback, including the modification of
+    the updated_at column. It should not be called on new records.
+    Example:
+
+        User.first.update_column(:name, "sebastian")         # => true
+
+    *Sebastian Martinez*
+
+*   Associations with a :through option can now use *any* association as the
+    through or source association, including other associations which have a
+    :through option and has_and_belongs_to_many associations
+
+    *Jon Leighton*
+
+*   The configuration for the current database connection is now accessible via
+    ActiveRecord::Base.connection_config. *fxn*
+
+*   limits and offsets are removed from COUNT queries unless both are supplied.
+    For example:
+
+        People.limit(1).count           # => 'SELECT COUNT(*) FROM people'
+        People.offset(1).count          # => 'SELECT COUNT(*) FROM people'
+        People.limit(1).offset(1).count # => 'SELECT COUNT(*) FROM people LIMIT 1 OFFSET 1'
+
+    *lighthouse #6262*
+
+*   ActiveRecord::Associations::AssociationProxy has been split. There is now an Association class
+    (and subclasses) which are responsible for operating on associations, and then a separate,
+    thin wrapper called CollectionProxy, which proxies collection associations.
+
+    This prevents namespace pollution, separates concerns, and will allow further refactorings.
+
+    Singular associations (has_one, belongs_to) no longer have a proxy at all. They simply return
+    the associated record or nil. This means that you should not use undocumented methods such
+    as bob.mother.create - use bob.create_mother instead.
+
+    *Jon Leighton*
+
+*   Make has_many :through associations work correctly when you build a record and then save it. This
+    requires you to set the :inverse_of option on the source reflection on the join model, like so:
+
+    class Post < ActiveRecord::Base
+        has_many :taggings
+        has_many :tags, :through => :taggings
+    end
+
+    class Tagging < ActiveRecord::Base
+        belongs_to :post
+        belongs_to :tag, :inverse_of => :tagging # :inverse_of must be set!
+    end
+
+    class Tag < ActiveRecord::Base
+        has_many :taggings
+        has_many :posts, :through => :taggings
+    end
+
+    post = Post.first
+    tag = post.tags.build :name => "ruby"
+    tag.save # will save a Taggable linking to the post
+
+    *Jon Leighton*
+
+*   Support the :dependent option on has_many :through associations. For historical and practical
+    reasons, :delete_all is the default deletion strategy employed by association.delete(*records),
+    despite the fact that the default strategy is :nullify for regular has_many. Also, this only
+    works at all if the source reflection is a belongs_to. For other situations, you should directly
+    modify the through association.
+
+    *Jon Leighton*
+
+*   Changed the behaviour of association.destroy for has_and_belongs_to_many and has_many :through.
+    From now on, 'destroy' or 'delete' on an association will be taken to mean 'get rid of the link',
+    not (necessarily) 'get rid of the associated records'.
+
+    Previously, has_and_belongs_to_many.destroy(*records) would destroy the records themselves. It
+    would not delete any records in the join table. Now, it deletes the records in the join table.
+
+    Previously, has_many_through.destroy(*records) would destroy the records themselves, and the
+    records in the join table. [Note: This has not always been the case; previous version of Rails
+    only deleted the records themselves.] Now, it destroys only the records in the join table.
+
+    Note that this change is backwards-incompatible to an extent, but there is unfortunately no
+    way to 'deprecate' it before changing it. The change is being made in order to have
+    consistency as to the meaning of 'destroy' or 'delete' across the different types of associations.
+
+    If you wish to destroy the records themselves, you can do records.association.each(&:destroy)
+
+    *Jon Leighton*
+
+*   Add :bulk => true option to change_table to make all the schema changes defined in change_table block using a single ALTER statement. *Pratik Naik*
+
+    Example:
+
+    change_table(:users, :bulk => true) do |t|
+        t.string :company_name
+        t.change :birthdate, :datetime
+    end
+
+    This will now result in:
+
+        ALTER TABLE `users` ADD COLUMN `company_name` varchar(255), CHANGE `updated_at` `updated_at` datetime DEFAULT NULL
+
+*   Removed support for accessing attributes on a has_and_belongs_to_many join table. This has been
+    documented as deprecated behaviour since April 2006. Please use has_many :through instead.
+    *Jon Leighton*
+
+*   Added a create_association! method for has_one and belongs_to associations. *Jon Leighton*
+
+*   Migration files generated from model and constructive migration generators
+    (for example, add_name_to_users) use the reversible migration's `change`
+    method instead of the ordinary `up` and `down` methods. *Prem Sichanugrist*
+
+*   Removed support for interpolating string SQL conditions on associations. Instead, you should
+    use a proc, like so:
+
+    Before:
+
+        has_many :things, :conditions => 'foo = #{bar}'
+
+    After:
+
+        has_many :things, :conditions => proc { "foo = #{bar}" }
+
+    Inside the proc, 'self' is the object which is the owner of the association, unless you are
+    eager loading the association, in which case 'self' is the class which the association is within.
+
+    You can have any "normal" conditions inside the proc, so the following will work too:
+
+        has_many :things, :conditions => proc { ["foo = ?", bar] }
+
+    Previously :insert_sql and :delete_sql on has_and_belongs_to_many association allowed you to call
+    'record' to get the record being inserted or deleted. This is now passed as an argument to
+    the proc.
+
+*   Added ActiveRecord::Base#has_secure_password (via ActiveModel::SecurePassword) to encapsulate dead-simple password usage with BCrypt encryption and salting [DHH]. Example:
+
+        # Schema: User(name:string, password_digest:string, password_salt:string)
+        class User < ActiveRecord::Base
+          has_secure_password
+        end
+
+        user = User.new(:name => "david", :password => "", :password_confirmation => "nomatch")
+        user.save                                                      # => false, password required
+        user.password = "mUc3m00RsqyRe"
+        user.save                                                      # => false, confirmation doesn't match
+        user.password_confirmation = "mUc3m00RsqyRe"
+        user.save                                                      # => true
+        user.authenticate("notright")                                  # => false
+        user.authenticate("mUc3m00RsqyRe")                             # => user
+        User.find_by_name("david").try(:authenticate, "notright")      # => nil
+        User.find_by_name("david").try(:authenticate, "mUc3m00RsqyRe") # => user
+
+
+*   When a model is generated add_index is added by default for belongs_to or references columns
+
+    rails g model post user:belongs_to will generate the following:
+
+        class CreatePosts < ActiveRecord::Migration
+          def up
+            create_table :posts do |t|
+              t.belongs_to :user
+              t.timestamps
+            end
+
+            add_index :posts, :user_id
+          end
+
+          def down
+            drop_table :posts
+          end
+        end
+
+    *Santiago Pastorino*
+
+*   Setting the id of a belongs_to object will update the reference to the
+    object. [#2989 state:resolved]
+*   ActiveRecord::Base#dup and ActiveRecord::Base#clone semantics have changed
+    to closer match normal Ruby dup and clone semantics.
+*   Calling ActiveRecord::Base#clone will result in a shallow copy of the record,
+    including copying the frozen state.  No callbacks will be called.
+*   Calling ActiveRecord::Base#dup will duplicate the record, including calling
+    after initialize hooks.  Frozen state will not be copied, and all associations    will be cleared.  A duped record will return true for new_record?, have a nil    id field, and is saveable.
+*   Migrations can be defined as reversible, meaning that the migration system
+    will figure out how to reverse your migration.  To use reversible migrations,    just define the "change" method.  For example:
+        class MyMigration < ActiveRecord::Migration
+          def change
+            create_table(:horses) do
+              t.column :content, :text
+              t.column :remind_at, :datetime
+            end
+          end
+        end
+
+    Some things cannot be automatically reversed for you.  If you know how to    reverse those things, you should define 'up' and 'down' in your migration.  If    you define something in `change` that cannot be reversed, an    IrreversibleMigration exception will be raised when going down.
+*   Migrations should use instance methods rather than class methods:
+        class FooMigration < ActiveRecord::Migration
+          def up
+            ...
+          end
+        end
+
+    *Aaron Patterson*
+
+*   has_one maintains the association with separate after_create/after_update instead
+    of a single after_save. *fxn*
+
+*   The following code:
+
+        Model.limit(10).scoping { Model.count }
+
+    now generates the following SQL:
+
+        SELECT COUNT(*) FROM models LIMIT 10
+
+    This may not return what you want.  Instead, you may with to do something
+    like this:
+
+        Model.limit(10).scoping { Model.all.size }
+
+    *Aaron Patterson*
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   Destroying records via nested attributes works independent of reject_if LH #6006 *Durran Jordan*
+
+*   Delegate any? and many? to Model.scoped for consistency *Andrew White*
+
+*   Quote the ORDER BY clause in batched finds - fixes #6620 *Andrew White*
+
+*   Change exists? so records are not instantiated - fixes #6127. This prevents after_find
+    and after_initialize callbacks being triggered when checking for record existence.
+    *Andrew White*
+
+*   Fix performance bug with attribute accessors which only occurred on Ruby 1.8.7, and ensure we
+    cache type-casted values when the column returned from the db contains non-standard chars.
+    *Jon Leighton*
+
+*   Fix a performance regression introduced here 86acbf1cc050c8fa8c74a10c735e467fb6fd7df8
+    related to read_attribute method *Stian Grytøyr*
+
+
+## Rails 3.0.6 (April 5, 2011) ##
+
+*   Un-deprecate reorder method *Sebastian Martinez*
+
+*   Extensions are applied when calling +except+ or +only+ on relations.
+    Thanks to Iain Hecker.
+
+*   Schemas set in set_table_name are respected by the mysql adapter. LH #5322
+
+*   Fixed a bug when empty? was called on a grouped Relation that wasn't loaded.
+    LH #5829
+
+*   Reapply extensions when using except and only. Thanks Iain Hecker.
+
+*   Binary data is escaped when being inserted to SQLite3 Databases. Thanks
+    Naruse!
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   Model.where(:column => 1).where(:column => 2) will always produce an AND
+    query.
+    *Aaron Patterson*
+
+*   Deprecated support for interpolated association conditions in the form of :conditions => 'foo = #{bar}'.
+
+    Instead, you should use a proc, like so:
+
+    Before:
+
+        has_many :things, :conditions => 'foo = #{bar}'
+
+    After:
+
+        has_many :things, :conditions => proc { "foo = #{bar}" }
+
+    Inside the proc, 'self' is the object which is the owner of the association, unless you are
+    eager loading the association, in which case 'self' is the class which the association is within.
+
+    You can have any "normal" conditions inside the proc, so the following will work too:
+
+        has_many :things, :conditions => proc { ["foo = ?", bar] }
+
+    Previously :insert_sql and :delete_sql on has_and_belongs_to_many association allowed you to call
+    'record' to get the record being inserted or deleted. This is now passed as an argument to
+    the proc.
+
+    *Jon Leighton*
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   Added deprecation warning for has_and_belongs_to_many associations where the join table has
+    additional attributes other than the keys. Access to these attributes is removed in 3.1.
+    Please use has_many :through instead. *Jon Leighton*
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   Support find by class like this: Post.where(:name => Post)
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   Dramatic speed increase (see: http://engineering.attinteractive.com/2010/10/arel-two-point-ohhhhh-yaaaaaa/) *Aaron Patterson*
+
+*   reorder is deprecated in favor of except(:order).order(...) *Santiago Pastorino*
+
+*   except is now AR public API
+
+        Model.order('name').except(:order).order('salary')
+
+    generates:
+
+        SELECT * FROM models ORDER BY salary
+
+    *Santiago Pastorino*
+
+*   The following code:
+
+        Model.limit(10).scoping { Model.count }
+
+    now generates the following SQL:
+
+        SELECT COUNT(*) FROM models LIMIT 10
+
+    This may not return what you want.  Instead, you may with to do something
+    like this:
+
+        Model.limit(10).scoping { Model.all.size }
+
+    *Aaron Patterson*
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   Introduce a fix for CVE-2010-3993
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   Changed update_attribute to not run callbacks and update the record directly in the database *Neeraj Singh*
+
+*   Add scoping and unscoped as the syntax to replace the old with_scope and with_exclusive_scope *José Valim*
+
+*   New rake task, db:migrate:status, displays status of migrations #4947 *Kevin Skoglund*
+
+*   select and order for ActiveRecord now always concatenate nested calls. Use reorder if you want the original order to be overwritten *Santiago Pastorino*
+
+*   PostgreSQL: ensure the database time zone matches Ruby's time zone #4895 *Aaron Patterson*
+
+*   Fixed that ActiveRecord::Base.compute_type would swallow NoMethodError #4751 *Andrew Bloomgarden, Andrew White*
+
+*   Add index length support for MySQL. #1852 *Emili Parreno, Pratik Naik*
+
+    Example:
+
+        add_index(:accounts, :name, :name => 'by_name', :length => 10)
+        => CREATE INDEX by_name ON accounts(name(10))
+
+        add_index(:accounts, [:name, :surname], :name => 'by_name_surname', :length => {:name => 10, :surname => 15})
+        => CREATE INDEX by_name_surname ON accounts(name(10), surname(15))
+
+*   find_or_create_by_attr(value, ...) works when attr is protected.  #4457 *Santiago Pastorino, Marc-André Lafortune*
+
+*   New callbacks: after_commit and after_rollback. Do expensive operations like image thumbnailing after_commit instead of after_save.  #2991 *Brian Durand*
+
+*   Serialized attributes are not converted to YAML if they are any of the formats that can be serialized to XML (like Hash, Array and Strings). *José Valim*
+
+*   Destroy uses optimistic locking. If lock_version on the record you're destroying doesn't match lock_version in the database, a StaleObjectError is raised.  #1966 *Curtis Hawthorne*
+
+*   PostgreSQL: drop support for old postgres driver. Use pg 0.9.0 or later.  *Jeremy Kemper*
+
+*   Observers can prevent records from saving by returning false, just like before_save and friends.  #4087 *Mislav Marohnić*
+
+*   Add Relation extensions. *Pratik Naik*
+
+    users = User.where(:admin => true).extending(User::AdminPowers)
+
+    latest_users = User.order('created_at DESC') do
+        def posts_count
+          Post.count(:user_id => to_a.map(&:id))
+        end
+    end
+
+*   To prefix the table names of all models in a module, define self.table_name_prefix on the module.  #4032 *Andrew White*
+
+*   Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development *DHH*
+
+*   PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns. #3777 *Jack Christensen*
+
+*   Allow relations to be used as scope.
+
+    class Item
+        scope :red, where(:colour => 'red')
+    end
+
+    Item.red.limit(10) # Ten red items
+
+*   Rename named_scope to scope. *Pratik Naik*
+
+*   Changed ActiveRecord::Base.store_full_sti_class to be true by default reflecting the previously announced Rails 3 default *DHH*
+
+*   Add Relation#except. *Pratik Naik*
+
+    one_red_item = Item.where(:colour => 'red').limit(1)
+    all_items = one_red_item.except(:where, :limit)
+
+*   Add Relation#delete_all. *Pratik Naik*
+
+    Item.where(:colour => 'red').delete_all
+
+*   Add Model.having and Relation#having. *Pratik Naik*
+
+    Developer.group("salary").having("sum(salary) >  10000").select("salary")
+
+*   Add Relation#count. *Pratik Naik*
+
+    legends = People.where("age > 100")
+    legends.count
+    legends.count(:age, :distinct => true)
+    legends.select('id').count
+
+*   Add Model.readonly and association_collection#readonly finder method. *Pratik Naik*
+
+    Post.readonly.to_a # Load all posts in readonly mode
+    @user.items.readonly(false).to_a # Load all the user items in writable mode
+
+*   Add .lock finder method *Pratik Naik*
+
+    User.lock.where(:name => 'lifo').to_a
+
+    old_items = Item.where("age > 100")
+    old_items.lock.each {|i| .. }
+
+*   Add Model.from and association_collection#from finder methods *Pratik Naik*
+
+    user = User.scoped
+    user.select('*').from('users, items')
+
+*   Add relation.destroy_all *Pratik Naik*
+
+    old_items = Item.where("age > 100")
+    old_items.destroy_all
+
+*   Add relation.exists? *Pratik Naik*
+
+    red_items = Item.where(:colours => 'red')
+    red_items.exists?
+    red_items.exists?(1)
+
+*   Add find(ids) to relations. *Pratik Naik*
+
+    old_users = User.order("age DESC")
+    old_users.find(1)
+    old_users.find(1, 2, 3)
+
+*   Add new finder methods to association collection. *Pratik Naik*
+
+    class User < ActiveRecord::Base
+        has_many :items
+    end
+
+    user = User.first
+    user.items.where(:items => {:colour => 'red'})
+    user.items.select('items.id')
+
+*   Add relation.reload to force reloading the records. *Pratik Naik*
+
+    topics = Topic.scoped
+    topics.to_a  # force load
+    topics.first # returns a cached record
+    topics.reload
+    topics.first # Fetches a new record from the database
+
+*   Rename Model.conditions and relation.conditions to .where. *Pratik Naik*
+
+    Before :
+        User.conditions(:name => 'lifo')
+        User.select('id').conditions(["age > ?", 21])
+
+    Now :
+        User.where(:name => 'lifo')
+        User.select('id').where(["age > ?", 21])
+
+*   Add Model.select/group/order/limit/joins/conditions/preload/eager_load class methods returning a lazy relation. *Pratik Naik*
+
+    Examples :
+
+        posts = Post.select('id).order('name') # Returns a lazy relation
+        posts.each {|p| puts p.id } # Fires "select id from posts order by name"
+
+*   Model.scoped now returns a relation if invoked without any arguments. *Pratik Naik*
+
+    Example :
+
+        posts = Post.scoped
+        posts.size # Fires "select count(*) from  posts" and returns the count
+        posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
+
+*   Association inverses for belongs_to, has_one, and has_many. Optimization to reduce database queries.  #3533 *Murray Steele*
+
+        # post.comments sets each comment's post without needing to :include
+        class Post < ActiveRecord::Base
+          has_many :comments, :inverse_of => :post
+        end
+
+*   MySQL: add_ and change_column support positioning.  #3286 *Ben Marini*
+
+*   Reset your Active Record counter caches with the reset_counter_cache class method.  #1211 *Mike Breen, Gabe da Silveira*
+
+*   Remove support for SQLite 2. Please upgrade to SQLite 3+ or install the plugin from git://github.com/rails/sqlite2_adapter.git *Pratik Naik*
+
+*   PostgreSQL: XML datatype support.  #1874 *Leonardo Borges*
+
+*   quoted_date converts time-like objects to ActiveRecord::Base.default_timezone before serialization. This allows you to use Time.now in find conditions and have it correctly be serialized as the current time in UTC when default_timezone == :utc. #2946 *Geoff Buesing*
+
+*   SQLite: drop support for 'dbfile' option in favor of 'database.'  #2363 *Paul Hinze, Jeremy Kemper*
+
+*   Added :primary_key option to belongs_to associations.  #765 *Szymon Nowak, Philip Hallstrom, Noel Rocha*
+        # employees.company_name references companies.name
+        Employee.belongs_to :company, :primary_key => 'name', :foreign_key => 'company_name'
+
+*   Implement #many? for NamedScope and AssociationCollection using #size. #1500 *Chris Kampmeier*
+
+*   Added :touch option to belongs_to associations that will touch the parent record when the current record is saved or destroyed *DHH*
+
+*   Added ActiveRecord::Base#touch to update the updated_at/on attributes (or another specified timestamp) with the current time *DHH*
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+*   Added ActiveRecord::Base.find_each and ActiveRecord::Base.find_in_batches for batch processing *DHH/Jamis Buck*
+
+*   Added that ActiveRecord::Base.exists? can be called with no arguments #1817 *Scott Taylor*
+
+*   Add Support for updating deeply nested models from a single form. #1202 *Eloy Duran*
+
+    class Book < ActiveRecord::Base
+        has_one :author
+        has_many :pages
+
+        accepts_nested_attributes_for :author, :pages
+    end
+
+*   Make after_save callbacks fire only if the record was successfully saved.  #1735 *Michael Lovitt*
+
+    Previously the callbacks would fire if a before_save cancelled saving.
+
+*   Support nested transactions using database savepoints.  #383 *Jonathan Viney, Hongli Lai*
+
+*   Added dynamic scopes ala dynamic finders #1648 *Yaroslav Markin*
+
+*   Fixed that ActiveRecord::Base#new_record? should return false (not nil) for existing records #1219 *Yaroslav Markin*
+
+*   I18n the word separator for error messages. Introduces the activerecord.errors.format.separator translation key.  #1294 *Akira Matsuda*
+
+*   Add :having as a key to find and the relevant associations.  *Emilio Tagua*
+
+*   Added default_scope to Base #1381 [Paweł Kondzior]. Example:
+
+        class Person < ActiveRecord::Base
+          default_scope :order => 'last_name, first_name'
+        end
+
+        class Company < ActiveRecord::Base
+          has_many :people
+        end
+
+        Person.all             # => Person.find(:all, :order => 'last_name, first_name')
+        Company.find(1).people # => Person.find(:all, :order => 'last_name, first_name', :conditions => { :company_id => 1 })
+
+
+## 2.2.1 RC2 (November 14th, 2008) ##
+
+*   Ensure indices don't flip order in schema.rb #1266 *Jordi Bunster*
+
+*   Fixed that serialized strings should never be type-casted (i.e. turning "Yes" to a boolean) #857 *Andreas Korth*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+*   Skip collection ids reader optimization if using :finder_sql *Jeremy Kemper*
+
+*   Add Model#delete instance method, similar to Model.delete class method. #1086 *Hongli Lai (Phusion)*
+
+*   MySQL: cope with quirky default values for not-null text columns.  #1043 *Frederick Cheung*
+
+*   Multiparameter attributes skip time zone conversion for time-only columns [#1030 state:resolved] *Geoff Buesing*
+
+*   Base.skip_time_zone_conversion_for_attributes uses class_inheritable_accessor, so that subclasses don't overwrite Base [#346 state:resolved] *Emilio Tagua*
+
+*   Added find_last_by dynamic finder #762 *Emilio Tagua*
+
+*   Internal API: configurable association options and build_association method for reflections so plugins may extend and override.  #985 *Hongli Lai (Phusion)*
+
+*   Changed benchmarks to be reported in milliseconds *David Heinemeier Hansson*
+
+*   Connection pooling.  #936 *Nick Sieger*
+
+*   Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code!  #501 *Andrew White*
+
+*   before_save, before_validation and before_destroy callbacks that return false will now ROLLBACK the transaction.  Previously this would have been committed before the processing was aborted. #891 *Xavier Noria*
+
+*   Transactional migrations for databases which support them.  #834 *divoxx, Adam Wiggins, Tarmo Tänav*
+
+*   Set config.active_record.timestamped_migrations = false to have migrations with numeric prefix instead of UTC timestamp. #446. *Andrew Stone, Nik Wakelin*
+
+*   change_column_default preserves the not-null constraint.  #617 *Tarmo Tänav*
+
+*   Fixed that create database statements would always include "DEFAULT NULL" (Nick Sieger) *#334*
+
+*   Add :tokenizer option to validates_length_of to specify how to split up the attribute string. #507. [David Lowenfels] Example :
+
+    \# Ensure essay contains at least 100 words.
+    validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least %d words."), :tokenizer => lambda {|str| str.scan(/\w+/) }
+
+*   Allow conditions on multiple tables to be specified using hash. [Pratik Naik]. Example:
+
+    User.all :joins => :items, :conditions => { :age => 10, :items => { :color => 'black' } }
+    Item.first :conditions => { :items => { :color => 'red' } }
+
+*   Always treat integer :limit as byte length.  #420 *Tarmo Tänav*
+
+*   Partial updates don't update lock_version if nothing changed.  #426 *Daniel Morrison*
+
+*   Fix column collision with named_scope and :joins.  #46 *Duncan Beevers, Mark Catley*
+
+*   db:migrate:down and :up update schema_migrations.  #369 *Michael Raidel, RaceCondition*
+
+*   PostgreSQL: support :conditions => [':foo::integer', { :foo => 1 }] without treating the ::integer typecast as a bind variable.  *Tarmo Tänav*
+
+*   MySQL: rename_column preserves column defaults.  #466 *Diego Algorta*
+
+*   Add :from option to calculations.  #397 *Ben Munat*
+
+*   Add :validate option to associations to enable/disable the automatic validation of associated models. Resolves #301. *Jan De Poorter*
+
+*   PostgreSQL: use 'INSERT ... RETURNING id' for 8.2 and later.  *Jeremy Kemper*
+
+*   Added SQL escaping for :limit and :offset in MySQL *Jonathan Wiess*
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+*   Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. *Rick Olson*
+
+*   Add first/last methods to associations/named_scope. Resolved #226. *Ryan Bates*
+
+*   Added SQL escaping for :limit and :offset #288 *Aaron Bedra, Steven Bristol, Jonathan Wiess*
+
+*   Added first/last methods to associations/named_scope. Resolved #226. *Ryan Bates*
+
+*   Ensure hm:t preloading honours reflection options. Resolves #137. *Frederick Cheung*
+
+*   Added protection against duplicate migration names (Aslak Hellesøy) *#112*
+
+*   Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true *Geoff Buesing*
+
+*   Time zone aware attribute methods use Time.zone.parse instead of #to_time for String arguments, so that offset information in String is respected. Resolves #105. *Scott Fleckenstein, Geoff Buesing*
+
+*   Added change_table for migrations (Jeff Dean) [#71]. Example:
+
+        change_table :videos do |t|
+          t.timestamps                          # adds created_at, updated_at
+          t.belongs_to :goat                    # adds goat_id integer
+          t.string :name, :email, :limit => 20  # adds name and email both with a 20 char limit
+          t.remove :name, :email                # removes the name and email columns
+        end
+
+*   Fixed has_many :through .create with no parameters caused a "can't dup NilClass" error (Steven Soroka) *#85*
+
+*   Added block-setting of attributes for Base.create like Base.new already has (Adam Meehan) *#39*
+
+*   Fixed that pessimistic locking you reference the quoted table name (Josh Susser) *#67*
+
+*   Fixed that change_column should be able to use :null => true on a field that formerly had false [Nate Wiger] *#26*
+
+*   Added that the MySQL adapter should map integer to either smallint, int, or bigint depending on the :limit just like PostgreSQL *David Heinemeier Hansson*
+
+*   Change validates_uniqueness_of :case_sensitive option default back to true (from [9160]).  Love your database columns, don't LOWER them.  *Rick Olson*
+
+*   Add support for interleaving migrations by storing which migrations have run in the new schema_migrations table. Closes #11493 *Jordi Bunster*
+
+*   ActiveRecord::Base#sum defaults to 0 if no rows are returned.  Closes #11550 *Kamal Fariz Mahyuddin*
+
+*   Ensure that respond_to? considers dynamic finder methods. Closes #11538. *James Mead*
+
+*   Ensure that save on parent object fails for invalid has_one association. Closes #10518. *Pratik Naik*
+
+*   Remove duplicate code from associations. *Pratik Naik*
+
+*   Refactor HasManyThroughAssociation to inherit from HasManyAssociation. Association callbacks and <association>_ids= now work with hm:t. #11516 *Ruy Asan*
+
+*   Ensure HABTM#create and HABTM#build do not load entire association. *Pratik Naik*
+
+*   Improve documentation. *Xavier Noria, Jack Danger Canty, leethal*
+
+*   Tweak ActiveRecord::Base#to_json to include a root value in the returned hash: {"post": {"title": ...}} *Rick Olson*
+
+    Post.find(1).to_json # => {"title": ...}
+    config.active_record.include_root_in_json = true
+    Post.find(1).to_json # => {"post": {"title": ...}}
+
+*   Add efficient #include? to AssociationCollection (for has_many/has_many :through/habtm).  *stopdropandrew*
+
+*   PostgreSQL: create_ and drop_database support.  #9042 *ez, pedz, Nick Sieger*
+
+*   Ensure that validates_uniqueness_of works with with_scope. Closes #9235. *Nik Wakelin, cavalle*
+
+*   Partial updates include only unsaved attributes. Off by default; set YourClass.partial_updates = true to enable.  *Jeremy Kemper*
+
+*   Removing unnecessary uses_tzinfo helper from tests, given that TZInfo is now bundled *Geoff Buesing*
+
+*   Fixed that validates_size_of :within works in associations #11295, #10019 *cavalle*
+
+*   Track changes to unsaved attributes.  *Jeremy Kemper*
+
+*   Switched to UTC-timebased version numbers for migrations and the schema. This will as good as eliminate the problem of multiple migrations getting the same version assigned in different branches. Also added rake db:migrate:up/down to apply individual migrations that may need to be run when you merge branches #11458 *John Barnette*
+
+*   Fixed that has_many :through would ignore the hash conditions #11447 *Emilio Tagua*
+
+*   Fix issue where the :uniq option of a has_many :through association is ignored when find(:all) is called.  Closes #9407 *cavalle*
+
+*   Fix duplicate table alias error when including an association with a has_many :through association on the same join table.  Closes #7310 *cavalle*
+
+*   More efficient association preloading code that compacts a through_records array in a central location.  Closes #11427 *Jack Danger Canty*
+
+*   Improve documentation. *Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert*
+
+*   Fixed that ActiveRecord#Base.find_or_create/initialize would not honor attr_protected/accessible when used with a hash #11422 *Emilio Tagua*
+
+*   Added ActiveRecord#Base.all/first/last as aliases for find(:all/:first/:last) #11413 *nkallen, Chris O'Sullivan*
+
+*   Merge the has_finder gem, renamed as 'named_scope'.  #11404 *nkallen*
+
+    class Article < ActiveRecord::Base
+        named_scope :published, :conditions => {:published => true}
+        named_scope :popular, :conditions => ...
+    end
+
+    Article.published.paginate(:page => 1)
+    Article.published.popular.count
+    Article.popular.find(:first)
+    Article.popular.find(:all, :conditions => {...})
+
+    See http://pivots.pivotallabs.com/users/nick/blog/articles/284-hasfinder-it-s-now-easier-than-ever-to-create-complex-re-usable-sql-queries
+
+*   Add has_one :through support.  #4756 *Chris O'Sullivan*
+
+*   Migrations: create_table supports primary_key_prefix_type.  #10314 *student, Chris O'Sullivan*
+
+*   Added logging for dependency load errors with fixtures #11056 *stuthulhu*
+
+*   Time zone aware attributes use Time#in_time_zone *Geoff Buesing*
+
+*   Fixed that scoped joins would not always be respected #6821 *Theory/Jack Danger Canty*
+
+*   Ensure that ActiveRecord::Calculations disambiguates field names with the table name.  #11027 *cavalle*
+
+*   Added add/remove_timestamps to the schema statements for adding the created_at/updated_at columns on existing tables #11129 *jramirez*
+
+*   Added ActiveRecord::Base.find(:last) #11338 *Emilio Tagua*
+
+*   test_native_types expects DateTime.local_offset instead of DateTime.now.offset; fixes test breakage due to dst transition *Geoff Buesing*
+
+*   Add :readonly option to HasManyThrough associations. #11156 *Emilio Tagua*
+
+*   Improve performance on :include/:conditions/:limit queries by selectively joining in the pre-query.  #9560 *dasil003*
+
+*   Perf fix: Avoid the use of named block arguments.  Closes #11109 *adymo*
+
+*   PostgreSQL: support server versions 7.4 through 8.0 and the ruby-pg driver.  #11127 *jdavis*
+
+*   Ensure association preloading doesn't break when an association returns nil. ##11145 *GMFlash*
+
+*   Make dynamic finders respect the :include on HasManyThrough associations.  #10998. *cpytel*
+
+*   Base#instantiate_time_object only uses Time.zone when Base.time_zone_aware_attributes is true; leverages Time#time_with_datetime_fallback for readability *Geoff Buesing*
+
+*   Refactor ConnectionAdapters::Column.new_time: leverage DateTime failover behavior of Time#time_with_datetime_fallback *Geoff Buesing*
+
+*   Improve associations performance by using symbol callbacks instead of string callbacks. #11108 *adymo*
+
+*   Optimise the BigDecimal conversion code.  #11110 *adymo*
+
+*   Introduce the :readonly option to all associations. Records from the association cannot be saved.  #11084 *Emilio Tagua*
+
+*   Multiparameter attributes for time columns fail over to DateTime when out of range of Time *Geoff Buesing*
+
+*   Base#instantiate_time_object uses Time.zone.local() *Geoff Buesing*
+
+*   Add timezone-aware attribute readers and writers. #10982 *Geoff Buesing*
+
+*   Instantiating time objects in multiparameter attributes uses Time.zone if available.  #10982 *Rick Olson*
+
+*   Add note about how ActiveRecord::Observer classes are initialized in a Rails app. #10980 *Xavier Noria*
+
+*   MySQL: omit text/blob defaults from the schema instead of using an empty string.  #10963 *mdeiters*
+
+*   belongs_to supports :dependent => :destroy and :delete.  #10592 *Jonathan Viney*
+
+*   Introduce preload query strategy for eager :includes.  #9640 *Frederick Cheung, Aliaksey Kandratsenka, codafoo*
+
+*   Support aggregations in finder conditions.  #10572 *Ryan Kinderman*
+
+*   Organize and clean up the Active Record test suite.  #10742 *John Barnette*
+
+*   Ensure that modifying has_and_belongs_to_many actions clear the query cache.  Closes #10840 *john.andrews*
+
+*   Fix issue where Table#references doesn't pass a :null option to a *_type attribute for polymorphic associations.  Closes #10753 *railsjitsu*
+
+*   Fixtures: removed support for the ancient pre-YAML file format.  #10736 *John Barnette*
+
+*   More thoroughly quote table names.  #10698 *dimdenis, lotswholetime, Jeremy Kemper*
+
+*   update_all ignores scoped :order and :limit, so post.comments.update_all doesn't try to include the comment order in the update statement.  #10686 *Brendan Ribera*
+
+*   Added ActiveRecord::Base.cache_key to make it easier to cache Active Records in combination with the new ActiveSupport::Cache::* libraries *David Heinemeier Hansson*
+
+*   Make sure CSV fixtures are compatible with ruby 1.9's new csv implementation. *JEG2*
+
+*   Added by parameter to increment, decrement, and their bang varieties so you can do player1.increment!(:points, 5) #10542 *Sam*
+
+*   Optimize ActiveRecord::Base#exists? to use #select_all instead of #find.  Closes #10605 *jamesh, Frederick Cheung, protocool*
+
+*   Don't unnecessarily load has_many associations in after_update callbacks.  Closes #6822 *stopdropandrew, canadaduane*
+
+*   Eager belongs_to :include infers the foreign key from the association name rather than the class name.  #10517 *Jonathan Viney*
+
+*   SQLite: fix rename_ and remove_column for columns with unique indexes.  #10576 *Brandon Keepers*
+
+*   Ruby 1.9 compatibility.  #10655 *Jeremy Kemper, Dirkjan Bussink*
+
+
+## 2.0.2 (December 16th, 2007) ##
+
+*   Ensure optimistic locking handles nil #lock_version values properly.  Closes #10510 *Rick Olson*
+
+*   Make the Fixtures Test::Unit enhancements more supporting for double-loaded test cases.  Closes #10379 *brynary*
+
+*   Fix that validates_acceptance_of still works for non-existent tables (useful for bootstrapping new databases).  Closes #10474 *Josh Susser*
+
+*   Ensure that the :uniq option for has_many :through associations retains the order.  #10463 *remvee*
+
+*   Base.exists? doesn't rescue exceptions to avoid hiding SQL errors.  #10458 *Michael Klishin*
+
+*   Documentation: Active Record exceptions, destroy_all and delete_all.  #10444, #10447 *Michael Klishin*
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+*   Removed query cache rescue as it could cause code to be run twice (closes #10408) *David Heinemeier Hansson*
+
+
+## 2.0.0 (December 6th, 2007) ##
+
+*   Anchor DateTimeTest to fixed DateTime instead of a variable value based on Time.now#advance#to_datetime, so that this test passes on 64-bit platforms running Ruby 1.8.6+ *Geoff Buesing*
+
+*   Fixed that the Query Cache should just be ignored if the database is misconfigured (so that the "About your applications environment" works even before the database has been created) *David Heinemeier Hansson*
+
+*   Fixed that the truncation of strings longer than 50 chars should use inspect
+    so newlines etc are escaped #10385 [Norbert Crombach]
+*   Fixed that habtm associations should be able to set :select as part of their definition and have that honored *David Heinemeier Hansson*
+
+*   Document how the :include option can be used in Calculations::calculate.  Closes #7446 *adamwiggins, ultimoamore*
+
+*   Fix typo in documentation for polymorphic associations w/STI. Closes #7461 *johnjosephbachir*
+
+*   Reveal that the type option in migrations can be any supported column type for your database but also include caveat about agnosticism. Closes #7531 *adamwiggins, mikong*
+
+*   More complete documentation for find_by_sql. Closes #7912 *fearoffish*
+
+*   Added ActiveRecord::Base#becomes to turn a record into one of another class (mostly relevant for STIs) [David Heinemeier Hansson]. Example:
+
+        render :partial => @client.becomes(Company) # renders companies/company instead of clients/client
+
+*   Fixed that to_xml should not automatically pass :procs to associations included with :include #10162 *Cheah Chu Yeow*
+
+*   Fix documentation typo introduced in [8250]. Closes #10339 *Henrik N*
+
+*   Foxy fixtures: support single-table inheritance.  #10234 *tom*
+
+*   Foxy fixtures: allow mixed usage to make migration easier and more attractive.  #10004 *lotswholetime*
+
+*   Make the record_timestamps class-inheritable so it can be set per model.  #10004 *tmacedo*
+
+*   Allow validates_acceptance_of to use a real attribute instead of only virtual (so you can record that the acceptance occured) #7457 *ambethia*
+
+*   DateTimes use Ruby's default calendar reform setting. #10201 *Geoff Buesing*
+
+*   Dynamic finders on association collections respect association :order and :limit.  #10211, #10227 *Patrick Joyce, Rick Olson, Jack Danger Canty*
+
+*   Add 'foxy' support for fixtures of polymorphic associations. #10183 *John Barnette, David Lowenfels*
+
+*   validates_inclusion_of and validates_exclusion_of allow formatted :message strings.  #8132 *devrieda, Mike Naberezny*
+
+*   attr_readonly behaves well with optimistic locking.  #10188 *Nick Bugajski*
+
+*   Base#to_xml supports the nil="true" attribute like Hash#to_xml.  #8268 *Jonathan del Strother*
+
+*   Change plings to the more conventional quotes in the documentation. Closes #10104 *Jack Danger Canty*
+
+*   Fix HasManyThrough Association so it uses :conditions on the HasMany Association.  Closes #9729 *Jack Danger Canty*
+
+*   Ensure that column names are quoted.  Closes #10134 *wesley.moxam*
+
+*   Smattering of grammatical fixes to documentation. Closes #10083 *Bob Silva*
+
+*   Enhance explanation with more examples for attr_accessible macro. Closes #8095 *fearoffish, Marcel Molina Jr.*
+
+*   Update association/method mapping table to refected latest collection methods for has_many :through. Closes #8772 *Pratik Naik*
+
+*   Explain semantics of having several different AR instances in a transaction block. Closes #9036 *jacobat, Marcel Molina Jr.*
+
+*   Update Schema documentation to use updated sexy migration notation. Closes #10086 *Sam Granieri*
+
+*   Make fixtures work with the new test subclasses. *Tarmo Tänav, Michael Koziarski*
+
+*   Introduce finder :joins with associations. Same :include syntax but with inner rather than outer joins.  #10012 *RubyRedRick*
+        # Find users with an avatar
+        User.find(:all, :joins => :avatar)
+
+        # Find posts with a high-rated comment.
+        Post.find(:all, :joins => :comments, :conditions => 'comments.rating > 3')
+
+*   Associations: speedup duplicate record check.  #10011 *Pratik Naik*
+
+*   Make sure that << works on has_many associations on unsaved records.  Closes #9989 *Josh Susser*
+
+*   Allow association redefinition in subclasses.  #9346 *wildchild*
+
+*   Fix has_many :through delete with custom foreign keys.  #6466 *naffis*
+
+*   Foxy fixtures, from rathole (http://svn.geeksomnia.com/rathole/trunk/README)
+        - stable, autogenerated IDs
+        - specify associations (belongs_to, has_one, has_many) by label, not ID
+        - specify HABTM associations as inline lists
+        - autofill timestamp columns
+        - support YAML defaults
+        - fixture label interpolation
+    Enabled for fixtures that correspond to a model class and don't specify a primary key value.  #9981 *John Barnette*
+
+*   Add docs explaining how to protect all attributes using attr_accessible with no arguments. Closes #9631 *boone, rmm5t*
+
+*   Update add_index documentation to use new options api. Closes #9787 *Kamal Fariz Mahyuddin*
+
+*   Allow find on a has_many association defined with :finder_sql to accept id arguments as strings like regular find does. Closes #9916 *krishna*
+
+*   Use VALID_FIND_OPTIONS when resolving :find scoping rather than hard coding the list of valid find options. Closes #9443 *sur*
+
+*   Limited eager loading no longer ignores scoped :order. Closes #9561 *Jack Danger Canty, Josh Peek*
+
+*   Assigning an instance of a foreign class to a composed_of aggregate calls an optional conversion block. Refactor and simplify composed_of implementation.  #6322 *brandon, Chris Cruft*
+
+*   Assigning nil to a composed_of aggregate also sets its immediate value to nil.  #9843 *Chris Cruft*
+
+*   Ensure that mysql quotes table names with database names correctly.  Closes #9911 *crayz*
+
+    "foo.bar" => "`foo`.`bar`"
+
+*   Complete the assimilation of Sexy Migrations from ErrFree *Chris Wanstrath, PJ Hyett*
+    http://errtheblog.com/post/2381
+
+*   Qualified column names work in hash conditions, like :conditions => { 'comments.created_at' => ... }.  #9733 *Jack Danger Canty*
+
+*   Fix regression where the association would not construct new finder SQL on save causing bogus queries for "WHERE owner_id = NULL" even after owner was saved.  #8713 *Bryan Helmkamp*
+
+*   Refactor association create and build so before & after callbacks behave consistently.  #8854 *Pratik Naik, mortent*
+
+*   Quote table names. Defaults to column quoting.  #4593 *Justin Lynn, gwcoffey, eadz, Dmitry V. Sabanin, Jeremy Kemper*
+
+*   Alias association #build to #new so it behaves predictably.  #8787 *Pratik Naik*
+
+*   Add notes to documentation regarding attr_readonly behavior with counter caches and polymorphic associations.  Closes #9835 *saimonmoore, Rick Olson*
+
+*   Observers can observe model names as symbols properly now.  Closes #9869  *queso*
+
+*   find_and_(initialize|create)_by methods can now properly initialize protected attributes *Tobias Lütke*
+
+*   belongs_to infers the foreign key from the association name instead of from the class name.  *Jeremy Kemper*
+
+*   PostgreSQL: support multiline default values.  #7533 *Carl Lerche, aguynamedryan, Rein Henrichs, Tarmo Tänav*
+
+*   MySQL: fix change_column on not-null columns that don't accept dfeault values of ''.  #6663 *Jonathan Viney, Tarmo Tänav*
+
+*   validates_uniqueness_of behaves well with abstract superclasses and
+    single-table inheritance.  #3833, #9886 [Gabriel Gironda, rramdas, François Beausoleil, Josh Peek, Tarmo Tänav, pat]
+*   Warn about protected attribute assigments in development and test environments when mass-assigning to an attr_protected attribute.  #9802 *Henrik N*
+
+*   Speedup database date/time parsing.  *Jeremy Kemper, Tarmo Tänav*
+
+*   Fix calling .clear on a has_many :dependent=>:delete_all association. *Tarmo Tänav*
+
+*   Allow change_column to set NOT NULL in the PostgreSQL adapter *Tarmo Tänav*
+
+*   Fix that ActiveRecord would create attribute methods and override custom attribute getters if the method is also defined in Kernel.methods. *Rick Olson*
+
+*   Don't call attr_readonly on polymorphic belongs_to associations, in case it matches the name of some other non-ActiveRecord class/module.  *Rick Olson*
+
+*   Try loading activerecord-<adaptername>-adapter gem before trying a plain require so you can use custom gems for the bundled adapters. Also stops gems from requiring an adapter from an old Active Record gem.  *Jeremy Kemper, Derrick Spell*
+
+
+## 2.0.0 Preview Release (September 29th, 2007) Includes duplicates of changes from 1.14.2 - 1.15.3 ##
+
+*   Add attr_readonly to specify columns that are skipped during a normal ActiveRecord #save operation. Closes #6896 *Dan Manges*
+
+    class Comment < ActiveRecord::Base
+        # Automatically sets Article#comments_count as readonly.
+        belongs_to :article, :counter_cache => :comments_count
+    end
+
+    class Article < ActiveRecord::Base
+        attr_readonly :approved_comments_count
+    end
+
+*   Make size for has_many :through use counter cache if it exists.  Closes #9734 *Xavier Shay*
+
+*   Remove DB2 adapter since IBM chooses to maintain their own adapter instead.  *Jeremy Kemper*
+
+*   Extract Oracle, SQLServer, and Sybase adapters into gems.  *Jeremy Kemper*
+
+*   Added fixture caching that'll speed up a normal fixture-powered test suite between 50% and 100% #9682 *Frederick Cheung*
+
+*   Correctly quote id list for limited eager loading.  #7482 *tmacedo*
+
+*   Fixed that using version-targetted migrates would fail on loggers other than the default one #7430 *valeksenko*
+
+*   Fixed rename_column for SQLite when using symbols for the column names #8616 *drodriguez*
+
+*   Added the possibility of using symbols in addition to concrete classes with ActiveRecord::Observer#observe.  #3998 *Robby Russell, Tarmo Tänav*
+
+*   Added ActiveRecord::Base#to_json/from_json *David Heinemeier Hansson, Cheah Chu Yeow*
+
+*   Added ActiveRecord::Base#from_xml [David Heinemeier Hansson]. Example:
+
+        xml = "<person><name>David</name></person>"
+        Person.new.from_xml(xml).name # => "David"
+
+*   Define dynamic finders as real methods after first usage. *bscofield*
+
+*   Deprecation: remove deprecated threaded_connections methods. Use allow_concurrency instead.  *Jeremy Kemper*
+
+*   Associations macros accept extension blocks alongside modules.  #9346 *Josh Peek*
+
+*   Speed up and simplify query caching.  *Jeremy Kemper*
+
+*   connection.select_rows 'sql' returns an array (rows) of arrays (field values).  #2329 *Michael Schuerig*
+
+*   Eager loading respects explicit :joins.  #9496 *dasil003*
+
+*   Extract Firebird, FrontBase, and OpenBase adapters into gems.  #9508, #9509, #9510 *Jeremy Kemper*
+
+*   RubyGem database adapters: expects a gem named activerecord-<database>-adapter with active_record/connection_adapters/<database>_adapter.rb in its load path.  *Jeremy Kemper*
+
+*   Fixed that altering join tables in migrations would fail w/ sqlite3 #7453 *TimoMihaljov/brandon*
+
+*   Fix association writer with :dependent => :nullify.  #7314 *Jonathan Viney*
+
+*   OpenBase: update for new lib and latest Rails. Support migrations.  #8748 *dcsesq*
+
+*   Moved acts_as_tree into a plugin of the same name on the official Rails svn.  #9514 *Pratik Naik*
+
+*   Moved acts_as_nested_set into a plugin of the same name on the official Rails svn.  #9516 *Josh Peek*
+
+*   Moved acts_as_list into a plugin of the same name on the official Rails svn.  *Josh Peek*
+
+*   Explicitly require active_record/query_cache before using it.  *Jeremy Kemper*
+
+*   Fix bug where unserializing an attribute attempts to modify a frozen @attributes hash for a deleted record.  *Rick Olson, marclove*
+
+*   Performance: absorb instantiate and initialize_with_callbacks into the Base methods. *Jeremy Kemper*
+
+*   Fixed that eager loading queries and with_scope should respect the :group option *David Heinemeier Hansson*
+
+*   Improve performance and functionality of the postgresql adapter.  Closes #8049 *roderickvd*
+
+    For more information see: http://dev.rubyonrails.org/ticket/8049
+
+*   Don't clobber includes passed to has_many.count *Jack Danger Canty*
+
+*   Make sure has_many uses :include when counting *Jack Danger Canty*
+
+*   Change the implementation of ActiveRecord's attribute reader and writer methods *Michael Koziarski*
+    - Generate Reader and Writer methods which cache attribute values in hashes.  This is to avoid repeatedly parsing the same date or integer columns.    - Change exception raised when users use find with :select then try to access a skipped column.  Plugins could override missing_attribute() to lazily load the columns.    - Move method definition to the class, instead of the instance    - Always generate the readers, writers and predicate methods.
+*   Perform a deep #dup on query cache results so that modifying activerecord attributes does not modify the cached attributes.  *Rick Olson*
+
+    \# Ensure that has_many :through associations use a count query instead of loading the target when #size is called.  Closes #8800 [Pratik Naik]
+*   Added :unless clause to validations #8003 [monki]. Example:
+
+        def using_open_id?
+          !identity_url.blank?
+        end
+
+        validates_presence_of :identity_url, :if => using_open_id?
+        validates_presence_of :username, :unless => using_open_id?
+        validates_presence_of :password, :unless => using_open_id?
+
+*   Fix #count on a has_many :through association so that it recognizes the :uniq option.  Closes #8801 *Pratik Naik*
+
+*   Fix and properly document/test count(column_name) usage. Closes #8999 *Pratik Naik*
+
+*   Remove deprecated count(conditions=nil, joins=nil) usage.  Closes #8993 *Pratik Naik*
+
+*   Change belongs_to so that the foreign_key assumption is taken from the association name, not the class name.  Closes #8992 *Josh Susser*
+
+    OLD
+        belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is user_id
+
+    NEW
+        belongs_to :visitor, :class_name => 'User' # => inferred foreign_key is visitor_id
+
+*   Remove spurious tests from deprecated_associations_test, most of these aren't deprecated, and are duplicated in associations_test.  Closes #8987 *Pratik Naik*
+
+*   Make create! on a has_many :through association return the association object.  Not the collection.  Closes #8786 *Pratik Naik*
+
+*   Move from select * to select tablename.* to avoid clobbering IDs. Closes #8889 *dasil003*
+
+*   Don't call unsupported methods on associated objects when using :include, :method with to_xml #7307, *Manfred Stienstra, jwilger*
+
+*   Define collection singular ids method for has_many :through associations.  #8763 *Pratik Naik*
+
+*   Array attribute conditions work with proxied association collections.  #8318 *Kamal Fariz Mahyuddin, theamazingrando*
+
+*   Fix polymorphic has_one associations declared in an abstract class.  #8638 *Pratik Naik, Dax Huiberts*
+
+*   Fixed validates_associated should not stop on the first error.  #4276 *mrj, Manfred Stienstra, Josh Peek*
+
+*   Rollback if commit raises an exception.  #8642 *kik, Jeremy Kemper*
+
+*   Update tests' use of fixtures for the new collections api.  #8726 *Kamal Fariz Mahyuddin*
+
+*   Save associated records only if the association is already loaded.  #8713 *Blaine*
+
+*   MySQL: fix show_variable.  #8448 *matt, Jeremy Kemper*
+
+*   Fixtures: correctly delete and insert fixtures in a single transaction.  #8553 *Michael Schuerig*
+
+*   Fixtures: people(:technomancy, :josh) returns both fixtures.  #7880 *technomancy, Josh Peek*
+
+*   Calculations support non-numeric foreign keys.  #8154 *Kamal Fariz Mahyuddin*
+
+*   with_scope is protected.  #8524 *Josh Peek*
+
+*   Quickref for association methods.  #7723 *marclove, Mindsweeper*
+
+*   Calculations: return nil average instead of 0 when there are no rows to average.  #8298 *davidw*
+
+*   acts_as_nested_set: direct_children is sorted correctly.  #4761 *Josh Peek, rails@33lc0.net*
+
+*   Raise an exception if both attr_protected and attr_accessible are declared.  #8507 *stellsmi*
+
+*   SQLite, MySQL, PostgreSQL, Oracle: quote column names in column migration SQL statements.  #8466 *marclove, lorenjohnson*
+
+*   Allow nil serialized attributes with a set class constraint.  #7293 *sandofsky*
+
+*   Oracle: support binary fixtures.  #7987 *Michael Schoen*
+
+*   Fixtures: pull fixture insertion into the database adapters.  #7987 *Michael Schoen*
+
+*   Announce migration versions as they're performed.  *Jeremy Kemper*
+
+*   find gracefully copes with blank :conditions.  #7599 *Dan Manges, johnnyb*
+
+*   validates_numericality_of takes :greater_than, :greater_than_or_equal_to, :equal_to, :less_than, :less_than_or_equal_to, :odd, and :even options.  #3952 *Bob Silva, Dan Kubb, Josh Peek*
+
+*   MySQL: create_database takes :charset and :collation options. Charset defaults to utf8.  #8448 *matt*
+
+*   Find with a list of ids supports limit/offset.  #8437 *hrudududu*
+
+*   Optimistic locking: revert the lock version when an update fails.  #7840 *plang*
+
+*   Migrations: add_column supports custom column types.  #7742 *jsgarvin, Theory*
+
+*   Load database adapters on demand. Eliminates config.connection_adapters and RAILS_CONNECTION_ADAPTERS. Add your lib directory to the $LOAD_PATH and put your custom adapter in lib/active_record/connection_adapters/adaptername_adapter.rb. This way you can provide custom adapters as plugins or gems without modifying Rails. *Jeremy Kemper*
+
+*   Ensure that associations with :dependent => :delete_all respect :conditions option.  Closes #8034 *Jack Danger Canty, Josh Peek, Rick Olson*
+
+*   belongs_to assignment creates a new proxy rather than modifying its target in-place.  #8412 *mmangino@elevatedrails.com*
+
+*   Fix column type detection while loading fixtures.  Closes #7987 *roderickvd*
+
+*   Document deep eager includes.  #6267 *Josh Susser, Dan Manges*
+
+*   Document warning that associations names shouldn't be reserved words.  #4378 *murphy@cYcnus.de, Josh Susser*
+
+*   Sanitize Base#inspect.  #8392, #8623 *Nik Wakelin, jnoon*
+
+*   Replace the transaction {|transaction|..} semantics with a new Exception ActiveRecord::Rollback.   *Michael Koziarski*
+
+*   Oracle: extract column length for CHAR also.  #7866 *ymendel*
+
+*   Document :allow_nil option for validates_acceptance_of since it defaults to true. *tzaharia*
+
+*   Update documentation for :dependent declaration so that it explicitly uses the non-deprecated API. *Jack Danger Canty*
+
+*   Add documentation caveat about when to use count_by_sql. *fearoffish*
+
+*   Enhance documentation for increment_counter and decrement_counter. *fearoffish*
+
+*   Provide brief introduction to what optimistic locking is. *fearoffish*
+
+*   Add documentation for :encoding option to mysql adapter. *marclove*
+
+*   Added short-hand declaration style to migrations (inspiration from Sexy Migrations, http://errtheblog.com/post/2381) [David Heinemeier Hansson]. Example:
+
+        create_table "products" do |t|
+          t.column "shop_id",    :integer
+          t.column "creator_id", :integer
+          t.column "name",       :string,   :default => "Untitled"
+          t.column "value",      :string,   :default => "Untitled"
+          t.column "created_at", :datetime
+          t.column "updated_at", :datetime
+        end
+
+    ...can now be written as:
+
+        create_table :products do |t|
+          t.integer :shop_id, :creator_id
+          t.string  :name, :value, :default => "Untitled"
+          t.timestamps
+        end
+
+*   Use association name for the wrapper element when using .to_xml.  Previous behavior lead to non-deterministic situations with STI and polymorphic associations. *Michael Koziarski, jstrachan*
+
+*   Improve performance of calling .create on has_many :through associations. *evan*
+
+*   Improved cloning performance by relying less on exception raising #8159 *Blaine*
+
+*   Added ActiveRecord::Base.inspect to return a column-view like #<Post id:integer, title:string, body:text> *David Heinemeier Hansson*
+
+*   Added yielding of Builder instance for ActiveRecord::Base#to_xml calls *David Heinemeier Hansson*
+
+*   Small additions and fixes for ActiveRecord documentation.  Closes #7342 *Jeremy McAnally*
+
+*   Add helpful debugging info to the ActiveRecord::StatementInvalid exception in ActiveRecord::ConnectionAdapters::SqliteAdapter#table_structure.  Closes #7925. *court3nay*
+
+*   SQLite: binary escaping works with $KCODE='u'.  #7862 *tsuka*
+
+*   Base#to_xml supports serialized attributes.  #7502 *jonathan*
+
+*   Base.update_all :order and :limit options. Useful for MySQL updates that must be ordered to avoid violating unique constraints.  *Jeremy Kemper*
+
+*   Remove deprecated object transactions.  People relying on this functionality should install the object_transactions plugin at http://code.bitsweat.net/svn/object_transactions.  Closes #5637 *Michael Koziarski, Jeremy Kemper*
+
+*   PostgreSQL: remove DateTime -> Time downcast. Warning: do not enable translate_results for the C bindings if you have timestamps outside Time's domain.  *Jeremy Kemper*
+
+*   find_or_create_by_* takes a hash so you can create with more attributes than are in the method name. For example, Person.find_or_create_by_name(:name => 'Henry', :comments => 'Hi new user!') is equivalent to Person.find_by_name('Henry') || Person.create(:name => 'Henry', :comments => 'Hi new user!').  #7368 *Josh Susser*
+
+*   Make sure with_scope takes both :select and :joins into account when setting :readonly.  Allows you to save records you retrieve using method_missing on a has_many :through associations.  *Michael Koziarski*
+
+*   Allow a polymorphic :source for has_many :through associations.  Closes #7143 *protocool*
+
+*   Consistent public/protected/private visibility for chained methods.  #7813 *Dan Manges*
+
+*   Oracle: fix quoted primary keys and datetime overflow.  #7798 *Michael Schoen*
+
+*   Consistently quote primary key column names.  #7763 *toolmantim*
+
+*   Fixtures: fix YAML ordered map support.  #2665 *Manuel Holtgrewe, nfbuckley*
+
+*   DateTimes assume the default timezone.  #7764 *Geoff Buesing*
+
+*   Sybase: hide timestamp columns since they're inherently read-only.  #7716 *Mike Joyce*
+
+*   Oracle: overflow Time to DateTime.  #7718 *Michael Schoen*
+
+*   PostgreSQL: don't use async_exec and async_query with postgres-pr.  #7727, #7762 *flowdelic, toolmantim*
+
+*   Fix has_many :through << with custom foreign keys.  #6466, #7153 *naffis, Rich Collins*
+
+*   Test DateTime native type in migrations, including an edge case with dates
+    during calendar reform.  #7649, #7724 [fedot, Geoff Buesing]
+*   SQLServer: correctly schema-dump tables with no indexes or descending indexes.  #7333, #7703 *Jakob Skjerning, Tom Ward*
+
+*   SQLServer: recognize real column type as Ruby float.  #7057 *sethladd, Tom Ward*
+
+*   Added fixtures :all as a way of loading all fixtures in the fixture directory at once #7214 *Manfred Stienstra*
+
+*   Added database connection as a yield parameter to ActiveRecord::Base.transaction so you can manually rollback [David Heinemeier Hansson]. Example:
+
+        transaction do |transaction|
+          david.withdrawal(100)
+          mary.deposit(100)
+          transaction.rollback! # rolls back the transaction that was otherwise going to be successful
+        end
+
+*   Made increment_counter/decrement_counter play nicely with optimistic locking, and added a more general update_counters method *Jamis Buck*
+
+*   Reworked David's query cache to be available as Model.cache {...}. For the duration of the block no select query should be run more then once. Any inserts/deletes/executes will flush the whole cache however *Tobias Lütke*
+    Task.cache { Task.find(1); Task.find(1) } # => 1 query
+
+*   When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. *Jamis Buck*
+
+*   Oracle: fix lob and text default handling.  #7344 *gfriedrich, Michael Schoen*
+
+*   SQLServer: don't choke on strings containing 'null'.  #7083 *Jakob Skjerning*
+
+*   MySQL: blob and text columns may not have defaults in 5.x. Update fixtures schema for strict mode.  #6695 *Dan Kubb*
+
+*   update_all can take a Hash argument. sanitize_sql splits into two methods for conditions and assignment since NULL values and delimiters are handled differently.  #6583, #7365 *sandofsky, Assaf*
+
+*   MySQL: SET SQL_AUTO_IS_NULL=0 so 'where id is null' doesn't select the last inserted id.  #6778 *Jonathan Viney, timc*
+
+*   Use Date#to_s(:db) for quoted dates.  #7411 *Michael Schoen*
+
+*   Don't create instance writer methods for class attributes.  Closes #7401 *Rick Olson*
+
+*   Docs: validations examples.  #7343 *zackchandler*
+
+*   Add missing tests ensuring callbacks work with class inheritance.  Closes #7339 *sandofsky*
+
+*   Fixtures use the table name and connection from set_fixture_class.  #7330 *Anthony Eden*
+
+*   Remove useless code in #attribute_present? since 0 != blank?.  Closes #7249 *Josh Susser*
+
+*   Fix minor doc typos. Closes #7157 *Josh Susser*
+
+*   Fix incorrect usage of #classify when creating the eager loading join statement.  Closes #7044 *Josh Susser*
+
+*   SQLServer: quote table name in indexes query.  #2928 *keithm@infused.org*
+
+*   Subclasses of an abstract class work with single-table inheritance.  #5704, #7284 *BertG, nick+rails@ag.arizona.edu*
+
+*   Make sure sqlite3 driver closes open connections on disconnect *Rob Rasmussen*
+
+*   [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 *Jeremy McAnally*
+
+*   change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 *Dan Manges, Jeremy Kemper*
+
+*   MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 *Jonathan Viney, Manfred Stienstra, altano@bigfoot.com*
+
+*   Oracle: create_table takes a :sequence_name option to override the 'tablename_seq' default.  #7000 *Michael Schoen*
+
+*   MySQL: retain SSL settings on reconnect.  #6976 *randyv2*
+
+*   Apply scoping during initialize instead of create.  Fixes setting of foreign key when using find_or_initialize_by with scoping. *Cody Fauser*
+
+*   SQLServer: handle [quoted] table names.  #6635 *rrich*
+
+*   acts_as_nested_set works with single-table inheritance.  #6030 *Josh Susser*
+
+*   PostgreSQL, Oracle: correctly perform eager finds with :limit and :order.  #4668, #7021 *eventualbuddha, Michael Schoen*
+
+*   Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 *Dan Manges*
+        Student.find(:all, :conditions => { :grade => 9..12 })
+
+*   Fix the Oracle adapter for serialized attributes stored in CLOBs.  Closes #6825 *mschoen, tdfowler*
+
+*   [DOCS] Apply more documentation for ActiveRecord Reflection.  Closes #4055 *Robby Russell*
+
+*   [DOCS] Document :allow_nil option of #validate_uniqueness_of. Closes #3143 *Caio Chassot*
+
+*   Bring the sybase adapter up to scratch for 1.2 release. *jsheets*
+
+*   Rollback new_record? and id when an exception is raised in a save callback.  #6910 *Ben Curren, outerim*
+
+*   Pushing a record on an association collection doesn't unnecessarily load all the associated records.  *Obie Fernandez, Jeremy Kemper*
+
+*   Oracle: fix connection reset failure.  #6846 *leonlleslie*
+
+*   Subclass instantiation doesn't try to explicitly require the corresponding subclass.  #6840 *leei, Jeremy Kemper*
+
+*   fix faulty inheritance tests and that eager loading grabs the wrong inheritance column when the class of your association is an STI subclass. Closes #6859 *protocool*
+
+*   Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues. Closes #5847 *Alexander Dymo, Tobias Lütke*
+
+*   find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using.  #6764 *vitaly, Jeremy Kemper*
+
+*   Add AssociationCollection#create! to be consistent with AssociationCollection#create when dealing with a foreign key that is a protected attribute *Cody Fauser*
+
+*   Added counter optimization for AssociationCollection#any? so person.friends.any? won't actually load the full association if we have the count in a cheaper form *David Heinemeier Hansson*
+
+*   Change fixture_path to a class inheritable accessor allowing test cases to have their own custom set of fixtures. #6672 *Zach Dennis*
+
+*   Quote ActiveSupport::Multibyte::Chars.  #6653 *Julian Tarkhanov*
+
+*   Simplify query_attribute by typecasting the attribute value and checking whether it's nil, false, zero or blank.  #6659 *Jonathan Viney*
+
+*   validates_numericality_of uses \A \Z to ensure the entire string matches rather than ^ $ which may match one valid line of a multiline string.  #5716 *Andreas Schwarz*
+
+*   Run validations in the order they were declared.  #6657 *obrie*
+
+*   MySQL: detect when a NOT NULL column without a default value is misreported as default ''.  Can't detect for string, text, and binary columns since '' is a legitimate default.  #6156 *simon@redhillconsulting.com.au, obrie, Jonathan Viney, Jeremy Kemper*
+
+*   Simplify association proxy implementation by factoring construct_scope out of method_missing.  #6643 *martin*
+
+*   Oracle: automatically detect the primary key.  #6594 *vesaria, Michael Schoen*
+
+*   Oracle: to increase performance, prefetch 100 rows and enable similar cursor sharing. Both are configurable in database.yml.  #6607 *philbogle@gmail.com, ray.fortna@jobster.com, Michael Schoen*
+
+*   Don't inspect unloaded associations.  #2905 *lmarlow*
+
+*   SQLite: use AUTOINCREMENT primary key in >= 3.1.0.  #6588, #6616 *careo, lukfugl*
+
+*   Cache inheritance_column.  #6592 *Stefan Kaes*
+
+*   Firebird: decimal/numeric support.  #6408 *macrnic*
+
+*   make add_order a tad faster. #6567 *Stefan Kaes*
+
+*   Find with :include respects scoped :order.  #5850
+
+*   Support nil and Array in :conditions => { attr => value } hashes.  #6548 *Assaf, Jeremy Kemper*
+        find(:all, :conditions => { :topic_id => [1, 2, 3], :last_read => nil }
+
+*   Consistently use LOWER() for uniqueness validations (rather than mixing with UPPER()) so the database can always use a functional index on the lowercased column.  #6495 *Si*
+
+*   SQLite: fix calculations workaround, remove count(distinct) query rewrite, cleanup test connection scripts.  *Jeremy Kemper*
+
+*   SQLite: count(distinct) queries supported in >= 3.2.6.  #6544 *Bob Silva*
+
+*   Dynamically generate reader methods for serialized attributes.  #6362 *Stefan Kaes*
+
+*   Deprecation: object transactions warning.  *Jeremy Kemper*
+
+*   has_one :dependent => :nullify ignores nil associates.  #4848, #6528 *bellis@deepthought.org, janovetz, Jeremy Kemper*
+
+*   Oracle: resolve test failures, use prefetched primary key for inserts, check for null defaults, fix limited id selection for eager loading. Factor out some common methods from all adapters.  #6515 *Michael Schoen*
+
+*   Make add_column use the options hash with the Sqlite Adapter. Closes #6464 *obrie*
+
+*   Document other options available to migration's add_column. #6419 *grg*
+
+*   MySQL: all_hashes compatibility with old MysqlRes class.  #6429, #6601 *Jeremy Kemper*
+
+*   Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. *Jonathan Viney*
+
+*   fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters *Rick Olson*
+
+*   Restore eager condition interpolation, document it's differences *Rick Olson*
+
+*   Don't rollback in teardown unless a transaction was started. Don't start a transaction in create_fixtures if a transaction is started.  #6282 *Jacob Fugal, Jeremy Kemper*
+
+*   Add #delete support to has_many :through associations.  Closes #6049 *Martin Landers*
+
+*   Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 *Rick Olson*
+
+*   Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 *turnip@turnipspatch.com*
+
+*   Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception #6126 *wreese@gmail.com*
+
+*   Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 *jonathan*
+
+*   Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 *Bob Silva*
+
+*   The has_many create method works with polymorphic associations.  #6361 *Dan Peterson*
+
+*   MySQL: introduce Mysql::Result#all_hashes to support further optimization.  #5581 *Stefan Kaes*
+
+*   save! shouldn't validate twice.  #6324 *maiha, Bob Silva*
+
+*   Association collections have an _ids reader method to match the existing writer for collection_select convenience (e.g. employee.task_ids). The writer method skips blank ids so you can safely do @employee.task_ids = params[:tasks] without checking every time for an empty list or blank values.  #1887, #5780 *Michael Schuerig*
+
+*   Add an attribute reader method for ActiveRecord::Base.observers *Rick Olson*
+
+*   Deprecation: count class method should be called with an options hash rather than two args for conditions and joins.  #6287 *Bob Silva*
+
+*   has_one associations with a nil target may be safely marshaled.  #6279 *norbauer, Jeremy Kemper*
+
+*   Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects *Michael Koziarski*
+
+*   Add a :namespace option to  AR::Base#to_xml *Michael Koziarski*
+
+*   Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. *Jeremy Kemper*
+
+*   Mock Time.now for more accurate Touch mixin tests.  #6213 *Dan Peterson*
+
+*   Improve yaml fixtures error reporting.  #6205 *Bruce Williams*
+
+*   Rename AR::Base#quote so people can use that name in their models. #3628 *Michael Koziarski*
+
+*   Add deprecation warning for inferred foreign key. #6029 *Josh Susser*
+
+*   Fixed the Ruby/MySQL adapter we ship with Active Record to work with the new authentication handshake that was introduced in MySQL 4.1, along with the other protocol changes made at that time #5723 *jimw@mysql.com*
+
+*   Deprecation: use :dependent => :delete_all rather than :exclusively_dependent => true.  #6024 *Josh Susser*
+
+*   Document validates_presences_of behavior with booleans: you probably want validates_inclusion_of :attr, :in => [true, false].  #2253 *Bob Silva*
+
+*   Optimistic locking: gracefully handle nil versions, treat as zero.  #5908 *Tom Ward*
+
+*   to_xml: the :methods option works on arrays of records.  #5845 *Josh Starcher*
+
+*   Deprecation: update docs. #5998 *Jakob Skjerning, Kevin Clark*
+
+*   Add some XmlSerialization tests for ActiveRecord *Rick Olson*
+
+*   has_many :through conditions are sanitized by the associating class.  #5971 *martin.emde@gmail.com*
+
+*   Tighten rescue clauses.  #5985 *james@grayproductions.net*
+
+*   Fix spurious newlines and spaces in AR::Base#to_xml output *Jamis Buck*
+
+*   has_one supports the :dependent => :delete option which skips the typical callback chain and deletes the associated object directly from the database.  #5927 *Chris Mear, Jonathan Viney*
+
+*   Nested subclasses are not prefixed with the parent class' table_name since they should always use the base class' table_name.  #5911 *Jonathan Viney*
+
+*   SQLServer: work around bug where some unambiguous date formats are not correctly identified if the session language is set to german.  #5894 *Tom Ward, kruth@bfpi*
+
+*   SQLServer: fix eager association test.  #5901 *Tom Ward*
+
+*   Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance.  #5838 *Kevin Clark*
+
+*   Fixtures: correct escaping of \n and \r.  #5859 *evgeny.zislis@gmail.com*
+
+*   Migrations: gracefully handle missing migration files.  #5857 *eli.gordon@gmail.com*
+
+*   MySQL: update test schema for MySQL 5 strict mode.  #5861 *Tom Ward*
+
+*   to_xml: correct naming of included associations.  #5831 *Josh Starcher*
+
+*   Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 *Josh Susser*
+
+*   Add records to has_many :through using <<, push, and concat by creating the association record. Raise if base or associate are new records since both ids are required to create the association. #build raises since you can't associate an unsaved record. #create! takes an attributes hash and creates the associated record and its association in a transaction. *Jeremy Kemper*
+
+        # Create a tagging to associate the post and tag.
+        post.tags << Tag.find_by_name('old')
+        post.tags.create! :name => 'general'
+
+        # Would have been:
+        post.taggings.create!(:tag => Tag.find_by_name('finally')
+        transaction do
+          post.taggings.create!(:tag => Tag.create!(:name => 'general'))
+        end
+
+*   Cache nil results for :included has_one associations also.  #5787 *Michael Schoen*
+
+*   Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. *Tobias Lütke*
+
+*   Nested classes are given table names prefixed by the singular form of the parent's table name. *Jeremy Kemper*
+        Example: Invoice::Lineitem is given table name invoice_lineitems
+
+*   Migrations: uniquely name multicolumn indexes so you don't have to. *Jeremy Kemper*
+        # people_active_last_name_index, people_active_deactivated_at_index
+        add_index    :people, [:active, :last_name]
+        add_index    :people, [:active, :deactivated_at]
+        remove_index :people, [:active, :last_name]
+        remove_index :people, [:active, :deactivated_at]
+
+    WARNING: backward-incompatibility. Multicolumn indexes created before this
+    revision were named using the first column name only. Now they're uniquely
+    named using all indexed columns.
+
+    To remove an old multicolumn index, remove_index :table_name, :first_column
+
+*   Fix for deep includes on the same association. *richcollins@gmail.com*
+
+*   Tweak fixtures so they don't try to use a non-ActiveRecord class.  *Kevin Clark*
+
+*   Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore.  *Rick Olson*
+
+*   Document find's :from option. Closes #5762. *andrew@redlinesoftware.com*
+
+*   PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema.  #5280 *guy.naor@famundo.com*
+
+*   Replace Reloadable with Reloadable::Deprecated. *Nicholas Seckar*
+
+*   Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. *Michael Schoen*
+
+*   Add documentation for how to disable timestamps on a per model basis. Closes #5684. *matt@mattmargolis.net Marcel Molina Jr.*
+
+*   Don't save has_one associations unnecessarily.  #5735 *Jonathan Viney*
+
+*   Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  *Rick Olson*
+
+*   Formally deprecate the deprecated finders. *Michael Koziarski*
+
+*   Formally deprecate rich associations.  *Michael Koziarski*
+
+*   Fixed that default timezones for new / initialize should uphold utc setting #5709 *daniluk@yahoo.com*
+
+*   Fix announcement of very long migration names.  #5722 *blake@near-time.com*
+
+*   The exists? class method should treat a string argument as an id rather than as conditions.  #5698 *jeremy@planetargon.com*
+
+*   Fixed to_xml with :include misbehaviors when invoked on array of model instances #5690 *alexkwolfe@gmail.com*
+
+*   Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
+
+        assert (Topic.exists?(:author_name => "David"))
+         assert (Topic.exists?(:author_name => "Mary", :approved => true))
+         assert (Topic.exists?(["parent_id = ?", 1]))
+
+*   Schema dumper quotes date :default values. *Dave Thomas*
+
+*   Calculate sum with SQL, not Enumerable on HasManyThrough Associations. *Dan Peterson*
+
+*   Factor the attribute#{suffix} methods out of method_missing for easier extension. *Jeremy Kemper*
+
+*   Patch sql injection vulnerability when using integer or float columns. *Jamis Buck*
+
+*   Allow #count through a has_many association to accept :include.  *Dan Peterson*
+
+*   create_table rdoc: suggest :id => false for habtm join tables. *Zed Shaw*
+
+*   PostgreSQL: return array fields as strings. #4664 *Robby Russell*
+
+*   SQLServer: added tests to ensure all database statements are closed, refactored identity_insert management code to use blocks, removed update/delete rowcount code out of execute and into update/delete, changed insert to go through execute method, removed unused quoting methods, disabled pessimistic locking tests as feature is currently unsupported, fixed RakeFile to load sqlserver specific tests whether running in ado or odbc mode, fixed support for recently added decimal types, added support for limits on integer types. #5670 *Tom Ward*
+
+*   SQLServer: fix db:schema:dump case-sensitivity. #4684 *Will Rogers*
+
+*   Oracle: BigDecimal support. #5667 *Michael Schoen*
+
+*   Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. #5454 *robbat2@gentoo.org, work@ashleymoran.me.uk*
+
+*   Firebird migrations support. #5337 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   PostgreSQL: create/drop as postgres user. #4790 *mail@matthewpainter.co.uk, mlaster@metavillage.com*
+
+*   Update callbacks documentation. #3970 *Robby Russell <robby@planetargon.com>*
+
+*   PostgreSQL: correctly quote the ' in pk_and_sequence_for. #5462 *tietew@tietew.net*
+
+*   PostgreSQL: correctly quote microseconds in timestamps. #5641 *rick@rickbradley.com*
+
+*   Clearer has_one/belongs_to model names (account has_one :user). #5632 *matt@mattmargolis.net*
+
+*   Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 *Michael Schoen*
+
+*   Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 *Michael Schoen*
+
+*   Added :group to available options for finds done on associations #5516 *mike@michaeldewey.org*
+
+*   Minor tweak to improve performance of ActiveRecord::Base#to_param.
+
+*   Observers also watch subclasses created after they are declared. #5535 *daniels@pronto.com.au*
+
+*   Removed deprecated timestamps_gmt class methods. *Jeremy Kemper*
+
+*   rake build_mysql_database grants permissions to rails@localhost. #5501 *brianegge@yahoo.com*
+
+*   PostgreSQL: support microsecond time resolution. #5492 *alex@msgpad.com*
+
+*   Add AssociationCollection#sum since the method_missing invokation has been shadowed by Enumerable#sum.
+
+*   Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record. *Sam Stephenson*
+
+*   Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE". Use the #lock! method to obtain a row lock on a single record (reloads the record with :lock => true). *Shugo Maeda*
+        # Obtain an exclusive lock on person 1 so we can safely increment visits.
+        Person.transaction do
+          # select * from people where id=1 for update
+          person = Person.find(1, :lock => true)
+          person.visits += 1
+          person.save!
+        end
+
+*   PostgreSQL: introduce allow_concurrency option which determines whether to use blocking or asynchronous #execute. Adapters with blocking #execute will deadlock Ruby threads. The default value is ActiveRecord::Base.allow_concurrency. *Jeremy Kemper*
+
+*   Use a per-thread (rather than global) transaction mutex so you may execute concurrent transactions on separate connections. *Jeremy Kemper*
+
+*   Change AR::Base#to_param to return a String instead of a Fixnum. Closes #5320. *Nicholas Seckar*
+
+*   Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. #5299 (skaes@web.de)
+
+*   Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization *David Heinemeier Hansson*
+
+*   Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [Hampton Catlin]. Example:
+
+        Person.find(:all, :conditions => { :last_name => "Catlin", :status => 1 }, :limit => 2)
+
+    ...is the same as:
+        Person.find(:all, :conditions => [ "last_name = ? and status = ?", "Catlin", 1 ], :limit => 2)
+
+    This makes it easier to pass in the options from a form or otherwise outside.
+
+
+*   Fixed issues with BLOB limits, charsets, and booleans for Firebird #5194, #5191, #5189 *kennethkunz@gmail.com*
+
+*   Fixed usage of :limit and with_scope when the association in scope is a 1:m #5208 *alex@purefiction.net*
+
+*   Fixed migration trouble with SQLite when NOT NULL is used in the new definition #5215 *greg@lapcominc.com*
+
+*   Fixed problems with eager loading and counting on SQL Server #5212 *kajism@yahoo.com*
+
+*   Fixed that count distinct should use the selected column even when using :include #5251 *anna@wota.jp*
+
+*   Fixed that :includes merged from with_scope won't cause the same association to be loaded more than once if repetition occurs in the clauses #5253 *alex@purefiction.net*
+
+*   Allow models to override to_xml.  #4989 *Blair Zajac <blair@orcaware.com>*
+
+*   PostgreSQL: don't ignore port when host is nil since it's often used to label the domain socket.  #5247 *shimbo@is.naist.jp*
+
+*   Records and arrays of records are bound as quoted ids. *Jeremy Kemper*
+        Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
+        Foo.find(:first, :conditions => ['bar_id = ?', bar])
+
+*   Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty *David Heinemeier Hansson*
+
+*   Add a list of regexes assert_queries skips in the ActiveRecord test suite.  *Rick Olson*
+
+*   Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 *Josh Susser*
+
+*   Provide Association Extensions access to the instance that the association is being accessed from.
+    Closes #4433 *Josh Susser*
+
+*   Update OpenBase adaterp's maintainer's email address. Closes #5176. *Derrick Spell*
+
+*   Add a quick note about :select and eagerly included associations. *Rick Olson*
+
+*   Add docs for the :as option in has_one associations.  Closes #5144 *cdcarter@gmail.com*
+
+*   Fixed that has_many collections shouldn't load the entire association to do build or create *David Heinemeier Hansson*
+
+*   Added :allow_nil option for aggregations #5091 *Ian White*
+
+*   Fix Oracle boolean support and tests. Closes #5139. *Michael Schoen*
+
+*   create! no longer blows up when no attributes are passed and a :create scope is in effect (e.g. foo.bars.create! failed whereas foo.bars.create!({}) didn't.) *Jeremy Kemper*
+
+*   Call Inflector#demodulize on the class name when eagerly including an STI model.  Closes #5077 *info@loobmedia.com*
+
+*   Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. *pdcawley@bofh.org.uk*
+
+*   PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 *keegan@thebasement.org*
+
+*   Dates and times interpret empty strings as nil rather than 2000-01-01. #4830 *kajism@yahoo.com*
+
+*   Allow :uniq => true with has_many :through associations. *Jeremy Kemper*
+
+*   Ensure that StringIO is always available for the Schema dumper. *Marcel Molina Jr.*
+
+*   Allow AR::Base#to_xml to include methods too. Closes #4921. *johan@textdrive.com*
+
+*   Replace superfluous name_to_class_name variant with camelize. *Marcel Molina Jr.*
+
+*   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.*
+
+*   Remove duplicate fixture entry in comments.yml. Closes #4923. *Blair Zajac <blair@orcaware.com>*
+
+*   Update FrontBase adapter to check binding version. Closes #4920. *mlaster@metavillage.com*
+
+*   New Frontbase connections don't start in auto-commit mode. Closes #4922. *mlaster@metavillage.com*
+
+*   When grouping, use the appropriate option key. *Marcel Molina Jr.*
+
+*   Only modify the sequence name in the FrontBase adapter if the FrontBase adapter is actually being used. *Marcel Molina Jr.*
+
+*   Add support for FrontBase (http://www.frontbase.com/) with a new adapter thanks to the hard work of one Mike Laster. Closes #4093. *mlaster@metavillage.com*
+
+*   Add warning about the proper way to validate the presence of a foreign key. Closes #4147. *Francois Beausoleil <francois.beausoleil@gmail.com>*
+
+*   Fix syntax error in documentation. Closes #4679. *Mislav Marohnić*
+
+*   Add Oracle support for CLOB inserts. Closes #4748. *schoenm@earthlink.net sandra.metz@duke.edu*
+
+*   Various fixes for sqlserver_adapter (odbc statement finishing, ado schema dumper, drop index). Closes #4831. *kajism@yahoo.com*
+
+*   Add support for :order option to with_scope. Closes #3887. *eric.daspet@survol.net*
+
+*   Prettify output of schema_dumper by making things line up. Closes #4241 *Caio  Chassot <caio@v2studio.com>*
+
+*   Make build_postgresql_databases task make databases owned by the postgres user. Closes #4790. *mlaster@metavillage.com*
+
+*   Sybase Adapter type conversion cleanup. Closes #4736. *dev@metacasa.net*
+
+*   Fix bug where calculations with long alias names return null. *Rick Olson*
+
+*   Raise error when trying to add to a has_many :through association.  Use the Join Model instead. *Rick Olson*
+
+        @post.tags << @tag                  # BAD
+        @post.taggings.create(:tag => @tag) # GOOD
+
+*   Allow all calculations to take the :include option, not just COUNT (closes #4840) *Rick Olson*
+
+*   Update inconsistent migrations documentation. #4683 *machomagna@gmail.com*
+
+*   Add ActiveRecord::Errors#to_xml *Jamis Buck*
+
+*   Properly quote index names in migrations (closes #4764) *John Long*
+
+*   Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  *Rick Olson*
+
+*   Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions *Rick Olson*
+
+*   Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. *Rick Olson*
+
+*   DRY up association collection reader method generation. *Marcel Molina Jr.*
+
+*   DRY up and tweak style of the validation error object. *Marcel Molina Jr.*
+
+*   Add :case_sensitive option to validates_uniqueness_of (closes #3090) *Rick Olson*
+
+        class Account < ActiveRecord::Base
+          validates_uniqueness_of :email, :case_sensitive => false
+        end
+
+*   Allow multiple association extensions with :extend option (closes #4666) *Josh Susser*
+
+        class Account < ActiveRecord::Base
+          has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
+        end
+
+        *1.15.3* (March 12th, 2007)
+
+        * Allow a polymorphic :source for has_many :through associations. Closes #7143 [protocool]
+
+        * Consistently quote primary key column names.  #7763 [toolmantim]
+
+        * Fixtures: fix YAML ordered map support.  #2665 [Manuel Holtgrewe, nfbuckley]
+
+        * Fix has_many :through << with custom foreign keys.  #6466, #7153 [naffis, Rich Collins]
+
+
+## 1.15.2 (February 5th, 2007) ##
+
+*   Pass a range in :conditions to use the SQL BETWEEN operator.  #6974 *Dan Manges*
+        Student.find(:all, :conditions => { :grade => 9..12 })
+
+*   Don't create instance writer methods for class attributes. *Rick Olson*
+
+*   When dealing with SQLite3, use the table_info pragma helper, so that the bindings can do some translation for when sqlite3 breaks incompatibly between point releases. *Jamis Buck*
+
+*   SQLServer: don't choke on strings containing 'null'.  #7083 *Jakob Skjerning*
+
+*   Consistently use LOWER() for uniqueness validations (rather than mixing with UPPER()) so the database can always use a functional index on the lowercased column.  #6495 *Si*
+
+*   MySQL: SET SQL_AUTO_IS_NULL=0 so 'where id is null' doesn't select the last inserted id.  #6778 *Jonathan Viney, timc*
+
+*   Fixtures use the table name and connection from set_fixture_class.  #7330 *Anthony Eden*
+
+*   SQLServer: quote table name in indexes query.  #2928 *keithm@infused.org*
+
+
+## 1.15.1 (January 17th, 2007) ##
+
+*   Fix nodoc breaking of adapters
+
+
+## 1.15.0 (January 16th, 2007) ##
+
+*   [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name.  #7072 *Jeremy McAnally*
+
+*   change_column accepts :default => nil. Skip column options for primary keys.  #6956, #7048 *Dan Manges, Jeremy Kemper*
+
+*   MySQL, PostgreSQL: change_column_default quotes the default value and doesn't lose column type information.  #3987, #6664 *Jonathan Viney, Manfred Stienstra, altano@bigfoot.com*
+
+*   Oracle: create_table takes a :sequence_name option to override the 'tablename_seq' default.  #7000 *Michael Schoen*
+
+*   MySQL: retain SSL settings on reconnect.  #6976 *randyv2*
+
+*   SQLServer: handle [quoted] table names.  #6635 *rrich*
+
+*   acts_as_nested_set works with single-table inheritance.  #6030 *Josh Susser*
+
+*   PostgreSQL, Oracle: correctly perform eager finds with :limit and :order.  #4668, #7021 *eventualbuddha, Michael Schoen*
+
+*   Fix the Oracle adapter for serialized attributes stored in CLOBs.  Closes #6825 *mschoen, tdfowler*
+
+*   [DOCS] Apply more documentation for ActiveRecord Reflection.  Closes #4055 *Robby Russell*
+
+*   [DOCS] Document :allow_nil option of #validate_uniqueness_of. Closes #3143 *Caio Chassot*
+
+*   Bring the sybase adapter up to scratch for 1.2 release. *jsheets*
+
+*   Oracle: fix connection reset failure.  #6846 *leonlleslie*
+
+*   Subclass instantiation doesn't try to explicitly require the corresponding subclass.  #6840 *leei, Jeremy Kemper*
+
+*   fix faulty inheritance tests and that eager loading grabs the wrong inheritance column when the class of your association is an STI subclass. Closes #6859 *protocool*
+
+*   find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using.  #6764 *vitaly, Jeremy Kemper*
+
+*   Support nil and Array in :conditions => { attr => value } hashes.  #6548 *Assaf, Jeremy Kemper*
+        find(:all, :conditions => { :topic_id => [1, 2, 3], :last_read => nil }
+
+*   Quote ActiveSupport::Multibyte::Chars.  #6653 *Julian Tarkhanov*
+
+*   MySQL: detect when a NOT NULL column without a default value is misreported as default ''.  Can't detect for string, text, and binary columns since '' is a legitimate default.  #6156 *simon@redhillconsulting.com.au, obrie, Jonathan Viney, Jeremy Kemper*
+
+*   validates_numericality_of uses \A \Z to ensure the entire string matches rather than ^ $ which may match one valid line of a multiline string.  #5716 *Andreas Schwarz*
+
+*   Oracle: automatically detect the primary key.  #6594 *vesaria, Michael Schoen*
+
+*   Oracle: to increase performance, prefetch 100 rows and enable similar cursor sharing. Both are configurable in database.yml.  #6607 *philbogle@gmail.com, ray.fortna@jobster.com, Michael Schoen*
+
+*   Firebird: decimal/numeric support.  #6408 *macrnic*
+
+*   Find with :include respects scoped :order.  #5850
+
+*   Dynamically generate reader methods for serialized attributes.  #6362 *Stefan Kaes*
+
+*   Deprecation: object transactions warning.  *Jeremy Kemper*
+
+*   has_one :dependent => :nullify ignores nil associates.  #6528 *janovetz, Jeremy Kemper*
+
+*   Oracle: resolve test failures, use prefetched primary key for inserts, check for null defaults, fix limited id selection for eager loading. Factor out some common methods from all adapters.  #6515 *Michael Schoen*
+
+*   Make add_column use the options hash with the Sqlite Adapter. Closes #6464 *obrie*
+
+*   Document other options available to migration's add_column. #6419 *grg*
+
+*   MySQL: all_hashes compatibility with old MysqlRes class.  #6429, #6601 *Jeremy Kemper*
+
+*   Fix has_many :through to add the appropriate conditions when going through an association using STI. Closes #5783. *Jonathan Viney*
+
+*   fix select_limited_ids_list issues in postgresql, retain current behavior in other adapters *Rick Olson*
+
+*   Restore eager condition interpolation, document it's differences *Rick Olson*
+
+*   Don't rollback in teardown unless a transaction was started. Don't start a transaction in create_fixtures if a transaction is started.  #6282 *Jacob Fugal, Jeremy Kemper*
+
+*   Add #delete support to has_many :through associations.  Closes #6049 *Martin Landers*
+
+*   Reverted old select_limited_ids_list postgresql fix that caused issues in mysql.  Closes #5851 *Rick Olson*
+
+*   Removes the ability for eager loaded conditions to be interpolated, since there is no model instance to use as a context for interpolation. #5553 *turnip@turnipspatch.com*
+
+*   Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception #6126 *wreese@gmail.com*
+
+*   Added update_attributes! which uses save! to raise an exception if a validation error prevents saving #6192 *jonathan*
+
+*   Deprecated add_on_boundary_breaking (use validates_length_of instead) #6292 *Bob Silva*
+
+*   The has_many create method works with polymorphic associations.  #6361 *Dan Peterson*
+
+*   MySQL: introduce Mysql::Result#all_hashes to support further optimization.  #5581 *Stefan Kaes*
+
+*   save! shouldn't validate twice.  #6324 *maiha, Bob Silva*
+
+*   Association collections have an _ids reader method to match the existing writer for collection_select convenience (e.g. employee.task_ids). The writer method skips blank ids so you can safely do @employee.task_ids = params[:tasks] without checking every time for an empty list or blank values.  #1887, #5780 *Michael Schuerig*
+
+*   Add an attribute reader method for ActiveRecord::Base.observers *Rick Olson*
+
+*   Deprecation: count class method should be called with an options hash rather than two args for conditions and joins.  #6287 *Bob Silva*
+
+*   has_one associations with a nil target may be safely marshaled.  #6279 *norbauer, Jeremy Kemper*
+
+*   Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects *Michael Koziarski*
+
+*   Add a :namespace option to  AR::Base#to_xml *Michael Koziarski*
+
+*   Deprecation tests. Remove warnings for dynamic finders and for the foo_count method if it's also an attribute. *Jeremy Kemper*
+
+*   Mock Time.now for more accurate Touch mixin tests.  #6213 *Dan Peterson*
+
+*   Improve yaml fixtures error reporting.  #6205 *Bruce Williams*
+
+*   Rename AR::Base#quote so people can use that name in their models. #3628 *Michael Koziarski*
+
+*   Add deprecation warning for inferred foreign key. #6029 *Josh Susser*
+
+*   Fixed the Ruby/MySQL adapter we ship with Active Record to work with the new authentication handshake that was introduced in MySQL 4.1, along with the other protocol changes made at that time #5723 *jimw@mysql.com*
+
+*   Deprecation: use :dependent => :delete_all rather than :exclusively_dependent => true.  #6024 *Josh Susser*
+
+*   Optimistic locking: gracefully handle nil versions, treat as zero.  #5908 *Tom Ward*
+
+*   to_xml: the :methods option works on arrays of records.  #5845 *Josh Starcher*
+
+*   has_many :through conditions are sanitized by the associating class.  #5971 *martin.emde@gmail.com*
+
+*   Fix spurious newlines and spaces in AR::Base#to_xml output *Jamis Buck*
+
+*   has_one supports the :dependent => :delete option which skips the typical callback chain and deletes the associated object directly from the database.  #5927 *Chris Mear, Jonathan Viney*
+
+*   Nested subclasses are not prefixed with the parent class' table_name since they should always use the base class' table_name.  #5911 *Jonathan Viney*
+
+*   SQLServer: work around bug where some unambiguous date formats are not correctly identified if the session language is set to german.  #5894 *Tom Ward, kruth@bfpi*
+
+*   Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance.  #5838 *Kevin Clark*
+
+*   Fixtures: correct escaping of \n and \r.  #5859 *evgeny.zislis@gmail.com*
+
+*   Migrations: gracefully handle missing migration files.  #5857 *eli.gordon@gmail.com*
+
+*   MySQL: update test schema for MySQL 5 strict mode.  #5861 *Tom Ward*
+
+*   to_xml: correct naming of included associations.  #5831 *Josh Starcher*
+
+*   Pushing a record onto a has_many :through sets the association's foreign key to the associate's primary key and adds it to the correct association.  #5815, #5829 *Josh Susser*
+
+*   Add records to has_many :through using <<, push, and concat by creating the association record. Raise if base or associate are new records since both ids are required to create the association. #build raises since you can't associate an unsaved record. #create! takes an attributes hash and creates the associated record and its association in a transaction. *Jeremy Kemper*
+
+        # Create a tagging to associate the post and tag.
+        post.tags << Tag.find_by_name('old')
+        post.tags.create! :name => 'general'
+
+        # Would have been:
+        post.taggings.create!(:tag => Tag.find_by_name('finally')
+        transaction do
+          post.taggings.create!(:tag => Tag.create!(:name => 'general'))
+        end
+
+*   Cache nil results for :included has_one associations also.  #5787 *Michael Schoen*
+
+*   Fixed a bug which would cause .save to fail after trying to access a empty has_one association on a unsaved record. *Tobias Lütke*
+
+*   Nested classes are given table names prefixed by the singular form of the parent's table name. *Jeremy Kemper*
+        Example: Invoice::Lineitem is given table name invoice_lineitems
+
+*   Migrations: uniquely name multicolumn indexes so you don't have to. *Jeremy Kemper*
+        # people_active_last_name_index, people_active_deactivated_at_index
+        add_index    :people, [:active, :last_name]
+        add_index    :people, [:active, :deactivated_at]
+        remove_index :people, [:active, :last_name]
+        remove_index :people, [:active, :deactivated_at]
+
+    WARNING: backward-incompatibility. Multicolumn indexes created before this
+    revision were named using the first column name only. Now they're uniquely
+    named using all indexed columns.
+
+    To remove an old multicolumn index, remove_index :table_name, :first_column
+
+*   Fix for deep includes on the same association. *richcollins@gmail.com*
+
+*   Tweak fixtures so they don't try to use a non-ActiveRecord class.  *Kevin Clark*
+
+*   Remove ActiveRecord::Base.reset since Dispatcher doesn't use it anymore.  *Rick Olson*
+
+*   PostgreSQL: autodetected sequences work correctly with multiple schemas. Rely on the schema search_path instead of explicitly qualifying the sequence name with its schema.  #5280 *guy.naor@famundo.com*
+
+*   Replace Reloadable with Reloadable::Deprecated. *Nicholas Seckar*
+
+*   Cache nil results for has_one associations so multiple calls don't call the database.  Closes #5757. *Michael Schoen*
+
+*   Don't save has_one associations unnecessarily.  #5735 *Jonathan Viney*
+
+*   Refactor ActiveRecord::Base.reset_subclasses to #reset, and add global observer resetting.  *Rick Olson*
+
+*   Formally deprecate the deprecated finders. *Michael Koziarski*
+
+*   Formally deprecate rich associations.  *Michael Koziarski*
+
+*   Fixed that default timezones for new / initialize should uphold utc setting #5709 *daniluk@yahoo.com*
+
+*   Fix announcement of very long migration names.  #5722 *blake@near-time.com*
+
+*   The exists? class method should treat a string argument as an id rather than as conditions.  #5698 *jeremy@planetargon.com*
+
+*   Fixed to_xml with :include misbehaviors when invoked on array of model instances #5690 *alexkwolfe@gmail.com*
+
+*   Added support for conditions on Base.exists? #5689 [Josh Peek]. Examples:
+
+        assert (Topic.exists?(:author_name => "David"))
+         assert (Topic.exists?(:author_name => "Mary", :approved => true))
+         assert (Topic.exists?(["parent_id = ?", 1]))
+
+*   Schema dumper quotes date :default values. *Dave Thomas*
+
+*   Calculate sum with SQL, not Enumerable on HasManyThrough Associations. *Dan Peterson*
+
+*   Factor the attribute#{suffix} methods out of method_missing for easier extension. *Jeremy Kemper*
+
+*   Patch sql injection vulnerability when using integer or float columns. *Jamis Buck*
+
+*   Allow #count through a has_many association to accept :include.  *Dan Peterson*
+
+*   create_table rdoc: suggest :id => false for habtm join tables. *Zed Shaw*
+
+*   PostgreSQL: return array fields as strings. #4664 *Robby Russell*
+
+*   SQLServer: added tests to ensure all database statements are closed, refactored identity_insert management code to use blocks, removed update/delete rowcount code out of execute and into update/delete, changed insert to go through execute method, removed unused quoting methods, disabled pessimistic locking tests as feature is currently unsupported, fixed RakeFile to load sqlserver specific tests whether running in ado or odbc mode, fixed support for recently added decimal types, added support for limits on integer types. #5670 *Tom Ward*
+
+*   SQLServer: fix db:schema:dump case-sensitivity. #4684 *Will Rogers*
+
+*   Oracle: BigDecimal support. #5667 *Michael Schoen*
+
+*   Numeric and decimal columns map to BigDecimal instead of Float. Those with scale 0 map to Integer. #5454 *robbat2@gentoo.org, work@ashleymoran.me.uk*
+
+*   Firebird migrations support. #5337 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   PostgreSQL: create/drop as postgres user. #4790 *mail@matthewpainter.co.uk, mlaster@metavillage.com*
+
+*   PostgreSQL: correctly quote the ' in pk_and_sequence_for. #5462 *tietew@tietew.net*
+
+*   PostgreSQL: correctly quote microseconds in timestamps. #5641 *rick@rickbradley.com*
+
+*   Clearer has_one/belongs_to model names (account has_one :user). #5632 *matt@mattmargolis.net*
+
+*   Oracle: use nonblocking queries if allow_concurrency is set, fix pessimistic locking, don't guess date vs. time by default (set OracleAdapter.emulate_dates = true for the old behavior), adapter cleanup. #5635 *Michael Schoen*
+
+*   Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 *Michael Schoen*
+
+*   Added :group to available options for finds done on associations #5516 *mike@michaeldewey.org*
+
+*   Observers also watch subclasses created after they are declared. #5535 *daniels@pronto.com.au*
+
+*   Removed deprecated timestamps_gmt class methods. *Jeremy Kemper*
+
+*   rake build_mysql_database grants permissions to rails@localhost. #5501 *brianegge@yahoo.com*
+
+*   PostgreSQL: support microsecond time resolution. #5492 *alex@msgpad.com*
+
+*   Add AssociationCollection#sum since the method_missing invokation has been shadowed by Enumerable#sum.
+
+*   Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record. *Sam Stephenson*
+
+*   Row locking. Provide a locking clause with the :lock finder option or true for the default "FOR UPDATE". Use the #lock! method to obtain a row lock on a single record (reloads the record with :lock => true). *Shugo Maeda*
+        # Obtain an exclusive lock on person 1 so we can safely increment visits.
+        Person.transaction do
+          # select * from people where id=1 for update
+          person = Person.find(1, :lock => true)
+          person.visits += 1
+          person.save!
+        end
+
+*   PostgreSQL: introduce allow_concurrency option which determines whether to use blocking or asynchronous #execute. Adapters with blocking #execute will deadlock Ruby threads. The default value is ActiveRecord::Base.allow_concurrency. *Jeremy Kemper*
+
+*   Use a per-thread (rather than global) transaction mutex so you may execute concurrent transactions on separate connections. *Jeremy Kemper*
+
+*   Change AR::Base#to_param to return a String instead of a Fixnum. Closes #5320. *Nicholas Seckar*
+
+*   Use explicit delegation instead of method aliasing for AR::Base.to_param -> AR::Base.id. #5299 (skaes@web.de)
+
+*   Refactored ActiveRecord::Base.to_xml to become a delegate for XmlSerializer, which restores sanity to the mega method. This refactoring also reinstates the opinions that type="string" is redundant and ugly and nil-differentiation is not a concern of serialization *David Heinemeier Hansson*
+
+*   Added simple hash conditions to find that'll just convert hash to an AND-based condition string #5143 [Hampton Catlin]. Example:
+
+        Person.find(:all, :conditions => { :last_name => "Catlin", :status => 1 }, :limit => 2)
+
+    ...is the same as:
+        Person.find(:all, :conditions => [ "last_name = ? and status = ?", "Catlin", 1 ], :limit => 2)
+
+    This makes it easier to pass in the options from a form or otherwise outside.
+
+
+*   Fixed issues with BLOB limits, charsets, and booleans for Firebird #5194, #5191, #5189 *kennethkunz@gmail.com*
+
+*   Fixed usage of :limit and with_scope when the association in scope is a 1:m #5208 *alex@purefiction.net*
+
+*   Fixed migration trouble with SQLite when NOT NULL is used in the new definition #5215 *greg@lapcominc.com*
+
+*   Fixed problems with eager loading and counting on SQL Server #5212 *kajism@yahoo.com*
+
+*   Fixed that count distinct should use the selected column even when using :include #5251 *anna@wota.jp*
+
+*   Fixed that :includes merged from with_scope won't cause the same association to be loaded more than once if repetition occurs in the clauses #5253 *alex@purefiction.net*
+
+*   Allow models to override to_xml.  #4989 *Blair Zajac <blair@orcaware.com>*
+
+*   PostgreSQL: don't ignore port when host is nil since it's often used to label the domain socket.  #5247 *shimbo@is.naist.jp*
+
+*   Records and arrays of records are bound as quoted ids. *Jeremy Kemper*
+        Foo.find(:all, :conditions => ['bar_id IN (?)', bars])
+        Foo.find(:first, :conditions => ['bar_id = ?', bar])
+
+*   Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty *David Heinemeier Hansson*
+
+*   Add a list of regexes assert_queries skips in the ActiveRecord test suite.  *Rick Olson*
+
+*   Fix the has_and_belongs_to_many #create doesn't populate the join for new records.  Closes #3692 *Josh Susser*
+
+*   Provide Association Extensions access to the instance that the association is being accessed from.
+    Closes #4433 *Josh Susser*
+
+*   Update OpenBase adaterp's maintainer's email address. Closes #5176. *Derrick Spell*
+
+*   Add a quick note about :select and eagerly included associations. *Rick Olson*
+
+*   Add docs for the :as option in has_one associations.  Closes #5144 *cdcarter@gmail.com*
+
+*   Fixed that has_many collections shouldn't load the entire association to do build or create *David Heinemeier Hansson*
+
+*   Added :allow_nil option for aggregations #5091 *Ian White*
+
+*   Fix Oracle boolean support and tests. Closes #5139. *Michael Schoen*
+
+*   create! no longer blows up when no attributes are passed and a :create scope is in effect (e.g. foo.bars.create! failed whereas foo.bars.create!({}) didn't.) *Jeremy Kemper*
+
+*   Call Inflector#demodulize on the class name when eagerly including an STI model.  Closes #5077 *info@loobmedia.com*
+
+*   Preserve MySQL boolean column defaults when changing a column in a migration. Closes #5015. *pdcawley@bofh.org.uk*
+
+*   PostgreSQL: migrations support :limit with :integer columns by mapping limit < 4 to smallint, > 4 to bigint, and anything else to integer. #2900 *keegan@thebasement.org*
+
+*   Dates and times interpret empty strings as nil rather than 2000-01-01. #4830 *kajism@yahoo.com*
+
+*   Allow :uniq => true with has_many :through associations. *Jeremy Kemper*
+
+*   Ensure that StringIO is always available for the Schema dumper. *Marcel Molina Jr.*
+
+*   Allow AR::Base#to_xml to include methods too. Closes #4921. *johan@textdrive.com*
+
+*   Remove duplicate fixture entry in comments.yml. Closes #4923. *Blair Zajac <blair@orcaware.com>*
+
+*   When grouping, use the appropriate option key. *Marcel Molina Jr.*
+
+*   Add support for FrontBase (http://www.frontbase.com/) with a new adapter thanks to the hard work of one Mike Laster. Closes #4093. *mlaster@metavillage.com*
+
+*   Add warning about the proper way to validate the presence of a foreign key. Closes #4147. *Francois Beausoleil <francois.beausoleil@gmail.com>*
+
+*   Fix syntax error in documentation. Closes #4679. *Mislav Marohnić*
+
+*   Add Oracle support for CLOB inserts. Closes #4748. *schoenm@earthlink.net sandra.metz@duke.edu*
+
+*   Various fixes for sqlserver_adapter (odbc statement finishing, ado schema dumper, drop index). Closes #4831. *kajism@yahoo.com*
+
+*   Add support for :order option to with_scope. Closes #3887. *eric.daspet@survol.net*
+
+*   Prettify output of schema_dumper by making things line up. Closes #4241 *Caio  Chassot <caio@v2studio.com>*
+
+*   Make build_postgresql_databases task make databases owned by the postgres user. Closes #4790. *mlaster@metavillage.com*
+
+*   Sybase Adapter type conversion cleanup. Closes #4736. *dev@metacasa.net*
+
+*   Fix bug where calculations with long alias names return null. *Rick Olson*
+
+*   Raise error when trying to add to a has_many :through association.  Use the Join Model instead. *Rick Olson*
+
+        @post.tags << @tag                  # BAD
+        @post.taggings.create(:tag => @tag) # GOOD
+
+*   Allow all calculations to take the :include option, not just COUNT (closes #4840) *Rick Olson*
+
+*   Add ActiveRecord::Errors#to_xml *Jamis Buck*
+
+*   Properly quote index names in migrations (closes #4764) *John Long*
+
+*   Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility.  *Rick Olson*
+
+*   Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions *Rick Olson*
+
+*   Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. *Rick Olson*
+
+*   Add :case_sensitive option to validates_uniqueness_of (closes #3090) *Rick Olson*
+
+        class Account < ActiveRecord::Base
+          validates_uniqueness_of :email, :case_sensitive => false
+        end
+
+*   Allow multiple association extensions with :extend option (closes #4666) *Josh Susser*
+
+        class Account < ActiveRecord::Base
+          has_many :people, :extend => [FindOrCreateByNameExtension, FindRecentExtension]
+        end
+
+
+## 1.14.4 (August 8th, 2006) ##
+
+*   Add warning about the proper way to validate the presence of a foreign key.  #4147 *Francois Beausoleil <francois.beausoleil@gmail.com>*
+
+*   Fix syntax error in documentation. #4679 *Mislav Marohnić*
+
+*   Update inconsistent migrations documentation. #4683 *machomagna@gmail.com*
+
+
+## 1.14.3 (June 27th, 2006) ##
+
+*   Fix announcement of very long migration names.  #5722 *blake@near-time.com*
+
+*   Update callbacks documentation. #3970 *Robby Russell <robby@planetargon.com>*
+
+*   Properly quote index names in migrations (closes #4764) *John Long*
+
+*   Ensure that Associations#include_eager_conditions? checks both scoped and explicit conditions *Rick Olson*
+
+*   Associations#select_limited_ids_list adds the ORDER BY columns to the SELECT DISTINCT List for postgresql. *Rick Olson*
+
+
+## 1.14.2 (April 9th, 2006) ##
+
+*   Fixed calculations for the Oracle Adapter (closes #4626) *Michael Schoen*
+
+
+## 1.14.1 (April 6th, 2006) ##
+
+*   Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. *Nicholas Seckar*
+
+*   Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) *Lars Pind*
+
+*   Enable Limit/Offset in Calculations (closes #4558) *lmarlow*
+
+*   Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) *Rick Olson*
+
+*   Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 *lagroue@free.fr*
+
+*   Allow AR::Base#respond_to? to behave when @attributes is nil *Ryan Davis*
+
+*   Support eager includes when going through a polymorphic has_many association. *Rick Olson*
+
+*   Added support for eagerly including polymorphic has_one associations. (closes #4525) *Rick Olson*
+
+        class Post < ActiveRecord::Base
+          has_one :tagging, :as => :taggable
+        end
+
+        Post.find :all, :include => :tagging
+
+*   Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many *Rick Olson*
+
+*   Added support for going through a polymorphic has_many association: (closes #4401) *Rick Olson*
+
+        class PhotoCollection < ActiveRecord::Base
+          has_many :photos, :as => :photographic
+          belongs_to :firm
+        end
+
+        class Firm < ActiveRecord::Base
+          has_many :photo_collections
+          has_many :photos, :through => :photo_collections
+        end
+
+*   Multiple fixes and optimizations in PostgreSQL adapter, allowing ruby-postgres gem to work properly. *ruben.nine@gmail.com*
+
+*   Fixed that AssociationCollection#delete_all should work even if the records of the association are not loaded yet. *Florian Weber*
+
+*   Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations.  (closes #4456) *Stefan*
+
+*   Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) *Rick Olson*
+
+*   DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model *David Heinemeier Hansson*
+
+*   Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) *David Heinemeier Hansson*
+
+*   Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). *Marcel Mollina Jr.*
+
+*   Fixed broken OCIAdapter #4457 *Michael Schoen*
+
+
+## 1.14.0 (March 27th, 2006) ##
+
+*   Replace 'rescue Object' with a finer grained rescue. Closes #4431. *Nicholas Seckar*
+
+*   Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table *Rick Olson*
+
+*   Add support for :include to with_scope *andrew@redlinesoftware.com*
+
+*   Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 *Michael Schoen*
+
+*   Change periods (.) in table aliases to _'s.  Closes #4251 *jeff@ministrycentered.com*
+
+*   Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 *Rick Olson*
+
+*   Fixed issue that kept :select options from being scoped *Rick Olson*
+
+*   Fixed db_schema_import when binary types are present #3101 *David Heinemeier Hansson*
+
+*   Fixed that MySQL enums should always be returned as strings #3501 *David Heinemeier Hansson*
+
+*   Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. *Rick Olson*
+
+        class Connection < ActiveRecord::Base
+          belongs_to :user
+          belongs_to :channel
+        end
+
+        class Channel < ActiveRecord::Base
+          has_many :connections
+          has_many :contacts, :through => :connections, :class_name => 'User' # OLD
+          has_many :contacts, :through => :connections, :source => :user      # NEW
+        end
+
+*   Fixed DB2 adapter so nullable columns will be determines correctly now and quotes from column default values will be removed #4350 *contact@maik-schmidt.de*
+
+*   Allow overriding of find parameters in scoped has_many :through calls *Rick Olson*
+
+    In this example, :include => false disables the default eager association from loading.  :select changes the standard
+    select clause.  :joins specifies a join that is added to the end of the has_many :through query.
+
+        class Post < ActiveRecord::Base
+          has_many :tags, :through => :taggings, :include => :tagging do
+            def add_joins_and_select
+              find :all, :select => 'tags.*, authors.id as author_id', :include => false,
+                :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
+            end
+          end
+        end
+
+*   Fixed that schema changes while the database was open would break any connections to an SQLite database (now we reconnect if that error is throw) *David Heinemeier Hansson*
+
+*   Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) *Jonathan Viney*
+
+*   Quit ignoring default :include options in has_many :through calls *Mark James*
+
+*   Allow has_many :through associations to find the source association by setting a custom class (closes #4307) *Jonathan Viney*
+
+*   Eager Loading support added for has_many :through => :has_many associations (see below).  *Rick Olson*
+
+*   Allow has_many :through to work on has_many associations (closes #3864) [sco@scottraymond.net]  Example:
+
+        class Firm < ActiveRecord::Base
+          has_many :clients
+          has_many :invoices, :through => :clients
+        end
+
+        class Client < ActiveRecord::Base
+          belongs_to :firm
+          has_many   :invoices
+        end
+
+        class Invoice < ActiveRecord::Base
+          belongs_to :client
+        end
+
+*   Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) *Josh Susser*
+
+*   Fixed has_many :through to include :conditions set on the :through association. closes #4020 *Jonathan Viney*
+
+*   Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) *andylien@gmail.com / Rick Olson*
+
+*   SQL Server adapter gets some love #4298 *Ryan Tomayko*
+
+*   Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 *derrickspell@cdmplus.com*
+
+*   Rework table aliasing to account for truncated table aliases.  Add smarter table aliasing when doing eager loading of STI associations. This allows you to use the association name in the order/where clause. [Jonathan Viney / Rick Olson] #4108 Example (SpecialComment is using STI):
+
+        Author.find(:all, :include => { :posts => :special_comments }, :order => 'special_comments.body')
+
+*   Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. *Rick Olson*
+
+*   Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 *Michael Koziarski*
+
+*   Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 *Michael Koziarski*
+
+*   Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 *Tom Ward*
+
+*   Fixed that Migration#execute would have the table name prefix appended to its query #4110 *mark.imbriaco@pobox.com*
+
+*   Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) *Jamis Buck*
+
+*   Use association's :conditions when eager loading. [Jeremy Evans] #4144
+
+*   Alias the has_and_belongs_to_many join table on eager includes. #4106 *Jeremy Evans*
+
+    This statement would normally error because the projects_developers table is joined twice, and therefore joined_on would be ambiguous.
+
+        Developer.find(:all, :include => {:projects => :developers}, :conditions => 'join_project_developers.joined_on IS NOT NULL')
+
+*   Oracle adapter gets some love #4230 *Michael Schoen*
+
+        * Changes :text to CLOB rather than BLOB [Moses Hohman]
+        * Fixes an issue with nil numeric length/scales (several)
+        * Implements support for XMLTYPE columns [wilig / Kubo Takehiro]
+        * Tweaks a unit test to get it all green again
+        * Adds support for #current_database
+
+*   Added Base.abstract_class? that marks which classes are not part of the Active Record hierarchy #3704 *Rick Olson*
+
+        class CachedModel < ActiveRecord::Base
+          self.abstract_class = true
+        end
+
+        class Post < CachedModel
+        end
+
+        CachedModel.abstract_class?
+        => true
+
+        Post.abstract_class?
+        => false
+
+        Post.base_class
+        => Post
+
+        Post.table_name
+        => 'posts'
+
+*   Allow :dependent options to be used with polymorphic joins. #3820 *Rick Olson*
+
+        class Foo < ActiveRecord::Base
+          has_many :attachments, :as => :attachable, :dependent => :delete_all
+        end
+
+*   Nicer error message on has_many :through when :through reflection can not be found. #4042 *court3nay*
+
+*   Upgrade to Transaction::Simple 1.3 *Jamis Buck*
+
+*   Catch FixtureClassNotFound when using instantiated fixtures on a fixture that has no ActiveRecord model *Rick Olson*
+
+*   Allow ordering of calculated results and/or grouped fields in calculations *solo@gatelys.com*
+
+*   Make ActiveRecord::Base#save! return true instead of nil on success.  #4173 *johan@johansorensen.com*
+
+*   Dynamically set allow_concurrency.  #4044 *Stefan Kaes*
+
+*   Added Base#to_xml that'll turn the current record into a XML representation [David Heinemeier Hansson]. Example:
+
+        topic.to_xml
+
+    ...returns:
+
+        <?xml version="1.0" encoding="UTF-8"?>
+        <topic>
+          <title>The First Topic</title>
+          <author-name>David</author-name>
+          <id type="integer">1</id>
+          <approved type="boolean">false</approved>
+          <replies-count type="integer">0</replies-count>
+          <bonus-time type="datetime">2000-01-01 08:28:00</bonus-time>
+          <written-on type="datetime">2003-07-16 09:28:00</written-on>
+          <content>Have a nice day</content>
+          <author-email-address>david@loudthinking.com</author-email-address>
+          <parent-id></parent-id>
+          <last-read type="date">2004-04-15</last-read>
+        </topic>
+
+    ...and you can configure with:
+
+        topic.to_xml(:skip_instruct => true, :except => [ :id, bonus_time, :written_on, replies_count ])
+
+    ...that'll return:
+
+        <topic>
+          <title>The First Topic</title>
+          <author-name>David</author-name>
+          <approved type="boolean">false</approved>
+          <content>Have a nice day</content>
+          <author-email-address>david@loudthinking.com</author-email-address>
+          <parent-id></parent-id>
+          <last-read type="date">2004-04-15</last-read>
+        </topic>
+
+    You can even do load first-level associations as part of the document:
+
+        firm.to_xml :include => [ :account, :clients ]
+
+    ...that'll return something like:
+
+        <?xml version="1.0" encoding="UTF-8"?>
+        <firm>
+          <id type="integer">1</id>
+          <rating type="integer">1</rating>
+          <name>37signals</name>
+          <clients>
+            <client>
+              <rating type="integer">1</rating>
+              <name>Summit</name>
+            </client>
+            <client>
+              <rating type="integer">1</rating>
+              <name>Microsoft</name>
+            </client>
+          </clients>
+          <account>
+            <id type="integer">1</id>
+            <credit-limit type="integer">50</credit-limit>
+          </account>
+        </firm>
+
+*   Allow :counter_cache to take a column name for custom counter cache columns *Jamis Buck*
+
+*   Documentation fixes for :dependent *robby@planetargon.com*
+
+*   Stop the MySQL adapter crashing when views are present. #3782 *Jonathan Viney*
+
+*   Don't classify the belongs_to class, it is already singular #4117 *keithm@infused.org*
+
+*   Allow set_fixture_class to take Classes instead of strings for a class in a module.  Raise FixtureClassNotFound if a fixture can't load.  *Rick Olson*
+
+*   Fix quoting of inheritance column for STI eager loading #4098 *Jonathan Viney <jonathan@bluewire.net.nz>*
+
+*   Added smarter table aliasing for eager associations for multiple self joins #3580 *Rick Olson*
+
+        * The first time a table is referenced in a join, no alias is used.
+        * After that, the parent class name and the reflection name are used.
+
+            Tree.find(:all, :include => :children) # LEFT OUTER JOIN trees AS tree_children ...
+
+        * Any additional join references get a numerical suffix like '_2', '_3', etc.
+
+*   Fixed eager loading problems with single-table inheritance #3580 [Rick Olson]. Post.find(:all, :include => :special_comments) now returns all posts, and any special comments that the posts may have. And made STI work with has_many :through and polymorphic belongs_to.
+
+*   Added cascading eager loading that allows for queries like Author.find(:all, :include=> { :posts=> :comments }), which will fetch all authors, their posts, and the comments belonging to those posts in a single query (using LEFT OUTER JOIN) #3913 [anna@wota.jp]. Examples:
+
+        # cascaded in two levels
+        >> Author.find(:all, :include=>{:posts=>:comments})
+        => authors
+             +- posts
+                  +- comments
+
+        # cascaded in two levels and normal association
+        >> Author.find(:all, :include=>[{:posts=>:comments}, :categorizations])
+        => authors
+             +- posts
+                  +- comments
+             +- categorizations
+
+        # cascaded in two levels with two has_many associations
+        >> Author.find(:all, :include=>{:posts=>[:comments, :categorizations]})
+        => authors
+             +- posts
+                  +- comments
+                  +- categorizations
+
+        # cascaded in three levels
+        >> Company.find(:all, :include=>{:groups=>{:members=>{:favorites}}})
+        => companies
+             +- groups
+                  +- members
+                       +- favorites
+
+*   Make counter cache work when replacing an association #3245 *eugenol@gmail.com*
+
+*   Make migrations verbose *Jamis Buck*
+
+*   Make counter_cache work with polymorphic belongs_to *Jamis Buck*
+
+*   Fixed that calling HasOneProxy#build_model repeatedly would cause saving to happen #4058 *anna@wota.jp*
+
+*   Added Sybase database adapter that relies on the Sybase Open Client bindings (see http://raa.ruby-lang.org/project/sybase-ctlib) #3765 [John Sheets]. It's almost completely Active Record compliant (including migrations), but has the following caveats:
+
+        * Does not support DATE SQL column types; use DATETIME instead.
+        * Date columns on HABTM join tables are returned as String, not Time.
+        * Insertions are potentially broken for :polymorphic join tables
+        * BLOB column access not yet fully supported
+
+*   Clear stale, cached connections left behind by defunct threads. *Jeremy Kemper*
+
+*   CHANGED DEFAULT: set ActiveRecord::Base.allow_concurrency to false.  Most AR usage is in single-threaded applications. *Jeremy Kemper*
+
+*   Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 *Michael Schoen*
+
+*   Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 *David Heinemeier Hansson*
+
+*   Speed up class -> connection caching and stale connection verification.  #3979 *Stefan Kaes*
+
+*   Add set_fixture_class to allow the use of table name accessors with models which use set_table_name. *Kevin Clark*
+
+*   Added that fixtures to placed in subdirectories of the main fixture files are also loaded #3937 *dblack@wobblini.net*
+
+*   Define attribute query methods to avoid method_missing calls. #3677 *Jonathan Viney*
+
+*   ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 *Simon Stapleton, Tom Ward*
+
+*   Added support for nested scopes #3407 [anna@wota.jp]. Examples:
+
+        Developer.with_scope(:find => { :conditions => "salary > 10000", :limit => 10 }) do
+          Developer.find(:all)     # => SELECT * FROM developers WHERE (salary > 10000) LIMIT 10
+
+          # inner rule is used. (all previous parameters are ignored)
+          Developer.with_exclusive_scope(:find => { :conditions => "name = 'Jamis'" }) do
+            Developer.find(:all)   # => SELECT * FROM developers WHERE (name = 'Jamis')
+          end
+
+          # parameters are merged
+          Developer.with_scope(:find => { :conditions => "name = 'Jamis'" }) do
+            Developer.find(:all)   # => SELECT * FROM developers WHERE (( salary > 10000 ) AND ( name = 'Jamis' )) LIMIT 10
+          end
+        end
+
+*   Fixed db2 connection with empty user_name and auth options #3622 *phurley@gmail.com*
+
+*   Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 *Masao Mutoh*
+
+*   Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 *Lars Pind*
+
+*   Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
+
+        Person.average :age
+        Person.minimum :age
+        Person.maximum :age
+        Person.sum :salary, :group => :last_name
+
+*   Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 *Luke Redpath*
+
+*   Reflections don't attempt to resolve module nesting of association classes. Simplify type computation. *Jeremy Kemper*
+
+*   Improved the Oracle OCI Adapter with better performance for column reflection (from #3210), fixes to migrations (from #3476 and #3742), tweaks to unit tests (from #3610), and improved documentation (from #2446) #3879 *Aggregated by schoenm@earthlink.net*
+
+*   Fixed that the schema_info table used by ActiveRecord::Schema.define should respect table pre- and suffixes #3834 *rubyonrails@atyp.de*
+
+*   Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 *Stefan Kaes*
+
+*   Correct syntax error in mysql DDL,  and make AAACreateTablesTest run first *Bob Silva*
+
+*   Allow :include to be used with has_many :through associations #3611 *Michael Schoen*
+
+*   PostgreSQL: smarter schema dumps using pk_and_sequence_for(table).  #2920 *Blair Zajac*
+
+*   SQLServer: more compatible limit/offset emulation.  #3779 *Tom Ward*
+
+*   Polymorphic join support for has_one associations (has_one :foo, :as => :bar)  #3785 *Rick Olson*
+
+*   PostgreSQL: correctly parse negative integer column defaults.  #3776 *bellis@deepthought.org*
+
+*   Fix problems with count when used with :include *Jeremy Hopple and Kevin Clark*
+
+*   ActiveRecord::RecordInvalid now states which validations failed in its default error message *Tobias Lütke*
+
+*   Using AssociationCollection#build with arrays of hashes should call build, not create *David Heinemeier Hansson*
+
+*   Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. *Nicholas Seckar*
+
+*   Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 *Maik Schmidt*
+
+*   Support the :column option for remove_index with the PostgreSQL adapter. #3661 *Shugo Maeda*
+
+*   Add documentation for add_index and remove_index. #3600 *Manfred Stienstra <m.stienstra@fngtps.com>*
+
+*   If the OCI library is not available, raise an exception indicating as much. #3593 *Michael Schoen*
+
+*   Add explicit :order in finder tests as postgresql orders results differently by default. #3577. *Rick Olson*
+
+*   Make dynamic finders honor additional passed in :conditions. #3569 *Oleg Pudeyev <pudeyo@rpi.edu>, Marcel Molina Jr.*
+
+*   Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. *Nicholas Seckar*
+
+*   Make .count work for has_many associations with multi line finder sql *Michael Schoen*
+
+*   Add AR::Base.base_class for querying the ancestor AR::Base subclass *Jamis Buck*
+
+*   Allow configuration of the column used for optimistic locking *wilsonb@gmail.com*
+
+*   Don't hardcode 'id' in acts as list.  *ror@philippeapril.com*
+
+*   Fix date errors for SQLServer in association tests. #3406 *Kevin Clark*
+
+*   Escape database name in MySQL adapter when creating and dropping databases. #3409 *anna@wota.jp*
+
+*   Disambiguate table names for columns in validates_uniqueness_of's WHERE clause. #3423 *alex.borovsky@gmail.com*
+
+*   .with_scope imposed create parameters now bypass attr_protected *Tobias Lütke*
+
+*   Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. *Marcel Molina Jr.*
+
+*   Multiple enhancements and adjustments to DB2 adaptor. #3377 *contact@maik-schmidt.de*
+
+*   Sanitize scoped conditions. *Marcel Molina Jr.*
+
+*   Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) *David Heinemeier Hansson*
+
+*   Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. *Tobias Lütke*
+
+*   SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. *Tobias Lütke*
+
+*   Fixed that saving a model with multiple habtm associations would only save the first one.  #3244 *yanowitz-rubyonrails@quantumfoam.org, Florian Weber*
+
+*   Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 *wejn@box.cz, Rick Olson, Scott Barron*
+
+*   removed :piggyback in favor of just allowing :select on :through associations. *Tobias Lütke*
+
+*   made method missing delegation to class methods on relation target work on :through associations. *Tobias Lütke*
+
+*   made .find() work on :through relations. *Tobias Lütke*
+
+*   Fix typo in association docs. #3296. *Blair Zajac*
+
+*   Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model *Tobias Lütke*
+
+## 1.13.2 (December 13th, 2005) ##
+
+*   Become part of Rails 1.0
+
+*   MySQL: allow encoding option for mysql.rb driver.  *Jeremy Kemper*
+
+*   Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]. Example:
+
+        class Post
+          has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
+        end
+
+        post.recent_comments.find(:all) # Uses LIMIT 10 and includes authors
+        post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
+        post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
+
+*   Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations *David Heinemeier Hansson*
+
+*   MySQL: fixes for the bundled mysql.rb driver.  #3160 *Justin Forder*
+
+*   SQLServer: fix obscure optimistic locking bug.  #3068 *kajism@yahoo.com*
+
+*   SQLServer: support uniqueidentifier columns.  #2930 *keithm@infused.org*
+
+*   SQLServer: cope with tables names qualified by owner.  #3067 *jeff@ministrycentered.com*
+
+*   SQLServer: cope with columns with "desc" in the name.  #1950 *Ron Lusk, Ryan Tomayko*
+
+*   SQLServer: cope with primary keys with "select" in the name.  #3057 *rdifrango@captechventures.com*
+
+*   Oracle: active? performs a select instead of a commit.  #3133 *Michael Schoen*
+
+*   MySQL: more robust test for nullified result hashes.  #3124 *Stefan Kaes*
+
+*   Reloading an instance refreshes its aggregations as well as its associations.  #3024 *François Beausoleil*
+
+*   Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 *Paul Hammmond*
+
+*   PostgreSQL: more robust sequence name discovery.  #3087 *Rick Olson*
+
+*   Oracle: use syntax compatible with Oracle 8.  #3131 *Michael Schoen*
+
+*   MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat.  Eliminate usage of mysql.ping because it doesn't guarantee reconnect.  Explicitly close and reopen the connection instead.  *Jeremy Kemper*
+
+*   Added preliminary support for polymorphic associations *David Heinemeier Hansson*
+
+*   Added preliminary support for join models *David Heinemeier Hansson*
+
+*   Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. *jeremy@jthopple.com, Marcel Molina Jr.*
+
+*   Firebird: active? and reconnect! methods for handling stale connections.  #428 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   Firebird: updated for FireRuby 0.4.0.  #3009 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   MySQL and PostgreSQL: active? compatibility with the pure-Ruby driver.  #428 *Jeremy Kemper*
+
+*   Oracle: active? check pings the database rather than testing the last command status.  #428 *Michael Schoen*
+
+*   SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find.  #2974 *kajism@yahoo.com*
+
+*   Reloading a model doesn't lose track of its connection.  #2996 *junk@miriamtech.com, Jeremy Kemper*
+
+*   Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 *colman@rominato.com, Florian Weber, Michael Schoen*
+
+*   MySQL, PostgreSQL: reconnect! also reconfigures the connection.  Otherwise, the connection 'loses' its settings if it times out and is reconnected.  #2978 *Shugo Maeda*
+
+*   has_and_belongs_to_many: use JOIN instead of LEFT JOIN.  *Jeremy Kemper*
+
+*   MySQL: introduce :encoding option to specify the character set for client, connection, and results.  Only available for MySQL 4.1 and later with the mysql-ruby driver.  Do SHOW CHARACTER SET in mysql client to see available encodings.  #2975 *Shugo Maeda*
+
+*   Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. *Marcel Molina Jr.*
+
+*   Correct boolean handling in generated reader methods.  #2945 *Don Park, Stefan Kaes*
+
+*   Don't generate read methods for columns whose names are not valid ruby method names.  #2946 *Stefan Kaes*
+
+*   Document :force option to create_table.  #2921 *Blair Zajac <blair@orcaware.com>*
+
+*   Don't add the same conditions twice in has_one finder sql.  #2916 *Jeremy Evans*
+
+*   Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+*   Introducing the Firebird adapter.  Quote columns and use attribute_condition more consistently.  Setup guide: http://wiki.rubyonrails.com/rails/pages/Firebird+Adapter  #1874 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   SQLServer: active? and reconnect! methods for handling stale connections.  #428 *kajism@yahoo.com, Tom Ward <tom@popdog.net>*
+
+*   Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array.  #1345 *MarkusQ@reality.com*
+
+*   SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  #2866 *kajism@yahoo.com, Tom Ward <tom@popdog.net>*
+
+*   Oracle: active? and reconnect! methods for handling stale connections.  Optionally retry queries after reconnect.  #428 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Correct documentation for Base.delete_all.  #1568 *Newhydra*
+
+*   Oracle: test case for column default parsing.  #2788 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Update documentation for Migrations.  #2861 *Tom Werner <tom@cube6media.com>*
+
+*   When AbstractAdapter#log rescues an exception, attempt to detect and reconnect to an inactive database connection.  Connection adapter must respond to the active? and reconnect! instance methods.  Initial support for PostgreSQL, MySQL, and SQLite.  Make certain that all statements which may need reconnection are performed within a logged block: for example, this means no avoiding log(sql, name) { } if @logger.nil?  #428 *Jeremy Kemper*
+
+*   Oracle: Much faster column reflection.  #2848 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Base.reset_sequence_name analogous to reset_table_name (mostly useful for testing).  Base.define_attr_method allows nil values.  *Jeremy Kemper*
+
+*   PostgreSQL: smarter sequence name defaults, stricter last_insert_id, warn on pk without sequence.  *Jeremy Kemper*
+
+*   PostgreSQL: correctly discover custom primary key sequences.  #2594 *Blair Zajac <blair@orcaware.com>, meadow.nnick@gmail.com, Jeremy Kemper*
+
+*   SQLServer: don't report limits for unsupported field types.  #2835 *Ryan Tomayko*
+
+*   Include the Enumerable module in ActiveRecord::Errors.  *Rick Bradley <rick@rickbradley.com>*
+
+*   Add :group option, correspond to GROUP BY, to the find method and to the has_many association.  #2818 *rubyonrails@atyp.de*
+
+*   Don't cast nil or empty strings to a dummy date.  #2789 *Rick Bradley <rick@rickbradley.com>*
+
+*   acts_as_list plays nicely with inheritance by remembering the class which declared it.  #2811 *rephorm@rephorm.com*
+
+*   Fix sqlite adaptor's detection of missing dbfile or database declaration. *Nicholas Seckar*
+
+*   Fixed acts_as_list for definitions without an explicit :order #2803 *Jonathan Viney*
+
+*   Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support.  Local change [301] is now a part of the main driver; reapplied local change [2182].  Removed GC.start from Result.free.  *tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper*
+
+*   Correct handling of complex order clauses with SQL Server limit emulation.  #2770 *Tom Ward <tom@popdog.net>, Matt B.*
+
+*   Correct whitespace problem in Oracle default column value parsing.  #2788 *rick@rickbradley.com*
+
+*   Destroy associated has_and_belongs_to_many records after all before_destroy callbacks but before destroy.  This allows you to act on the habtm association as you please while preserving referential integrity.  #2065 *larrywilliams1@gmail.com, sam.kirchmeier@gmail.com, elliot@townx.org, Jeremy Kemper*
+
+*   Deprecate the old, confusing :exclusively_dependent option in favor of :dependent => :delete_all.  *Jeremy Kemper*
+
+*   More compatible Oracle column reflection.  #2771 *Ryan Davis <ryand-ruby@zenspider.com>, Michael Schoen <schoenm@earthlink.net>*
+
+
+## 1.13.0 (November 7th, 2005) ##
+
+*   Fixed faulty regex in get_table_name method (SQLServerAdapter) #2639 *Ryan Tomayko*
+
+*   Added :include as an option for association declarations [David Heinemeier Hansson]. Example:
+
+        has_many :posts, :include => [ :author, :comments ]
+
+*   Rename Base.constrain to Base.with_scope so it doesn't conflict with existing concept of database constraints.  Make scoping more robust: uniform method => parameters, validated method names and supported finder parameters, raise exception on nested scopes.  [Jeremy Kemper]  Example:
+
+        Comment.with_scope(:find => { :conditions => 'active=true' }, :create => { :post_id => 5 }) do
+          # Find where name = ? and active=true
+          Comment.find :all, :conditions => ['name = ?', name]
+          # Create comment associated with :post_id
+          Comment.create :body => "Hello world"
+        end
+
+*   Fixed that SQL Server should ignore :size declarations on anything but integer and string in the agnostic schema representation #2756 *Ryan Tomayko*
+
+*   Added constrain scoping for creates using a hash of attributes bound to the :creation key [David Heinemeier Hansson]. Example:
+
+        Comment.constrain(:creation => { :post_id => 5 }) do
+          # Associated with :post_id
+          Comment.create :body => "Hello world"
+        end
+
+    This is rarely used directly, but allows for find_or_create on associations. So you can do:
+
+        # If the tag doesn't exist, a new one is created that's associated with the person
+        person.tags.find_or_create_by_name("Summer")
+
+*   Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [David Heinemeier Hansson]. Example:
+
+        # No 'Summer' tag exists
+        Tag.find_or_create_by_name("Summer") # equal to Tag.create(:name => "Summer")
+
+        # Now the 'Summer' tag does exist
+        Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
+
+*   Added extension capabilities to has_many and has_and_belongs_to_many proxies [David Heinemeier Hansson]. Example:
+
+        class Account < ActiveRecord::Base
+          has_many :people do
+            def find_or_create_by_name(name)
+              first_name, *last_name = name.split
+              last_name = last_name.join " "
+
+              find_or_create_by_first_name_and_last_name(first_name, last_name)
+            end
+          end
+        end
+
+        person = Account.find(:first).people.find_or_create_by_name("David Heinemeier Hansson")
+        person.first_name # => "David"
+        person.last_name  # => "Heinemeier Hansson"
+
+    Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
+
+*   Omit internal dtproperties table from SQLServer table list.  #2729 *Ryan Tomayko*
+
+*   Quote column names in generated SQL.  #2728 *Ryan Tomayko*
+
+*   Correct the pure-Ruby MySQL 4.1.1 shim's version test.  #2718 *Jeremy Kemper*
+
+*   Add Model.create! to match existing model.save! method.  When save! raises RecordInvalid, you can catch the exception, retrieve the invalid record (invalid_exception.record), and see its errors (invalid_exception.record.errors).  *Jeremy Kemper*
+
+*   Correct fixture behavior when table name pluralization is off.  #2719 *Rick Bradley <rick@rickbradley.com>*
+
+*   Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) #2644 *Dan Peterson*
+
+*   Added migration support for Oracle #2647 *Michael Schoen*
+
+*   Worked around that connection can't be reset if allow_concurrency is off.  #2648 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Fixed SQL Server adapter to pass even more tests and do even better #2634 *Ryan Tomayko*
+
+*   Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 *Tom Ward*
+
+*   Added migration support to SQL Server adapter (please someone do the same for Oracle and DB2) #2625 *Tom Ward*
+
+*   Use AR::Base.silence rather than AR::Base.logger.silence in fixtures to preserve Log4r compatibility.  #2618 *dansketcher@gmail.com*
+
+*   Constraints are cloned so they can't be inadvertently modified while they're
+    in effect.  Added :readonly finder constraint.  Calling an association collection's class method (Part.foobar via item.parts.foobar) constrains :readonly => false since the collection's :joins constraint would otherwise force it to true.  [Jeremy Kemper <rails@bitsweat.net>]
+*   Added :offset and :limit to the kinds of options that Base.constrain can use #2466 *duane.johnson@gmail.com*
+
+*   Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 *Michael Schoen*
+
+*   Added quoted_true and quoted_false methods and tables to db2_adapter and cleaned up tests for DB2 #2493, #2624 *maik schmidt*
+
+
+## 1.12.2 (October 26th, 2005) ##
+
+*   Allow symbols to rename columns when using SQLite adapter. #2531 *Kevin Clark*
+
+*   Map Active Record time to SQL TIME.  #2575, #2576 *Robby Russell <robby@planetargon.com>*
+
+*   Clarify semantics of ActiveRecord::Base#respond_to?  #2560 *Stefan Kaes*
+
+*   Fixed Association#clear for associations which have not yet been accessed. #2524 *Patrick Lenz <patrick@lenz.sh>*
+
+*   HABTM finders shouldn't return readonly records.  #2525 *Patrick Lenz <patrick@lenz.sh>*
+
+*   Make all tests runnable on their own. #2521. *Blair Zajac <blair@orcaware.com>*
+
+
+## 1.12.1 (October 19th, 2005) ##
+
+*   Always parenthesize :conditions options so they may be safely combined with STI and constraints.
+
+*   Correct PostgreSQL primary key sequence detection.  #2507 *tmornini@infomania.com*
+
+*   Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
+
+
+## 1.12.0 (October 16th, 2005) ##
+
+*   Update/clean up documentation (rdoc)
+
+*   PostgreSQL sequence support.  Use set_sequence_name in your model class to specify its primary key sequence.  #2292 *Rick Olson <technoweenie@gmail.com>, Robby Russell <robby@planetargon.com>*
+
+*   Change default logging colors to work on both white and black backgrounds. *Sam Stephenson*
+
+*   YAML fixtures support ordered hashes for fixtures with foreign key dependencies in the same table.  #1896 *purestorm@ggnore.net*
+
+*   :dependent now accepts :nullify option. Sets the foreign key of the related objects to NULL instead of deleting them. #2015 *Robby Russell <robby@planetargon.com>*
+
+*   Introduce read-only records.  If you call object.readonly! then it will mark the object as read-only and raise ReadOnlyRecord if you call object.save.  object.readonly? reports whether the object is read-only.  Passing :readonly => true to any finder method will mark returned records as read-only.  The :joins option now implies :readonly, so if you use this option, saving the same record will now fail.  Use find_by_sql to work around.
+
+*   Avoid memleak in dev mode when using fcgi
+
+*   Simplified .clear on active record associations by using the existing delete_records method. #1906 *Caleb <me@cpb.ca>*
+
+*   Delegate access to a customized primary key to the conventional id method. #2444. *Blair Zajac <blair@orcaware.com>*
+
+*   Fix errors caused by assigning a has-one or belongs-to property to itself
+
+*   Add ActiveRecord::Base.schema_format setting which specifies how databases should be dumped *Sam Stephenson*
+
+*   Update DB2 adapter. #2206. *contact@maik-schmidt.de*
+
+*   Corrections to SQLServer native data types. #2267.  *rails.20.clarry@spamgourmet.com*
+
+*   Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency.
+
+*   Protect id attribute from mass assigment even when the primary key is set to something else. #2438. *Blair Zajac <blair@orcaware.com>*
+
+*   Misc doc fixes (typos/grammar/etc.). #2430. *coffee2code*
+
+*   Add test coverage for content_columns. #2432. *coffee2code*
+
+*   Speed up for unthreaded environments. #2431. *Stefan Kaes*
+
+*   Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. *Stefan Kaes*
+
+*   Speed up the setting of table_name. #2428. *Stefan Kaes*
+
+*   Optimize instantiation of STI subclass records. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Fix typo of 'constrains' to 'contraints'. #2069. *Michael Schuerig <michael@schuerig.de>*
+
+*   Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. *Michael Schuerig <michael@schuerig.de>*
+
+*   Add geometric type for postgresql adapter. #2233 *Andrew Kaspick*
+
+*   Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Add convenience predicate methods on Column class. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Raise errors when invalid hash keys are passed to ActiveRecord::Base.find. #2363  *Chad Fowler <chad@chadfowler.com>, Nicholas Seckar*
+
+*   Added :force option to create_table that'll try to drop the table if it already exists before creating
+
+*   Fix transactions so that calling return while inside a transaction will not leave an open transaction on the connection. *Nicholas Seckar*
+
+*   Use foreign_key inflection uniformly.  #2156 *Blair Zajac <blair@orcaware.com>*
+
+*   model.association.clear should destroy associated objects if :dependent => true instead of nullifying their foreign keys.  #2221 *joergd@pobox.com, ObieFernandez <obiefernandez@gmail.com>*
+
+*   Returning false from before_destroy should cancel the action.  #1829 *Jeremy Huffman*
+
+*   Recognize PostgreSQL NOW() default as equivalent to CURRENT_TIMESTAMP or CURRENT_DATE, depending on the column's type.  #2256 *mat <mat@absolight.fr>*
+
+*   Extensive documentation for the abstract database adapter.  #2250 *François Beausoleil <fbeausoleil@ftml.net>*
+
+*   Clean up Fixtures.reset_sequences for PostgreSQL.  Handle tables with no rows and models with custom primary keys.  #2174, #2183 *jay@jay.fm, Blair Zajac <blair@orcaware.com>*
+
+*   Improve error message when nil is assigned to an attr which validates_size_of within a range.  #2022 *Manuel Holtgrewe <purestorm@ggnore.net>*
+
+*   Make update_attribute use the same writer method that update_attributes uses.
+    \#2237 [trevor@protocool.com]
+*   Make migrations honor table name prefixes and suffixes. #2298 *Jakob Skjerning, Marcel Molina Jr.*
+
+*   Correct and optimize PostgreSQL bytea escaping.  #1745, #1837 *dave@cherryville.org, ken@miriamtech.com, bellis@deepthought.org*
+
+*   Fixtures should only reset a PostgreSQL sequence if it corresponds to an integer primary key named id.  #1749 *chris@chrisbrinker.com*
+
+*   Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior)
+
+*   Added new symbol-driven approach to activating observers with Base#observers= [David Heinemeier Hansson]. Example:
+
+        ActiveRecord::Base.observers = :cacher, :garbage_collector
+
+*   Added AbstractAdapter#select_value and AbstractAdapter#select_values as convenience methods for selecting single values, instead of hashes, of the first column in a SELECT #2283 *solo@gatelys.com*
+
+*   Wrap :conditions in parentheses to prevent problems with OR's #1871 *Jamis Buck*
+
+*   Allow the postgresql adapter to work with the SchemaDumper. *Jamis Buck*
+
+*   Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases. *Jamis Buck*
+
+*   Fixed migrations for Windows when using more than 10 *David Naseby*
+
+*   Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 *Florian Weber*
+
+*   Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 *Tobias Lütke*
+
+*   Improved migrations' behavior when the schema_info table is empty. *Nicholas Seckar*
+
+*   Fixed that Observers didn't observe sub-classes #627 *Florian Weber*
+
+*   Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 *Marcel Molina Jr.*
+
+*   Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 *skae*
+
+*   Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 *Florian Weber*
+
+*   Added better exception error when unknown column types are used with migrations #1814 *François Beausoleil*
+
+*   Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 *kajism@yahoo.com*
+
+*   Fixed comparison of Active Record objects so two new objects are not equal #2099 *deberg*
+
+*   Fixed that the SQL Server adapter would sometimes return DBI::Timestamp objects instead of Time #2127 *Tom Ward*
+
+*   Added the instance methods #root and #ancestors on acts_as_tree and fixed siblings to not include the current node #2142, #2140 *coffee2code*
+
+*   Fixed that Active Record would call SHOW FIELDS twice (or more) for the same model when the cached results were available #1947 *sd@notso.net*
+
+*   Added log_level and use_silence parameter to ActiveRecord::Base.benchmark. The first controls at what level the benchmark statement will be logged (now as debug, instead of info) and the second that can be passed false to include all logging statements during the benchmark block/
+
+*   Make sure the schema_info table is created before querying the current version #1903
+
+*   Fixtures ignore table name prefix and suffix #1987 *Jakob Skjerning*
+
+*   Add documentation for index_type argument to add_index method for migrations #2005 *Blaine*
+
+*   Modify read_attribute to allow a symbol argument #2024 *Ken Kunz*
+
+*   Make destroy return self #1913 *Sebastian Kanthak*
+
+*   Fix typo in validations documentation #1938 *court3nay*
+
+*   Make acts_as_list work for insert_at(1) #1966 *hensleyl@papermountain.org*
+
+*   Fix typo in count_by_sql documentation #1969 *Alexey Verkhovsky*
+
+*   Allow add_column and create_table to specify NOT NULL #1712 *emptysands@gmail.com*
+
+*   Fix create_table so that id column is implicitly added *Rick Olson*
+
+*   Default sequence names for Oracle changed to #{table_name}_seq, which is the most commonly used standard. In addition, a new method ActiveRecord::Base#set_sequence_name allows the developer to set the sequence name per model. This is a non-backwards-compatible change -- anyone using the old-style "rails_sequence" will need to either create new sequences, or set: ActiveRecord::Base.set_sequence_name = "rails_sequence" #1798
+
+*   OCIAdapter now properly handles synonyms, which are commonly used to separate out the schema owner from the application user #1798
+
+*   Fixed the handling of camelCase columns names in Oracle #1798
+
+*   Implemented for OCI the Rakefile tasks of :clone_structure_to_test, :db_structure_dump, and :purge_test_database, which enable Oracle folks to enjoy all the agile goodness of Rails for testing. Note that the current implementation is fairly limited -- only tables and sequences are cloned, not constraints or indexes. A full clone in Oracle generally requires some manual effort, and is version-specific. Post 9i, Oracle recommends the use of the DBMS_METADATA package, though that approach requires editing of the physical characteristics generated #1798
+
+*   Fixed the handling of multiple blob columns in Oracle if one or more of them are null #1798
+
+*   Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 *Tobias Lütke*
+
+        class Comment < AR:B
+          def self.search(q)
+            find(:all, :conditions => ["body = ?", q])
+          end
+        end
+
+        class Post < AR:B
+          has_many :comments
+        end
+
+        Post.find(1).comments.search('hi') # => SELECT * from comments WHERE post_id = 1 AND body = 'hi'
+
+    NOTICE: This patch changes the underlying SQL generated by has_and_belongs_to_many queries. If your relying on that, such as
+    by explicitly referencing the old t and j aliases, you'll need to update your code. Of course, you _shouldn't_ be relying on
+    details like that no less than you should be diving in to touch private variables. But just in case you do, consider yourself
+    noticed :)
+
+*   Added migration support for SQLite (using temporary tables to simulate ALTER TABLE) #1771 *Sam Stephenson*
+
+*   Remove extra definition of supports_migrations? from abstract_adaptor.rb *Nicholas Seckar*
+
+*   Fix acts_as_list so that moving next-to-last item to the bottom does not result in duplicate item positions
+
+*   Fixed incompatibility in DB2 adapter with the new limit/offset approach #1718 *Maik Schmidt*
+
+*   Added :select option to find which can specify a different value than the default *, like find(:all, :select => "first_name, last_name"), if you either only want to select part of the columns or exclude columns otherwise included from a join #1338 *Stefan Kaes*
+
+
+## 1.11.1 (11 July, 2005) ##
+
+*   Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 *Rick Olson*
+
+*   Fixed that assume_bottom_position (in acts_as_list) could be called on items already last in the list and they would move one position away from the list #1648 *tyler@kianta.com*
+
+*   Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 *Sam Stephenson*
+
+*   Correct reflected table name for singular associations.  #1688 *court3nay*
+
+*   Fixed optimistic locking with SQL Server #1660 *tom@popdog.net*
+
+*   Added ActiveRecord::Migrator.migrate that can figure out whether to go up or down based on the target version and the current
+
+*   Added better error message for "packets out of order" #1630 *court3nay*
+
+*   Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
+
+
+## 1.11.0 (6 July, 2005) ##
+
+*   Fixed that Yaml error message in fixtures hid the real error #1623 *Nicholas Seckar*
+
+*   Changed logging of SQL statements to use the DEBUG level instead of INFO
+
+*   Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Lütke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
+
+*   Added callback hooks to association collections #1549 [Florian Weber]. Example:
+
+        class Project
+          has_and_belongs_to_many :developers, :before_add => :evaluate_velocity
+
+          def evaluate_velocity(developer)
+            ...
+          end
+        end
+
+    ..raising an exception will cause the object not to be added (or removed, with before_remove).
+
+
+*   Fixed Base.content_columns call for SQL Server adapter #1450 *DeLynn Berry*
+
+*   Fixed Base#write_attribute to work with both symbols and strings #1190 *Paul Legato*
+
+*   Fixed that has_and_belongs_to_many didn't respect single table inheritance types #1081 *Florian Weber*
+
+*   Speed up ActiveRecord#method_missing for the common case (read_attribute).
+
+*   Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 *Stefan Kaes*
+
+*   Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 *Chris McGrath*
+
+*   Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 *raidel@onemail.at*
+
+*   Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 *Michael Schuerig*
+
+*   Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 *DeLynn Berry*
+
+*   Added support for ODBC connections to MS SQL Server so you can connect from a non-Windows machine #1569 *Mark Imbriaco/DeLynn Berry*
+
+*   Fixed that multiparameter posts ignored attr_protected #1532 *alec+rails@veryclever.net*
+
+*   Fixed problem with eager loading when using a has_and_belongs_to_many association using :association_foreign_key #1504 *flash@vanklinkenbergsoftware.nl*
+
+*   Fixed Base#find to honor the documentation on how :joins work and make them consistent with Base#count #1405 [pritchie@gmail.com]. What used to be:
+
+        Developer.find :all, :joins => 'developers_projects', :conditions => 'id=developer_id AND project_id=1'
+
+    ...should instead be:
+
+        Developer.find(
+          :all,
+          :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
+          :conditions => 'project_id=1'
+        )
+
+*   Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 *Marcel Molina Jr.*
+
+*   Fixed that clear_association_cache doesn't delete new associations on new records (so you can safely place new records in the session with Action Pack without having new associations wiped) #1494 *cluon*
+
+*   Fixed that calling Model.find([]) returns [] and doesn't throw an exception #1379
+
+*   Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 *Alisdair McDiarmid*
+
+*   Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
+
+*   Allow any Enumerable, not just Array, to work as bind variables #1344 *Jeremy Kemper*
+
+*   Added actual database-changing behavior to collection assigment for has_many and has_and_belongs_to_many #1425 [Sebastian Kanthak].
+    Example:
+
+        david.projects = [Project.find(1), Project.new("name" => "ActionWebSearch")]
+        david.save
+
+    If david.projects already contain the project with ID 1, this is left unchanged. Any other projects are dropped. And the new
+    project is saved when david.save is called.
+
+    Also included is a way to do assignments through IDs, which is perfect for checkbox updating, so you get to do:
+
+        david.project_ids = [1, 5, 7]
+
+*   Corrected typo in find SQL for has_and_belongs_to_many.  #1312 *ben@bensinclair.com*
+
+*   Fixed sanitized conditions for has_many finder method.  #1281 *jackc@hylesanderson.com, pragdave, Tobias Lütke*
+
+*   Comprehensive PostgreSQL schema support.  Use the optional schema_search_path directive in database.yml to give a comma-separated list of schemas to search for your tables.  This allows you, for example, to have tables in a shared schema without having to use a custom table name.  See http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html to learn more.  #827 *dave@cherryville.org*
+
+*   Corrected @@configurations typo #1410 *david@ruppconsulting.com*
+
+*   Return PostgreSQL columns in the order they were declared #1374 *perlguy@gmail.com*
+
+*   Allow before/after update hooks to work on models using optimistic locking
+
+*   Eager loading of dependent has_one associations won't delete the association #1212
+
+*   Added a second parameter to the build and create method for has_one that controls whether the existing association should be replaced (which means nullifying its foreign key as well). By default this is true, but false can be passed to prevent it.
+
+*   Using transactional fixtures now causes the data to be loaded only once.
+
+*   Added fixture accessor methods that can be used when instantiated fixtures are disabled.
+
+        fixtures :web_sites
+
+        def test_something
+          assert_equal "Ruby on Rails", web_sites(:rubyonrails).name
+        end
+
+*   Added DoubleRenderError exception that'll be raised if render* is called twice #518 *Nicholas Seckar*
+
+*   Fixed exceptions occuring after render has been called #1096 *Nicholas Seckar*
+
+*   CHANGED: validates_presence_of now uses Errors#add_on_blank, which will make "  " fail the validation where it didn't before #1309
+
+*   Added Errors#add_on_blank which works like Errors#add_on_empty, but uses Object#blank? instead
+
+*   Added the :if option to all validations that can either use a block or a method pointer to determine whether the validation should be run or not. #1324 [Duane Johnson/jhosteny]. Examples:
+
+    Conditional validations such as the following are made possible:
+        validates_numericality_of :income, :if => :employed?
+
+    Conditional validations can also solve the salted login generator problem:
+        validates_confirmation_of :password, :if => :new_password?
+
+    Using blocks:
+        validates_presence_of :username, :if => Proc.new { |user| user.signup_step > 1 }
+
+*   Fixed use of construct_finder_sql when using :join #1288 *dwlt@dwlt.net*
+
+*   Fixed that :delete_sql in has_and_belongs_to_many associations couldn't access record properties #1299 *Rick Olson*
+
+*   Fixed that clone would break when an aggregate had the same name as one of its attributes #1307 *Jeremy Kemper*
+
+*   Changed that destroying an object will only freeze the attributes hash, which keeps the object from having attributes changed (as that wouldn't make sense), but allows for the querying of associations after it has been destroyed.
+
+*   Changed the callbacks such that observers are notified before the in-object callbacks are triggered. Without this change, it wasn't possible to act on the whole object in something like a before_destroy observer without having the objects own callbacks (like deleting associations) called first.
+
+*   Added option for passing an array to the find_all version of the dynamic finders and have it evaluated as an IN fragment. Example:
+
+        # SELECT * FROM topics WHERE title IN ('First', 'Second')
+        Topic.find_all_by_title(["First", "Second"])
+
+*   Added compatibility with camelCase column names for dynamic finders #533 *Dee Zsombor*
+
+*   Fixed extraneous comma in count() function that made it not work with joins #1156 *Jarkko Laine/Dee Zsombor*
+
+*   Fixed incompatibility with Base#find with an array of ids that would fail when using eager loading #1186 *Alisdair McDiarmid*
+
+*   Fixed that validate_length_of lost :on option when :within was specified #1195 *jhosteny@mac.com*
+
+*   Added encoding and min_messages options for PostgreSQL #1205 [Shugo Maeda]. Configuration example:
+
+        development:
+          adapter: postgresql
+          database: rails_development
+          host: localhost
+          username: postgres
+          password:
+          encoding: UTF8
+          min_messages: ERROR
+
+*   Fixed acts_as_list where deleting an item that was removed from the list would ruin the positioning of other list items #1197 *Jamis Buck*
+
+*   Added validates_exclusion_of as a negative of validates_inclusion_of
+
+*   Optimized counting of has_many associations by setting the association to empty if the count is 0 so repeated calls doesn't trigger database calls
+
+
+## 1.10.1 (20th April, 2005) ##
+
+*   Fixed frivilous database queries being triggered with eager loading on empty associations and other things
+
+*   Fixed order of loading in eager associations
+
+*   Fixed stray comma when using eager loading and ordering together from has_many associations #1143
+
+
+## 1.10.0 (19th April, 2005) ##
+
+*   Added eager loading of associations as a way to solve the N+1 problem more gracefully without piggy-back queries. Example:
+
+        for post in Post.find(:all, :limit => 100)
+          puts "Post:            " + post.title
+          puts "Written by:      " + post.author.name
+          puts "Last comment on: " + post.comments.first.created_on
+        end
+
+    This used to generate 301 database queries if all 100 posts had both author and comments. It can now be written as:
+
+        for post in Post.find(:all, :limit => 100, :include => [ :author, :comments ])
+
+    ...and the number of database queries needed is now 1.
+
+*   Added new unified Base.find API and deprecated the use of find_first and find_all. See the documentation for Base.find. Examples:
+
+        Person.find(1, :conditions => "administrator = 1", :order => "created_on DESC")
+        Person.find(1, 5, 6, :conditions => "administrator = 1", :order => "created_on DESC")
+        Person.find(:first, :order => "created_on DESC", :offset => 5)
+        Person.find(:all, :conditions => [ "category IN (?)", categories], :limit => 50)
+        Person.find(:all, :offset => 10, :limit => 10)
+
+*   Added acts_as_nested_set #1000 [wschenk]. Introduction:
+
+        This acts provides Nested Set functionality.  Nested Set is similiar to Tree, but with
+        the added feature that you can select the children and all of it's descendants with
+        a single query.  A good use case for this is a threaded post system, where you want
+        to display every reply to a comment without multiple selects.
+
+*   Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid *Dave Thomas*
+
+*   Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 *gnuman1@gmail.com*
+
+*   Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 *andrew.john.peters@gmail.com*
+
+*   Fixed loading of fixtures in to be in the right order (or PostgreSQL would bark) #1047 *stephenh@chase3000.com*
+
+*   Fixed page caching for non-vhost applications living underneath the root #1004 *Ben Schumacher*
+
+*   Fixes a problem with the SQL Adapter which was resulting in IDENTITY_INSERT not being set to ON when it should be #1104 *adelle*
+
+*   Added the option to specify the acceptance string in validates_acceptance_of #1106 *caleb@aei-tech.com*
+
+*   Added insert_at(position) to acts_as_list #1083 *DeLynnB*
+
+*   Removed the default order by id on has_and_belongs_to_many queries as it could kill performance on large sets (you can still specify by hand with :order)
+
+*   Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 *yon@milliped.com*
+
+*   Fixed boolean saving on Oracle #1093 *mparrish@pearware.org*
+
+*   Moved build_association and create_association for has_one and belongs_to out of deprecation as they work when the association is nil unlike association.build and association.create, which require the association to be already in place #864
+
+*   Added rollbacks of transactions if they're active as the dispatcher is killed gracefully (TERM signal) #1054 *Leon Bredt*
+
+*   Added quoting of column names for fixtures #997 *jcfischer@gmail.com*
+
+*   Fixed counter_sql when no records exist in database for PostgreSQL (would give error, not 0) #1039 *Caleb Tennis*
+
+*   Fixed that benchmarking times for rendering included db runtimes #987 *Stefan Kaes*
+
+*   Fixed boolean queries for t/f fields in PostgreSQL #995 *dave@cherryville.org*
+
+*   Added that model.items.delete(child) will delete the child, not just set the foreign key to nil, if the child is dependent on the model #978 *Jeremy Kemper*
+
+*   Fixed auto-stamping of dates (created_on/updated_on) for PostgreSQL #985 *dave@cherryville.org*
+
+*   Fixed Base.silence/benchmark to only log if a logger has been configured #986 *Stefan Kaes*
+
+*   Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 *Stefan Kaes*
+
+*   Fixed bug in Base#hash method that would treat records with the same string-based id as different *Dave Thomas*
+
+*   Renamed DateHelper#distance_of_time_in_words_to_now to DateHelper#time_ago_in_words (old method name is still available as a deprecated alias)
+
+
+## 1.9.1 (27th March, 2005) ##
+
+*   Fixed that Active Record objects with float attribute could not be cloned #808
+
+*   Fixed that MissingSourceFile's wasn't properly detected in production mode #925 *Nicholas Seckar*
+
+*   Fixed that :counter_cache option would look for a line_items_count column for a LineItem object instead of lineitems_count
+
+*   Fixed that AR exists?() would explode on postgresql if the passed id did not match the PK type #900 *Scott Barron*
+
+*   Fixed the MS SQL adapter to work with the new limit/offset approach and with binary data (still suffering from 7KB limit, though) #901 *delynnb*
+
+
+## 1.9.0 (22th March, 2005) ##
+
+*   Added adapter independent limit clause as a two-element array with the first being the limit, the second being the offset #795 [Sam Stephenson]. Example:
+
+        Developer.find_all nil, 'id ASC', 5      # return the first five developers
+        Developer.find_all nil, 'id ASC', [3, 8] # return three developers, starting from #8 and forward
+
+    This doesn't yet work with the DB2 or MS SQL adapters. Patches to make that happen are encouraged.
+
+*   Added alias_method :to_param, :id to Base, such that Active Record objects to be used as URL parameters in Action Pack automatically #812 *Nicholas Seckar/Sam Stephenson*
+
+*   Improved the performance of the OCI8 adapter for Oracle #723 *pilx/gjenkins*
+
+*   Added type conversion before saving a record, so string-based values like "10.0" aren't left for the database to convert #820 *dave@cherryville.org*
+
+*   Added with additional settings for working with transactional fixtures and pre-loaded test databases #865 *mindel*
+
+*   Fixed acts_as_list to trigger remove_from_list on destroy after the fact, not before, so a unique position can be maintained #871 *Alisdair McDiarmid*
+
+*   Added the possibility of specifying fixtures in multiple calls #816 *kim@tinker.com*
+
+*   Added Base.exists?(id) that'll return true if an object of the class with the given id exists #854 *stian@grytoyr.net*
+
+*   Added optionally allow for nil or empty strings with validates_numericality_of #801 *Sebastian Kanthak*
+
+*   Fixed problem with using slashes in validates_format_of regular expressions #801 *Sebastian Kanthak*
+
+*   Fixed that SQLite3 exceptions are caught and reported properly #823 *yerejm*
+
+*   Added that all types of after_find/after_initialized callbacks are triggered if the explicit implementation is present, not only the explicit implementation itself
+
+*   Fixed that symbols can be used on attribute assignment, like page.emails.create(:subject => data.subject, :body => data.body)
+
+
+## 1.8.0 (7th March, 2005) ##
+
+*   Added ActiveRecord::Base.colorize_logging to control whether to use colors in logs or not (on by default)
+
+*   Added support for timestamp with time zone in PostgreSQL #560 *Scott Barron*
+
+*   Added MultiparameterAssignmentErrors and AttributeAssignmentError exceptions #777 [demetrius]. Documentation:
+
+     * +MultiparameterAssignmentErrors+ -- collection of errors that occurred during a mass assignment using the
+         +attributes=+ method. The +errors+ property of this exception contains an array of +AttributeAssignmentError+
+         objects that should be inspected to determine which attributes triggered the errors.
+     * +AttributeAssignmentError+ -- an error occurred while doing a mass assignment through the +attributes=+ method.
+         You can inspect the +attribute+ property of the exception object to determine which attribute triggered the error.
+
+*   Fixed that postgresql adapter would fails when reading bytea fields with null value #771 *rodrigo k*
+
+*   Added transactional fixtures that uses rollback to undo changes to fixtures instead of DELETE/INSERT -- it's much faster. See documentation under Fixtures #760 *Jeremy Kemper*
+
+*   Added destruction of dependent objects in has_one associations when a new assignment happens #742 [mindel]. Example:
+
+        class Account < ActiveRecord::Base
+          has_one :credit_card, :dependent => true
+        end
+        class CreditCard < ActiveRecord::Base
+          belongs_to :account
+        end
+
+        account.credit_card # => returns existing credit card, lets say id = 12
+        account.credit_card = CreditCard.create("number" => "123")
+        account.save # => CC with id = 12 is destroyed
+
+
+*   Added validates_numericality_of #716 [Sebastian Kanthak/Chris McGrath]. Docuemntation:
+
+        Validates whether the value of the specified attribute is numeric by trying to convert it to
+        a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
+        <tt>/^[\+\-]?\d+$/</tt> (if <tt>integer</tt> is set to true).
+
+          class Person < ActiveRecord::Base
+            validates_numericality_of :value, :on => :create
+          end
+
+        Configuration options:
+        * <tt>message</tt> - A custom error message (default is: "is not a number")
+        * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
+        * <tt>only_integer</tt> Specifies whether the value has to be an integer, e.g. an integral value (default is false)
+
+
+*   Fixed that HasManyAssociation#count was using :finder_sql rather than :counter_sql if it was available #445 *Scott Barron*
+
+*   Added better defaults for composed_of, so statements like composed_of :time_zone, :mapping => %w( time_zone time_zone ) can be written without the mapping part (it's now assumed)
+
+*   Added MacroReflection#macro which will return a symbol describing the macro used (like :composed_of or :has_many) #718, #248 *james@slashetc.com*
+
+
+## 1.7.0 (24th February, 2005) ##
+
+*   Changed the auto-timestamping feature to use ActiveRecord::Base.default_timezone instead of entertaining the parallel ActiveRecord::Base.timestamps_gmt method. The latter is now deprecated and will throw a warning on use (but still work) #710 *Jamis Buck*
+
+*   Added a OCI8-based Oracle adapter that has been verified to work with Oracle 8 and 9 #629 [Graham Jenkins]. Usage notes:
+
+        1.  Key generation uses a sequence "rails_sequence" for all tables. (I couldn't find a simple
+            and safe way of passing table-specific sequence information to the adapter.)
+        2.  Oracle uses DATE or TIMESTAMP datatypes for both dates and times. Consequently I have had to
+            resort to some hacks to get data converted to Date or Time in Ruby.
+            If the column_name ends in _at (like created_at, updated_at) it's created as a Ruby Time. Else if the
+            hours/minutes/seconds are 0, I make it a Ruby Date. Else it's a Ruby Time.
+            This is nasty - but if you use Duck Typing you'll probably not care very much.
+            In 9i it's tempting to map DATE to Date and TIMESTAMP to Time but I don't think that is
+            valid - too many databases use DATE for both.
+            Timezones and sub-second precision on timestamps are not supported.
+        3.  Default values that are functions (such as "SYSDATE") are not supported. This is a
+            restriction of the way active record supports default values.
+        4.  Referential integrity constraints are not fully supported. Under at least
+            some circumstances, active record appears to delete parent and child records out of
+            sequence and out of transaction scope. (Or this may just be a problem of test setup.)
+
+    The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/
+
+*   Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 *YuriSchimke*
+
+*   Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 *yerejm*
+
+*   Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 *tonka*
+
+*   Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 *Nicholas Seckar*
+
+*   Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 *daniel@nightrunner.com*
+
+*   Added automatic dropping/creating of test tables for running the unit tests on all databases #587 *adelle@bullet.net.au*
+
+*   Fixed that find_by_* would fail when column names had numbers #670 *demetrius*
+
+*   Fixed the SQL Server adapter on a bunch of issues #667 *DeLynn*
+
+        1. Created a new columns method that is much cleaner.
+        2. Corrected a problem with the select and select_all methods
+           that didn't account for the LIMIT clause being passed into raw SQL statements.
+        3. Implemented the string_to_time method in order to create proper instances of the time class.
+        4. Added logic to the simplified_type method that allows the database to specify the scale of float data.
+        5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
+
+*   Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 *lmarlow*
+
+*   Added validates_each that validates each specified attribute against a block #610 [Jeremy Kemper]. Example:
+
+        class Person < ActiveRecord::Base
+          validates_each :first_name, :last_name do |record, attr|
+            record.errors.add attr, 'starts with z.' if attr[0] == ?z
+          end
+        end
+
+*   Added :allow_nil as an explicit option for validates_length_of, so unless that's set to true having the attribute as nil will also return an error if a range is specified as :within #610 *Jeremy Kemper*
+
+*   Added that validates_* now accept blocks to perform validations #618 [Tim Bates]. Example:
+
+        class Person < ActiveRecord::Base
+          validate { |person| person.errors.add("title", "will never be valid") if SHOULD_NEVER_BE_VALID }
+        end
+
+*   Addded validation for validate all the associated objects before declaring failure with validates_associated #618 *Tim Bates*
+
+*   Added keyword-style approach to defining the custom relational bindings #545 [Jamis Buck]. Example:
+
+        class Project < ActiveRecord::Base
+          primary_key "sysid"
+          table_name "XYZ_PROJECT"
+          inheritance_column { original_inheritance_column + "_id" }
+        end
+
+*   Fixed Base#clone for use with PostgreSQL #565 *hanson@surgery.wisc.edu*
+
+
+## 1.6.0 (January 25th, 2005) ##
+
+*   Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.
+
+*   Added that Base#delete and Base#destroy both can take an array of ids to delete/destroy #336
+
+*   Added the option of supplying an array of attributes to Base#create, so that multiple records can be created at once.
+
+*   Added the option of supplying an array of ids and attributes to Base#update, so that multiple records can be updated at once (inspired by #526/Duane Johnson). Example
+
+        people = { 1 => { "first_name" => "David" }, 2 => { "first_name" => "Jeremy"} }
+        Person.update(people.keys, people.values)
+
+*   Added ActiveRecord::Base.timestamps_gmt that can be set to true to make the automated timestamping use GMT instead of local time #520 *Scott Baron*
+
+*   Added that update_all calls sanitize_sql on its updates argument, so stuff like MyRecord.update_all(['time = ?', Time.now]) works #519 *notahat*
+
+*   Fixed that the dynamic finders didn't treat nil as a "IS NULL" but rather "= NULL" case #515 *Demetrius*
+
+*   Added bind-named arrays for interpolating a group of ids or strings in conditions #528 *Jeremy Kemper*
+
+*   Added that has_and_belongs_to_many associations with additional attributes also can be created between unsaved objects and only committed to the database when Base#save is called on the associator #524 *Eric Anderson*
+
+*   Fixed that records fetched with piggy-back attributes or through rich has_and_belongs_to_many associations couldn't be saved due to the extra attributes not part of the table #522 *Eric Anderson*
+
+*   Added mass-assignment protection for the inheritance column -- regardless of a custom column is used or not
+
+*   Fixed that association proxies would fail === tests like PremiumSubscription === @account.subscription
+
+*   Fixed that column aliases didn't work as expected with the new MySql411 driver #507 *Demetrius*
+
+*   Fixed that find_all would produce invalid sql when called sequentialy #490 *Scott Baron*
+
+
+## 1.5.1 (January 18th, 2005) ##
+
+*   Fixed that the belongs_to and has_one proxy would fail a test like 'if project.manager' -- this unfortunately also means that you can't call methods like project.manager.build unless there already is a manager on the project #492 *Tim Bates*
+
+*   Fixed that the Ruby/MySQL adapter wouldn't connect if the password was empty #503 *Pelle*
+
+
+## 1.5.0 (January 17th, 2005) ##
+
+*   Fixed that unit tests for MySQL are now run as the "rails" user instead of root #455 *Eric Hodel*
+
+*   Added validates_associated that enables validation of objects in an unsaved association #398 [Tim Bates]. Example:
+
+        class Book < ActiveRecord::Base
+          has_many :pages
+          belongs_to :library
+
+          validates_associated :pages, :library
+        end
+
+*   Added support for associating unsaved objects #402 [Tim Bates]. Rules that govern this addition:
+
+        == Unsaved objects and associations
+
+        You can manipulate objects and associations before they are saved to the database, but there is some special behaviour you should be
+        aware of, mostly involving the saving of associated objects.
+
+        === One-to-one associations
+
+        * Assigning an object to a has_one association automatically saves that object, and the object being replaced (if there is one), in
+          order to update their primary keys - except if the parent object is unsaved (new_record? == true).
+        * If either of these saves fail (due to one of the objects being invalid) the assignment statement returns false and the assignment
+          is cancelled.
+        * If you wish to assign an object to a has_one association without saving it, use the #association.build method (documented below).
+        * Assigning an object to a belongs_to association does not save the object, since the foreign key field belongs on the parent. It does
+          not save the parent either.
+
+        === Collections
+
+        * Adding an object to a collection (has_many or has_and_belongs_to_many) automatically saves that object, except if the parent object
+          (the owner of the collection) is not yet stored in the database.
+        * If saving any of the objects being added to a collection (via #push or similar) fails, then #push returns false.
+        * You can add an object to a collection without automatically saving it by using the #collection.build method (documented below).
+        * All unsaved (new_record? == true) members of the collection are automatically saved when the parent is saved.
+
+*   Added replace to associations, so you can do project.manager.replace(new_manager) or project.milestones.replace(new_milestones) #402 *Tim Bates*
+
+*   Added build and create methods to has_one and belongs_to associations, so you can now do project.manager.build(attributes) #402 *Tim Bates*
+
+*   Added that if a before_* callback returns false, all the later callbacks and the associated action are cancelled. If an after_* callback returns false, all the later callbacks are cancelled. Callbacks are generally run in the order they are defined, with the exception of callbacks defined as methods on the model, which are called last. #402 *Tim Bates*
+
+*   Fixed that Base#== wouldn't work for multiple references to the same unsaved object #402 *Tim Bates*
+
+*   Fixed binary support for PostgreSQL #444 *alex@byzantine.no*
+
+*   Added a differenciation between AssociationCollection#size and -length. Now AssociationCollection#size returns the size of the
+    collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and calling collection.size if it has. If
+    it's more likely than not that the collection does have a size larger than zero and you need to fetch that collection afterwards,
+    it'll take one less SELECT query if you use length.
+
+*   Added Base#attributes that returns a hash of all the attributes with their names as keys and clones of their objects as values #433 *atyp.de*
+
+*   Fixed that foreign keys named the same as the association would cause stack overflow #437 *Eric Anderson*
+
+*   Fixed default scope of acts_as_list from "1" to "1 = 1", so it'll work in PostgreSQL (among other places) #427 *Alexey*
+
+*   Added Base#reload that reloads the attributes of an object from the database #422 *Andreas Schwarz*
+
+*   Added SQLite3 compatibility through the sqlite3-ruby adapter by Jamis Buck #381 *Jeremy Kemper*
+
+*   Added support for the new protocol spoken by MySQL 4.1.1+ servers for the Ruby/MySQL adapter that ships with Rails #440 *Matt Mower*
+
+*   Added that Observers can use the observes class method instead of overwriting self.observed_class().
+
+        Before:
+          class ListSweeper < ActiveRecord::Base
+            def self.observed_class() [ List, Item ]
+          end
+
+        After:
+          class ListSweeper < ActiveRecord::Base
+            observes List, Item
+          end
+
+*   Fixed that conditions in has_many and has_and_belongs_to_many should be interpolated just like the finder_sql is
+
+*   Fixed Base#update_attribute to be indifferent to whether a string or symbol is used to describe the name
+
+*   Added Base#toggle(attribute) and Base#toggle!(attribute) that makes it easier to flip a switch or flag.
+
+        Before: topic.update_attribute(:approved, !approved?)
+        After : topic.toggle!(:approved)
+
+*   Added Base#increment!(attribute) and Base#decrement!(attribute) that also saves the records. Example:
+
+        page.views # => 1
+        page.increment!(:views) # executes an UPDATE statement
+        page.views # => 2
+
+        page.increment(:views).increment!(:views)
+        page.views # => 4
+
+*   Added Base#increment(attribute) and Base#decrement(attribute) that encapsulates the += 1 and -= 1 patterns.
+
+
+
+
+## 1.14.2 (April 9th, 2005) ##
+
+*   Fixed calculations for the Oracle Adapter (closes #4626) *Michael Schoen*
+
+
+## 1.14.1 (April 6th, 2006) ##
+
+*   Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. *Nicholas Seckar*
+
+*   Fixed that that multiparameter assignment doesn't work with aggregations (closes #4620) *Lars Pind*
+
+*   Enable Limit/Offset in Calculations (closes #4558) *lmarlow*
+
+*   Fixed that loading including associations returns all results if Load IDs For Limited Eager Loading returns none (closes #4528) *Rick Olson*
+
+*   Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 *lagroue@free.fr*
+
+*   Allow AR::Base#respond_to? to behave when @attributes is nil *Ryan Davis*
+
+*   Support eager includes when going through a polymorphic has_many association. *Rick Olson*
+
+*   Added support for eagerly including polymorphic has_one associations. (closes #4525) *Rick Olson*
+
+        class Post < ActiveRecord::Base
+          has_one :tagging, :as => :taggable
+        end
+
+        Post.find :all, :include => :tagging
+
+*   Added descriptive error messages for invalid has_many :through associations: going through :has_one or :has_and_belongs_to_many *Rick Olson*
+
+*   Added support for going through a polymorphic has_many association: (closes #4401) *Rick Olson*
+
+        class PhotoCollection < ActiveRecord::Base
+          has_many :photos, :as => :photographic
+          belongs_to :firm
+        end
+
+        class Firm < ActiveRecord::Base
+          has_many :photo_collections
+          has_many :photos, :through => :photo_collections
+        end
+
+*   Multiple fixes and optimizations in PostgreSQL adapter, allowing ruby-postgres gem to work properly. *ruben.nine@gmail.com*
+
+*   Fixed that AssociationCollection#delete_all should work even if the records of the association are not loaded yet. *Florian Weber*
+
+*   Changed those private ActiveRecord methods to take optional third argument :auto instead of nil for performance optimizations.  (closes #4456) *Stefan*
+
+*   Private ActiveRecord methods add_limit!, add_joins!, and add_conditions! take an OPTIONAL third argument 'scope' (closes #4456) *Rick Olson*
+
+*   DEPRECATED: Using additional attributes on has_and_belongs_to_many associations. Instead upgrade your association to be a real join model *David Heinemeier Hansson*
+
+*   Fixed that records returned from has_and_belongs_to_many associations with additional attributes should be marked as read only (fixes #4512) *David Heinemeier Hansson*
+
+*   Do not implicitly mark recordss of has_many :through as readonly but do mark habtm records as readonly (eventually only on join tables without rich attributes). *Marcel Mollina Jr.*
+
+*   Fixed broken OCIAdapter #4457 *Michael Schoen*
+
+
+## 1.14.0 (March 27th, 2006) ##
+
+*   Replace 'rescue Object' with a finer grained rescue. Closes #4431. *Nicholas Seckar*
+
+*   Fixed eager loading so that an aliased table cannot clash with a has_and_belongs_to_many join table *Rick Olson*
+
+*   Add support for :include to with_scope *andrew@redlinesoftware.com*
+
+*   Support the use of public synonyms with the Oracle adapter; required ruby-oci8 v0.1.14 #4390 *Michael Schoen*
+
+*   Change periods (.) in table aliases to _'s.  Closes #4251 *jeff@ministrycentered.com*
+
+*   Changed has_and_belongs_to_many join to INNER JOIN for Mysql 3.23.x.  Closes #4348 *Rick Olson*
+
+*   Fixed issue that kept :select options from being scoped *Rick Olson*
+
+*   Fixed db_schema_import when binary types are present #3101 *David Heinemeier Hansson*
+
+*   Fixed that MySQL enums should always be returned as strings #3501 *David Heinemeier Hansson*
+
+*   Change has_many :through to use the :source option to specify the source association.  :class_name is now ignored. *Rick Olson*
+
+        class Connection < ActiveRecord::Base
+          belongs_to :user
+          belongs_to :channel
+        end
+
+        class Channel < ActiveRecord::Base
+          has_many :connections
+          has_many :contacts, :through => :connections, :class_name => 'User' # OLD
+          has_many :contacts, :through => :connections, :source => :user      # NEW
+        end
+
+*   Fixed DB2 adapter so nullable columns will be determines correctly now and quotes from column default values will be removed #4350 *contact@maik-schmidt.de*
+
+*   Allow overriding of find parameters in scoped has_many :through calls *Rick Olson*
+
+    In this example, :include => false disables the default eager association from loading.  :select changes the standard
+    select clause.  :joins specifies a join that is added to the end of the has_many :through query.
+
+        class Post < ActiveRecord::Base
+          has_many :tags, :through => :taggings, :include => :tagging do
+            def add_joins_and_select
+              find :all, :select => 'tags.*, authors.id as author_id', :include => false,
+                :joins => 'left outer join posts on taggings.taggable_id = posts.id left outer join authors on posts.author_id = authors.id'
+            end
+          end
+        end
+
+*   Fixed that schema changes while the database was open would break any connections to an SQLite database (now we reconnect if that error is throw) *David Heinemeier Hansson*
+
+*   Don't classify the has_one class when eager loading, it is already singular. Add tests. (closes #4117) *Jonathan Viney*
+
+*   Quit ignoring default :include options in has_many :through calls *Mark James*
+
+*   Allow has_many :through associations to find the source association by setting a custom class (closes #4307) *Jonathan Viney*
+
+*   Eager Loading support added for has_many :through => :has_many associations (see below).  *Rick Olson*
+
+*   Allow has_many :through to work on has_many associations (closes #3864) [sco@scottraymond.net]  Example:
+
+        class Firm < ActiveRecord::Base
+          has_many :clients
+          has_many :invoices, :through => :clients
+        end
+
+        class Client < ActiveRecord::Base
+          belongs_to :firm
+          has_many   :invoices
+        end
+
+        class Invoice < ActiveRecord::Base
+          belongs_to :client
+        end
+
+*   Raise error when trying to select many polymorphic objects with has_many :through or :include (closes #4226) *Josh Susser*
+
+*   Fixed has_many :through to include :conditions set on the :through association. closes #4020 *Jonathan Viney*
+
+*   Fix that has_many :through honors the foreign key set by the belongs_to association in the join model (closes #4259) *andylien@gmail.com / Rick Olson*
+
+*   SQL Server adapter gets some love #4298 *Ryan Tomayko*
+
+*   Added OpenBase database adapter that builds on top of the http://www.spice-of-life.net/ruby-openbase/ driver. All functionality except LIMIT/OFFSET is supported #3528 *derrickspell@cdmplus.com*
+
+*   Rework table aliasing to account for truncated table aliases.  Add smarter table aliasing when doing eager loading of STI associations. This allows you to use the association name in the order/where clause. [Jonathan Viney / Rick Olson] #4108 Example (SpecialComment is using STI):
+
+        Author.find(:all, :include => { :posts => :special_comments }, :order => 'special_comments.body')
+
+*   Add AbstractAdapter#table_alias_for to create table aliases according to the rules of the current adapter. *Rick Olson*
+
+*   Provide access to the underlying database connection through Adapter#raw_connection. Enables the use of db-specific methods without complicating the adapters. #2090 *Michael Koziarski*
+
+*   Remove broken attempts at handling columns with a default of 'now()' in the postgresql adapter. #2257 *Michael Koziarski*
+
+*   Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 *Tom Ward*
+
+*   Fixed that Migration#execute would have the table name prefix appended to its query #4110 *mark.imbriaco@pobox.com*
+
+*   Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) *Jamis Buck*
+
+*   Use association's :conditions when eager loading. [Jeremy Evans] #4144
+
+*   Alias the has_and_belongs_to_many join table on eager includes. #4106 *Jeremy Evans*
+
+    This statement would normally error because the projects_developers table is joined twice, and therefore joined_on would be ambiguous.
+
+        Developer.find(:all, :include => {:projects => :developers}, :conditions => 'join_project_developers.joined_on IS NOT NULL')
+
+*   Oracle adapter gets some love #4230 *Michael Schoen*
+
+        * Changes :text to CLOB rather than BLOB [Moses Hohman]
+        * Fixes an issue with nil numeric length/scales (several)
+        * Implements support for XMLTYPE columns [wilig / Kubo Takehiro]
+        * Tweaks a unit test to get it all green again
+        * Adds support for #current_database
+
+*   Added Base.abstract_class? that marks which classes are not part of the Active Record hierarchy #3704 *Rick Olson*
+
+        class CachedModel < ActiveRecord::Base
+          self.abstract_class = true
+        end
+
+        class Post < CachedModel
+        end
+
+        CachedModel.abstract_class?
+        => true
+
+        Post.abstract_class?
+        => false
+
+        Post.base_class
+        => Post
+
+        Post.table_name
+        => 'posts'
+
+*   Allow :dependent options to be used with polymorphic joins. #3820 *Rick Olson*
+
+        class Foo < ActiveRecord::Base
+          has_many :attachments, :as => :attachable, :dependent => :delete_all
+        end
+
+*   Nicer error message on has_many :through when :through reflection can not be found. #4042 *court3nay*
+
+*   Upgrade to Transaction::Simple 1.3 *Jamis Buck*
+
+*   Catch FixtureClassNotFound when using instantiated fixtures on a fixture that has no ActiveRecord model *Rick Olson*
+
+*   Allow ordering of calculated results and/or grouped fields in calculations *solo@gatelys.com*
+
+*   Make ActiveRecord::Base#save! return true instead of nil on success.  #4173 *johan@johansorensen.com*
+
+*   Dynamically set allow_concurrency.  #4044 *Stefan Kaes*
+
+*   Added Base#to_xml that'll turn the current record into a XML representation [David Heinemeier Hansson]. Example:
+
+        topic.to_xml
+
+    ...returns:
+
+        <?xml version="1.0" encoding="UTF-8"?>
+        <topic>
+          <title>The First Topic</title>
+          <author-name>David</author-name>
+          <id type="integer">1</id>
+          <approved type="boolean">false</approved>
+          <replies-count type="integer">0</replies-count>
+          <bonus-time type="datetime">2000-01-01 08:28:00</bonus-time>
+          <written-on type="datetime">2003-07-16 09:28:00</written-on>
+          <content>Have a nice day</content>
+          <author-email-address>david@loudthinking.com</author-email-address>
+          <parent-id></parent-id>
+          <last-read type="date">2004-04-15</last-read>
+        </topic>
+
+    ...and you can configure with:
+
+        topic.to_xml(:skip_instruct => true, :except => [ :id, bonus_time, :written_on, replies_count ])
+
+    ...that'll return:
+
+        <topic>
+          <title>The First Topic</title>
+          <author-name>David</author-name>
+          <approved type="boolean">false</approved>
+          <content>Have a nice day</content>
+          <author-email-address>david@loudthinking.com</author-email-address>
+          <parent-id></parent-id>
+          <last-read type="date">2004-04-15</last-read>
+        </topic>
+
+    You can even do load first-level associations as part of the document:
+
+        firm.to_xml :include => [ :account, :clients ]
+
+    ...that'll return something like:
+
+        <?xml version="1.0" encoding="UTF-8"?>
+        <firm>
+          <id type="integer">1</id>
+          <rating type="integer">1</rating>
+          <name>37signals</name>
+          <clients>
+            <client>
+              <rating type="integer">1</rating>
+              <name>Summit</name>
+            </client>
+            <client>
+              <rating type="integer">1</rating>
+              <name>Microsoft</name>
+            </client>
+          </clients>
+          <account>
+            <id type="integer">1</id>
+            <credit-limit type="integer">50</credit-limit>
+          </account>
+        </firm>
+
+*   Allow :counter_cache to take a column name for custom counter cache columns *Jamis Buck*
+
+*   Documentation fixes for :dependent *robby@planetargon.com*
+
+*   Stop the MySQL adapter crashing when views are present. #3782 *Jonathan Viney*
+
+*   Don't classify the belongs_to class, it is already singular #4117 *keithm@infused.org*
+
+*   Allow set_fixture_class to take Classes instead of strings for a class in a module.  Raise FixtureClassNotFound if a fixture can't load.  *Rick Olson*
+
+*   Fix quoting of inheritance column for STI eager loading #4098 *Jonathan Viney <jonathan@bluewire.net.nz>*
+
+*   Added smarter table aliasing for eager associations for multiple self joins #3580 *Rick Olson*
+
+        * The first time a table is referenced in a join, no alias is used.
+        * After that, the parent class name and the reflection name are used.
+
+            Tree.find(:all, :include => :children) # LEFT OUTER JOIN trees AS tree_children ...
+
+        * Any additional join references get a numerical suffix like '_2', '_3', etc.
+
+*   Fixed eager loading problems with single-table inheritance #3580 [Rick Olson]. Post.find(:all, :include => :special_comments) now returns all posts, and any special comments that the posts may have. And made STI work with has_many :through and polymorphic belongs_to.
+
+*   Added cascading eager loading that allows for queries like Author.find(:all, :include=> { :posts=> :comments }), which will fetch all authors, their posts, and the comments belonging to those posts in a single query (using LEFT OUTER JOIN) #3913 [anna@wota.jp]. Examples:
+
+        # cascaded in two levels
+        >> Author.find(:all, :include=>{:posts=>:comments})
+        => authors
+             +- posts
+                  +- comments
+
+        # cascaded in two levels and normal association
+        >> Author.find(:all, :include=>[{:posts=>:comments}, :categorizations])
+        => authors
+             +- posts
+                  +- comments
+             +- categorizations
+
+        # cascaded in two levels with two has_many associations
+        >> Author.find(:all, :include=>{:posts=>[:comments, :categorizations]})
+        => authors
+             +- posts
+                  +- comments
+                  +- categorizations
+
+        # cascaded in three levels
+        >> Company.find(:all, :include=>{:groups=>{:members=>{:favorites}}})
+        => companies
+             +- groups
+                  +- members
+                       +- favorites
+
+*   Make counter cache work when replacing an association #3245 *eugenol@gmail.com*
+
+*   Make migrations verbose *Jamis Buck*
+
+*   Make counter_cache work with polymorphic belongs_to *Jamis Buck*
+
+*   Fixed that calling HasOneProxy#build_model repeatedly would cause saving to happen #4058 *anna@wota.jp*
+
+*   Added Sybase database adapter that relies on the Sybase Open Client bindings (see http://raa.ruby-lang.org/project/sybase-ctlib) #3765 [John Sheets]. It's almost completely Active Record compliant (including migrations), but has the following caveats:
+
+        * Does not support DATE SQL column types; use DATETIME instead.
+        * Date columns on HABTM join tables are returned as String, not Time.
+        * Insertions are potentially broken for :polymorphic join tables
+        * BLOB column access not yet fully supported
+
+*   Clear stale, cached connections left behind by defunct threads. *Jeremy Kemper*
+
+*   CHANGED DEFAULT: set ActiveRecord::Base.allow_concurrency to false.  Most AR usage is in single-threaded applications. *Jeremy Kemper*
+
+*   Renamed the "oci" adapter to "oracle", but kept the old name as an alias #4017 *Michael Schoen*
+
+*   Fixed that Base.save should always return false if the save didn't succeed, including if it has halted by before_save's #1861, #2477 *David Heinemeier Hansson*
+
+*   Speed up class -> connection caching and stale connection verification.  #3979 *Stefan Kaes*
+
+*   Add set_fixture_class to allow the use of table name accessors with models which use set_table_name. *Kevin Clark*
+
+*   Added that fixtures to placed in subdirectories of the main fixture files are also loaded #3937 *dblack@wobblini.net*
+
+*   Define attribute query methods to avoid method_missing calls. #3677 *Jonathan Viney*
+
+*   ActiveRecord::Base.remove_connection explicitly closes database connections and doesn't corrupt the connection cache. Introducing the disconnect! instance method for the PostgreSQL, MySQL, and SQL Server adapters; implementations for the others are welcome.  #3591 *Simon Stapleton, Tom Ward*
+
+*   Added support for nested scopes #3407 [anna@wota.jp]. Examples:
+
+        Developer.with_scope(:find => { :conditions => "salary > 10000", :limit => 10 }) do
+          Developer.find(:all)     # => SELECT * FROM developers WHERE (salary > 10000) LIMIT 10
+
+          # inner rule is used. (all previous parameters are ignored)
+          Developer.with_exclusive_scope(:find => { :conditions => "name = 'Jamis'" }) do
+            Developer.find(:all)   # => SELECT * FROM developers WHERE (name = 'Jamis')
+          end
+
+          # parameters are merged
+          Developer.with_scope(:find => { :conditions => "name = 'Jamis'" }) do
+            Developer.find(:all)   # => SELECT * FROM developers WHERE (( salary > 10000 ) AND ( name = 'Jamis' )) LIMIT 10
+          end
+        end
+
+*   Fixed db2 connection with empty user_name and auth options #3622 *phurley@gmail.com*
+
+*   Fixed validates_length_of to work on UTF-8 strings by using characters instead of bytes #3699 *Masao Mutoh*
+
+*   Fixed that reflections would bleed across class boundaries in single-table inheritance setups #3796 *Lars Pind*
+
+*   Added calculations: Base.count, Base.average, Base.sum, Base.minimum, Base.maxmium, and the generic Base.calculate. All can be used with :group and :having. Calculations and statitics need no longer require custom SQL. #3958 [Rick Olson]. Examples:
+
+        Person.average :age
+        Person.minimum :age
+        Person.maximum :age
+        Person.sum :salary, :group => :last_name
+
+*   Renamed Errors#count to Errors#size but kept an alias for the old name (and included an alias for length too) #3920 *Luke Redpath*
+
+*   Reflections don't attempt to resolve module nesting of association classes. Simplify type computation. *Jeremy Kemper*
+
+*   Improved the Oracle OCI Adapter with better performance for column reflection (from #3210), fixes to migrations (from #3476 and #3742), tweaks to unit tests (from #3610), and improved documentation (from #2446) #3879 *Aggregated by schoenm@earthlink.net*
+
+*   Fixed that the schema_info table used by ActiveRecord::Schema.define should respect table pre- and suffixes #3834 *rubyonrails@atyp.de*
+
+*   Added :select option to Base.count that'll allow you to select something else than * to be counted on. Especially important for count queries using DISTINCT #3839 *Stefan Kaes*
+
+*   Correct syntax error in mysql DDL,  and make AAACreateTablesTest run first *Bob Silva*
+
+*   Allow :include to be used with has_many :through associations #3611 *Michael Schoen*
+
+*   PostgreSQL: smarter schema dumps using pk_and_sequence_for(table).  #2920 *Blair Zajac*
+
+*   SQLServer: more compatible limit/offset emulation.  #3779 *Tom Ward*
+
+*   Polymorphic join support for has_one associations (has_one :foo, :as => :bar)  #3785 *Rick Olson*
+
+*   PostgreSQL: correctly parse negative integer column defaults.  #3776 *bellis@deepthought.org*
+
+*   Fix problems with count when used with :include *Jeremy Hopple and Kevin Clark*
+
+*   ActiveRecord::RecordInvalid now states which validations failed in its default error message *Tobias Lütke*
+
+*   Using AssociationCollection#build with arrays of hashes should call build, not create *David Heinemeier Hansson*
+
+*   Remove definition of reloadable? from ActiveRecord::Base to make way for new Reloadable code. *Nicholas Seckar*
+
+*   Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 *Maik Schmidt*
+
+*   Support the :column option for remove_index with the PostgreSQL adapter. #3661 *Shugo Maeda*
+
+*   Add documentation for add_index and remove_index. #3600 *Manfred Stienstra <m.stienstra@fngtps.com>*
+
+*   If the OCI library is not available, raise an exception indicating as much. #3593 *Michael Schoen*
+
+*   Add explicit :order in finder tests as postgresql orders results differently by default. #3577. *Rick Olson*
+
+*   Make dynamic finders honor additional passed in :conditions. #3569 *Oleg Pudeyev <pudeyo@rpi.edu>, Marcel Molina Jr.*
+
+*   Show a meaningful error when the DB2 adapter cannot be loaded due to missing dependencies. *Nicholas Seckar*
+
+*   Make .count work for has_many associations with multi line finder sql *Michael Schoen*
+
+*   Add AR::Base.base_class for querying the ancestor AR::Base subclass *Jamis Buck*
+
+*   Allow configuration of the column used for optimistic locking *wilsonb@gmail.com*
+
+*   Don't hardcode 'id' in acts as list.  *ror@philippeapril.com*
+
+*   Fix date errors for SQLServer in association tests. #3406 *Kevin Clark*
+
+*   Escape database name in MySQL adapter when creating and dropping databases. #3409 *anna@wota.jp*
+
+*   Disambiguate table names for columns in validates_uniqueness_of's WHERE clause. #3423 *alex.borovsky@gmail.com*
+
+*   .with_scope imposed create parameters now bypass attr_protected *Tobias Lütke*
+
+*   Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions. *Marcel Molina Jr.*
+
+*   Multiple enhancements and adjustments to DB2 adaptor. #3377 *contact@maik-schmidt.de*
+
+*   Sanitize scoped conditions. *Marcel Molina Jr.*
+
+*   Added option to Base.reflection_of_all_associations to specify a specific association to scope the call. For example Base.reflection_of_all_associations(:has_many) *David Heinemeier Hansson*
+
+*   Added ActiveRecord::SchemaDumper.ignore_tables which tells SchemaDumper which tables to ignore. Useful for tables with funky column like the ones required for tsearch2. *Tobias Lütke*
+
+*   SchemaDumper now doesn't fail anymore when there are unknown column types in the schema. Instead the table is ignored and a Comment is left in the schema.rb. *Tobias Lütke*
+
+*   Fixed that saving a model with multiple habtm associations would only save the first one.  #3244 *yanowitz-rubyonrails@quantumfoam.org, Florian Weber*
+
+*   Fix change_column to work with PostgreSQL 7.x and 8.x.  #3141 *wejn@box.cz, Rick Olson, Scott Barron*
+
+*   removed :piggyback in favor of just allowing :select on :through associations. *Tobias Lütke*
+
+*   made method missing delegation to class methods on relation target work on :through associations. *Tobias Lütke*
+
+*   made .find() work on :through relations. *Tobias Lütke*
+
+*   Fix typo in association docs. #3296. *Blair Zajac*
+
+*   Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model *Tobias Lütke*
+
+## 1.13.2 (December 13th, 2005) ##
+
+*   Become part of Rails 1.0
+
+*   MySQL: allow encoding option for mysql.rb driver.  *Jeremy Kemper*
+
+*   Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [David Heinemeier Hansson]. Example:
+
+        class Post
+          has_many :recent_comments, :class_name => "Comment", :limit => 10, :include => :author
+        end
+
+        post.recent_comments.find(:all) # Uses LIMIT 10 and includes authors
+        post.recent_comments.find(:all, :limit => nil) # Uses no limit but include authors
+        post.recent_comments.find(:all, :limit => nil, :include => nil) # Uses no limit and doesn't include authors
+
+*   Added option to specify :group, :limit, :offset, and :select options from find on has_and_belongs_to_many and has_many assosociations *David Heinemeier Hansson*
+
+*   MySQL: fixes for the bundled mysql.rb driver.  #3160 *Justin Forder*
+
+*   SQLServer: fix obscure optimistic locking bug.  #3068 *kajism@yahoo.com*
+
+*   SQLServer: support uniqueidentifier columns.  #2930 *keithm@infused.org*
+
+*   SQLServer: cope with tables names qualified by owner.  #3067 *jeff@ministrycentered.com*
+
+*   SQLServer: cope with columns with "desc" in the name.  #1950 *Ron Lusk, Ryan Tomayko*
+
+*   SQLServer: cope with primary keys with "select" in the name.  #3057 *rdifrango@captechventures.com*
+
+*   Oracle: active? performs a select instead of a commit.  #3133 *Michael Schoen*
+
+*   MySQL: more robust test for nullified result hashes.  #3124 *Stefan Kaes*
+
+*   Reloading an instance refreshes its aggregations as well as its associations.  #3024 *François Beausoleil*
+
+*   Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 *Paul Hammmond*
+
+*   PostgreSQL: more robust sequence name discovery.  #3087 *Rick Olson*
+
+*   Oracle: use syntax compatible with Oracle 8.  #3131 *Michael Schoen*
+
+*   MySQL: work around ruby-mysql/mysql-ruby inconsistency with mysql.stat.  Eliminate usage of mysql.ping because it doesn't guarantee reconnect.  Explicitly close and reopen the connection instead.  *Jeremy Kemper*
+
+*   Added preliminary support for polymorphic associations *David Heinemeier Hansson*
+
+*   Added preliminary support for join models *David Heinemeier Hansson*
+
+*   Allow validate_uniqueness_of to be scoped by more than just one column.  #1559. *jeremy@jthopple.com, Marcel Molina Jr.*
+
+*   Firebird: active? and reconnect! methods for handling stale connections.  #428 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   Firebird: updated for FireRuby 0.4.0.  #3009 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   MySQL and PostgreSQL: active? compatibility with the pure-Ruby driver.  #428 *Jeremy Kemper*
+
+*   Oracle: active? check pings the database rather than testing the last command status.  #428 *Michael Schoen*
+
+*   SQLServer: resolve column aliasing/quoting collision when using limit or offset in an eager find.  #2974 *kajism@yahoo.com*
+
+*   Reloading a model doesn't lose track of its connection.  #2996 *junk@miriamtech.com, Jeremy Kemper*
+
+*   Fixed bug where using update_attribute after pushing a record to a habtm association of the object caused duplicate rows in the join table. #2888 *colman@rominato.com, Florian Weber, Michael Schoen*
+
+*   MySQL, PostgreSQL: reconnect! also reconfigures the connection.  Otherwise, the connection 'loses' its settings if it times out and is reconnected.  #2978 *Shugo Maeda*
+
+*   has_and_belongs_to_many: use JOIN instead of LEFT JOIN.  *Jeremy Kemper*
+
+*   MySQL: introduce :encoding option to specify the character set for client, connection, and results.  Only available for MySQL 4.1 and later with the mysql-ruby driver.  Do SHOW CHARACTER SET in mysql client to see available encodings.  #2975 *Shugo Maeda*
+
+*   Add tasks to create, drop and rebuild the MySQL and PostgreSQL test  databases. *Marcel Molina Jr.*
+
+*   Correct boolean handling in generated reader methods.  #2945 *Don Park, Stefan Kaes*
+
+*   Don't generate read methods for columns whose names are not valid ruby method names.  #2946 *Stefan Kaes*
+
+*   Document :force option to create_table.  #2921 *Blair Zajac <blair@orcaware.com>*
+
+*   Don't add the same conditions twice in has_one finder sql.  #2916 *Jeremy Evans*
+
+*   Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+*   Introducing the Firebird adapter.  Quote columns and use attribute_condition more consistently.  Setup guide: http://wiki.rubyonrails.com/rails/pages/Firebird+Adapter  #1874 *Ken Kunz <kennethkunz@gmail.com>*
+
+*   SQLServer: active? and reconnect! methods for handling stale connections.  #428 *kajism@yahoo.com, Tom Ward <tom@popdog.net>*
+
+*   Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array.  #1345 *MarkusQ@reality.com*
+
+*   SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  #2866 *kajism@yahoo.com, Tom Ward <tom@popdog.net>*
+
+*   Oracle: active? and reconnect! methods for handling stale connections.  Optionally retry queries after reconnect.  #428 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Correct documentation for Base.delete_all.  #1568 *Newhydra*
+
+*   Oracle: test case for column default parsing.  #2788 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Update documentation for Migrations.  #2861 *Tom Werner <tom@cube6media.com>*
+
+*   When AbstractAdapter#log rescues an exception, attempt to detect and reconnect to an inactive database connection.  Connection adapter must respond to the active? and reconnect! instance methods.  Initial support for PostgreSQL, MySQL, and SQLite.  Make certain that all statements which may need reconnection are performed within a logged block: for example, this means no avoiding log(sql, name) { } if @logger.nil?  #428 *Jeremy Kemper*
+
+*   Oracle: Much faster column reflection.  #2848 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Base.reset_sequence_name analogous to reset_table_name (mostly useful for testing).  Base.define_attr_method allows nil values.  *Jeremy Kemper*
+
+*   PostgreSQL: smarter sequence name defaults, stricter last_insert_id, warn on pk without sequence.  *Jeremy Kemper*
+
+*   PostgreSQL: correctly discover custom primary key sequences.  #2594 *Blair Zajac <blair@orcaware.com>, meadow.nnick@gmail.com, Jeremy Kemper*
+
+*   SQLServer: don't report limits for unsupported field types.  #2835 *Ryan Tomayko*
+
+*   Include the Enumerable module in ActiveRecord::Errors.  *Rick Bradley <rick@rickbradley.com>*
+
+*   Add :group option, correspond to GROUP BY, to the find method and to the has_many association.  #2818 *rubyonrails@atyp.de*
+
+*   Don't cast nil or empty strings to a dummy date.  #2789 *Rick Bradley <rick@rickbradley.com>*
+
+*   acts_as_list plays nicely with inheritance by remembering the class which declared it.  #2811 *rephorm@rephorm.com*
+
+*   Fix sqlite adaptor's detection of missing dbfile or database declaration. *Nicholas Seckar*
+
+*   Fixed acts_as_list for definitions without an explicit :order #2803 *Jonathan Viney*
+
+*   Upgrade bundled ruby-mysql 0.2.4 with mysql411 shim (see #440) to ruby-mysql 0.2.6 with a patchset for 4.1 protocol support.  Local change [301] is now a part of the main driver; reapplied local change [2182].  Removed GC.start from Result.free.  *tommy@tmtm.org, akuroda@gmail.com, Doug Fales <doug.fales@gmail.com>, Jeremy Kemper*
+
+*   Correct handling of complex order clauses with SQL Server limit emulation.  #2770 *Tom Ward <tom@popdog.net>, Matt B.*
+
+*   Correct whitespace problem in Oracle default column value parsing.  #2788 *rick@rickbradley.com*
+
+*   Destroy associated has_and_belongs_to_many records after all before_destroy callbacks but before destroy.  This allows you to act on the habtm association as you please while preserving referential integrity.  #2065 *larrywilliams1@gmail.com, sam.kirchmeier@gmail.com, elliot@townx.org, Jeremy Kemper*
+
+*   Deprecate the old, confusing :exclusively_dependent option in favor of :dependent => :delete_all.  *Jeremy Kemper*
+
+*   More compatible Oracle column reflection.  #2771 *Ryan Davis <ryand-ruby@zenspider.com>, Michael Schoen <schoenm@earthlink.net>*
+
+
+## 1.13.0 (November 7th, 2005) ##
+
+*   Fixed faulty regex in get_table_name method (SQLServerAdapter) #2639 *Ryan Tomayko*
+
+*   Added :include as an option for association declarations [David Heinemeier Hansson]. Example:
+
+        has_many :posts, :include => [ :author, :comments ]
+
+*   Rename Base.constrain to Base.with_scope so it doesn't conflict with existing concept of database constraints.  Make scoping more robust: uniform method => parameters, validated method names and supported finder parameters, raise exception on nested scopes.  [Jeremy Kemper]  Example:
+
+        Comment.with_scope(:find => { :conditions => 'active=true' }, :create => { :post_id => 5 }) do
+          # Find where name = ? and active=true
+          Comment.find :all, :conditions => ['name = ?', name]
+          # Create comment associated with :post_id
+          Comment.create :body => "Hello world"
+        end
+
+*   Fixed that SQL Server should ignore :size declarations on anything but integer and string in the agnostic schema representation #2756 *Ryan Tomayko*
+
+*   Added constrain scoping for creates using a hash of attributes bound to the :creation key [David Heinemeier Hansson]. Example:
+
+        Comment.constrain(:creation => { :post_id => 5 }) do
+          # Associated with :post_id
+          Comment.create :body => "Hello world"
+        end
+
+    This is rarely used directly, but allows for find_or_create on associations. So you can do:
+
+        # If the tag doesn't exist, a new one is created that's associated with the person
+        person.tags.find_or_create_by_name("Summer")
+
+*   Added find_or_create_by_X as a second type of dynamic finder that'll create the record if it doesn't already exist [David Heinemeier Hansson]. Example:
+
+        # No 'Summer' tag exists
+        Tag.find_or_create_by_name("Summer") # equal to Tag.create(:name => "Summer")
+
+        # Now the 'Summer' tag does exist
+        Tag.find_or_create_by_name("Summer") # equal to Tag.find_by_name("Summer")
+
+*   Added extension capabilities to has_many and has_and_belongs_to_many proxies [David Heinemeier Hansson]. Example:
+
+        class Account < ActiveRecord::Base
+          has_many :people do
+            def find_or_create_by_name(name)
+              first_name, *last_name = name.split
+              last_name = last_name.join " "
+
+              find_or_create_by_first_name_and_last_name(first_name, last_name)
+            end
+          end
+        end
+
+        person = Account.find(:first).people.find_or_create_by_name("David Heinemeier Hansson")
+        person.first_name # => "David"
+        person.last_name  # => "Heinemeier Hansson"
+
+    Note that the anoymous module must be declared using brackets, not do/end (due to order of evaluation).
+
+*   Omit internal dtproperties table from SQLServer table list.  #2729 *Ryan Tomayko*
+
+*   Quote column names in generated SQL.  #2728 *Ryan Tomayko*
+
+*   Correct the pure-Ruby MySQL 4.1.1 shim's version test.  #2718 *Jeremy Kemper*
+
+*   Add Model.create! to match existing model.save! method.  When save! raises RecordInvalid, you can catch the exception, retrieve the invalid record (invalid_exception.record), and see its errors (invalid_exception.record.errors).  *Jeremy Kemper*
+
+*   Correct fixture behavior when table name pluralization is off.  #2719 *Rick Bradley <rick@rickbradley.com>*
+
+*   Changed :dbfile to :database for SQLite adapter for consistency (old key still works as an alias) #2644 *Dan Peterson*
+
+*   Added migration support for Oracle #2647 *Michael Schoen*
+
+*   Worked around that connection can't be reset if allow_concurrency is off.  #2648 *Michael Schoen <schoenm@earthlink.net>*
+
+*   Fixed SQL Server adapter to pass even more tests and do even better #2634 *Ryan Tomayko*
+
+*   Fixed SQL Server adapter so it honors options[:conditions] when applying :limits #1978 *Tom Ward*
+
+*   Added migration support to SQL Server adapter (please someone do the same for Oracle and DB2) #2625 *Tom Ward*
+
+*   Use AR::Base.silence rather than AR::Base.logger.silence in fixtures to preserve Log4r compatibility.  #2618 *dansketcher@gmail.com*
+
+*   Constraints are cloned so they can't be inadvertently modified while they're
+    in effect.  Added :readonly finder constraint.  Calling an association collection's class method (Part.foobar via item.parts.foobar) constrains :readonly => false since the collection's :joins constraint would otherwise force it to true.  [Jeremy Kemper <rails@bitsweat.net>]
+*   Added :offset and :limit to the kinds of options that Base.constrain can use #2466 *duane.johnson@gmail.com*
+
+*   Fixed handling of nil number columns on Oracle and cleaned up tests for Oracle in general #2555 *Michael Schoen*
+
+*   Added quoted_true and quoted_false methods and tables to db2_adapter and cleaned up tests for DB2 #2493, #2624 *maik schmidt*
+
+
+## 1.12.2 (October 26th, 2005) ##
+
+*   Allow symbols to rename columns when using SQLite adapter. #2531 *Kevin Clark*
+
+*   Map Active Record time to SQL TIME.  #2575, #2576 *Robby Russell <robby@planetargon.com>*
+
+*   Clarify semantics of ActiveRecord::Base#respond_to?  #2560 *Stefan Kaes*
+
+*   Fixed Association#clear for associations which have not yet been accessed. #2524 *Patrick Lenz <patrick@lenz.sh>*
+
+*   HABTM finders shouldn't return readonly records.  #2525 *Patrick Lenz <patrick@lenz.sh>*
+
+*   Make all tests runnable on their own. #2521. *Blair Zajac <blair@orcaware.com>*
+
+
+## 1.12.1 (October 19th, 2005) ##
+
+*   Always parenthesize :conditions options so they may be safely combined with STI and constraints.
+
+*   Correct PostgreSQL primary key sequence detection.  #2507 *tmornini@infomania.com*
+
+*   Added support for using limits in eager loads that involve has_many and has_and_belongs_to_many associations
+
+
+## 1.12.0 (October 16th, 2005) ##
+
+*   Update/clean up documentation (rdoc)
+
+*   PostgreSQL sequence support.  Use set_sequence_name in your model class to specify its primary key sequence.  #2292 *Rick Olson <technoweenie@gmail.com>, Robby Russell <robby@planetargon.com>*
+
+*   Change default logging colors to work on both white and black backgrounds. *Sam Stephenson*
+
+*   YAML fixtures support ordered hashes for fixtures with foreign key dependencies in the same table.  #1896 *purestorm@ggnore.net*
+
+*   :dependent now accepts :nullify option. Sets the foreign key of the related objects to NULL instead of deleting them. #2015 *Robby Russell <robby@planetargon.com>*
+
+*   Introduce read-only records.  If you call object.readonly! then it will mark the object as read-only and raise ReadOnlyRecord if you call object.save.  object.readonly? reports whether the object is read-only.  Passing :readonly => true to any finder method will mark returned records as read-only.  The :joins option now implies :readonly, so if you use this option, saving the same record will now fail.  Use find_by_sql to work around.
+
+*   Avoid memleak in dev mode when using fcgi
+
+*   Simplified .clear on active record associations by using the existing delete_records method. #1906 *Caleb <me@cpb.ca>*
+
+*   Delegate access to a customized primary key to the conventional id method. #2444. *Blair Zajac <blair@orcaware.com>*
+
+*   Fix errors caused by assigning a has-one or belongs-to property to itself
+
+*   Add ActiveRecord::Base.schema_format setting which specifies how databases should be dumped *Sam Stephenson*
+
+*   Update DB2 adapter. #2206. *contact@maik-schmidt.de*
+
+*   Corrections to SQLServer native data types. #2267.  *rails.20.clarry@spamgourmet.com*
+
+*   Deprecated ActiveRecord::Base.threaded_connection in favor of ActiveRecord::Base.allow_concurrency.
+
+*   Protect id attribute from mass assigment even when the primary key is set to something else. #2438. *Blair Zajac <blair@orcaware.com>*
+
+*   Misc doc fixes (typos/grammar/etc.). #2430. *coffee2code*
+
+*   Add test coverage for content_columns. #2432. *coffee2code*
+
+*   Speed up for unthreaded environments. #2431. *Stefan Kaes*
+
+*   Optimization for Mysql selects using mysql-ruby extension greater than 2.6.3.  #2426. *Stefan Kaes*
+
+*   Speed up the setting of table_name. #2428. *Stefan Kaes*
+
+*   Optimize instantiation of STI subclass records. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Fix typo of 'constrains' to 'contraints'. #2069. *Michael Schuerig <michael@schuerig.de>*
+
+*   Optimization refactoring for add_limit_offset!. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Add ability to get all siblings, including the current child, with acts_as_tree. Recloses #2140. *Michael Schuerig <michael@schuerig.de>*
+
+*   Add geometric type for postgresql adapter. #2233 *Andrew Kaspick*
+
+*   Add option (true by default) to generate reader methods for each attribute of a record to avoid the overhead of calling method missing. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Add convenience predicate methods on Column class. In partial fullfilment of #1236. *Stefan Kaes*
+
+*   Raise errors when invalid hash keys are passed to ActiveRecord::Base.find. #2363  *Chad Fowler <chad@chadfowler.com>, Nicholas Seckar*
+
+*   Added :force option to create_table that'll try to drop the table if it already exists before creating
+
+*   Fix transactions so that calling return while inside a transaction will not leave an open transaction on the connection. *Nicholas Seckar*
+
+*   Use foreign_key inflection uniformly.  #2156 *Blair Zajac <blair@orcaware.com>*
+
+*   model.association.clear should destroy associated objects if :dependent => true instead of nullifying their foreign keys.  #2221 *joergd@pobox.com, ObieFernandez <obiefernandez@gmail.com>*
+
+*   Returning false from before_destroy should cancel the action.  #1829 *Jeremy Huffman*
+
+*   Recognize PostgreSQL NOW() default as equivalent to CURRENT_TIMESTAMP or CURRENT_DATE, depending on the column's type.  #2256 *mat <mat@absolight.fr>*
+
+*   Extensive documentation for the abstract database adapter.  #2250 *François Beausoleil <fbeausoleil@ftml.net>*
+
+*   Clean up Fixtures.reset_sequences for PostgreSQL.  Handle tables with no rows and models with custom primary keys.  #2174, #2183 *jay@jay.fm, Blair Zajac <blair@orcaware.com>*
+
+*   Improve error message when nil is assigned to an attr which validates_size_of within a range.  #2022 *Manuel Holtgrewe <purestorm@ggnore.net>*
+
+*   Make update_attribute use the same writer method that update_attributes uses.
+    \#2237 [trevor@protocool.com]
+*   Make migrations honor table name prefixes and suffixes. #2298 *Jakob Skjerning, Marcel Molina Jr.*
+
+*   Correct and optimize PostgreSQL bytea escaping.  #1745, #1837 *dave@cherryville.org, ken@miriamtech.com, bellis@deepthought.org*
+
+*   Fixtures should only reset a PostgreSQL sequence if it corresponds to an integer primary key named id.  #1749 *chris@chrisbrinker.com*
+
+*   Standardize the interpretation of boolean columns in the Mysql and Sqlite adapters. (Use MysqlAdapter.emulate_booleans = false to disable this behavior)
+
+*   Added new symbol-driven approach to activating observers with Base#observers= [David Heinemeier Hansson]. Example:
+
+        ActiveRecord::Base.observers = :cacher, :garbage_collector
+
+*   Added AbstractAdapter#select_value and AbstractAdapter#select_values as convenience methods for selecting single values, instead of hashes, of the first column in a SELECT #2283 *solo@gatelys.com*
+
+*   Wrap :conditions in parentheses to prevent problems with OR's #1871 *Jamis Buck*
+
+*   Allow the postgresql adapter to work with the SchemaDumper. *Jamis Buck*
+
+*   Add ActiveRecord::SchemaDumper for dumping a DB schema to a pure-ruby file, making it easier to consolidate large migration lists and port database schemas between databases. *Jamis Buck*
+
+*   Fixed migrations for Windows when using more than 10 *David Naseby*
+
+*   Fixed that the create_x method from belongs_to wouldn't save the association properly #2042 *Florian Weber*
+
+*   Fixed saving a record with two unsaved belongs_to associations pointing to the same object #2023 *Tobias Lütke*
+
+*   Improved migrations' behavior when the schema_info table is empty. *Nicholas Seckar*
+
+*   Fixed that Observers didn't observe sub-classes #627 *Florian Weber*
+
+*   Fix eager loading error messages, allow :include to specify tables using strings or symbols. Closes #2222 *Marcel Molina Jr.*
+
+*   Added check for RAILS_CONNECTION_ADAPTERS on startup and only load the connection adapters specified within if its present (available in Rails through config.connection_adapters using the new config) #1958 *skae*
+
+*   Fixed various problems with has_and_belongs_to_many when using customer finder_sql #2094 *Florian Weber*
+
+*   Added better exception error when unknown column types are used with migrations #1814 *François Beausoleil*
+
+*   Fixed "connection lost" issue with the bundled Ruby/MySQL driver (would kill the app after 8 hours of inactivity) #2163, #428 *kajism@yahoo.com*
+
+*   Fixed comparison of Active Record objects so two new objects are not equal #2099 *deberg*
+
+*   Fixed that the SQL Server adapter would sometimes return DBI::Timestamp objects instead of Time #2127 *Tom Ward*
+
+*   Added the instance methods #root and #ancestors on acts_as_tree and fixed siblings to not include the current node #2142, #2140 *coffee2code*
+
+*   Fixed that Active Record would call SHOW FIELDS twice (or more) for the same model when the cached results were available #1947 *sd@notso.net*
+
+*   Added log_level and use_silence parameter to ActiveRecord::Base.benchmark. The first controls at what level the benchmark statement will be logged (now as debug, instead of info) and the second that can be passed false to include all logging statements during the benchmark block/
+
+*   Make sure the schema_info table is created before querying the current version #1903
+
+*   Fixtures ignore table name prefix and suffix #1987 *Jakob Skjerning*
+
+*   Add documentation for index_type argument to add_index method for migrations #2005 *Blaine*
+
+*   Modify read_attribute to allow a symbol argument #2024 *Ken Kunz*
+
+*   Make destroy return self #1913 *Sebastian Kanthak*
+
+*   Fix typo in validations documentation #1938 *court3nay*
+
+*   Make acts_as_list work for insert_at(1) #1966 *hensleyl@papermountain.org*
+
+*   Fix typo in count_by_sql documentation #1969 *Alexey Verkhovsky*
+
+*   Allow add_column and create_table to specify NOT NULL #1712 *emptysands@gmail.com*
+
+*   Fix create_table so that id column is implicitly added *Rick Olson*
+
+*   Default sequence names for Oracle changed to #{table_name}_seq, which is the most commonly used standard. In addition, a new method ActiveRecord::Base#set_sequence_name allows the developer to set the sequence name per model. This is a non-backwards-compatible change -- anyone using the old-style "rails_sequence" will need to either create new sequences, or set: ActiveRecord::Base.set_sequence_name = "rails_sequence" #1798
+
+*   OCIAdapter now properly handles synonyms, which are commonly used to separate out the schema owner from the application user #1798
+
+*   Fixed the handling of camelCase columns names in Oracle #1798
+
+*   Implemented for OCI the Rakefile tasks of :clone_structure_to_test, :db_structure_dump, and :purge_test_database, which enable Oracle folks to enjoy all the agile goodness of Rails for testing. Note that the current implementation is fairly limited -- only tables and sequences are cloned, not constraints or indexes. A full clone in Oracle generally requires some manual effort, and is version-specific. Post 9i, Oracle recommends the use of the DBMS_METADATA package, though that approach requires editing of the physical characteristics generated #1798
+
+*   Fixed the handling of multiple blob columns in Oracle if one or more of them are null #1798
+
+*   Added support for calling constrained class methods on has_many and has_and_belongs_to_many collections #1764 *Tobias Lütke*
+
+        class Comment < AR:B
+          def self.search(q)
+            find(:all, :conditions => ["body = ?", q])
+          end
+        end
+
+        class Post < AR:B
+          has_many :comments
+        end
+
+        Post.find(1).comments.search('hi') # => SELECT * from comments WHERE post_id = 1 AND body = 'hi'
+
+    NOTICE: This patch changes the underlying SQL generated by has_and_belongs_to_many queries. If your relying on that, such as
+    by explicitly referencing the old t and j aliases, you'll need to update your code. Of course, you _shouldn't_ be relying on
+    details like that no less than you should be diving in to touch private variables. But just in case you do, consider yourself
+    noticed :)
+
+*   Added migration support for SQLite (using temporary tables to simulate ALTER TABLE) #1771 *Sam Stephenson*
+
+*   Remove extra definition of supports_migrations? from abstract_adaptor.rb *Nicholas Seckar*
+
+*   Fix acts_as_list so that moving next-to-last item to the bottom does not result in duplicate item positions
+
+*   Fixed incompatibility in DB2 adapter with the new limit/offset approach #1718 *Maik Schmidt*
+
+*   Added :select option to find which can specify a different value than the default *, like find(:all, :select => "first_name, last_name"), if you either only want to select part of the columns or exclude columns otherwise included from a join #1338 *Stefan Kaes*
+
+
+## 1.11.1 (11 July, 2005) ##
+
+*   Added support for limit and offset with eager loading of has_one and belongs_to associations. Using the options with has_many and has_and_belongs_to_many associations will now raise an ActiveRecord::ConfigurationError #1692 *Rick Olson*
+
+*   Fixed that assume_bottom_position (in acts_as_list) could be called on items already last in the list and they would move one position away from the list #1648 *tyler@kianta.com*
+
+*   Added ActiveRecord::Base.threaded_connections flag to turn off 1-connection per thread (required for thread safety). By default it's on, but WEBrick in Rails need it off #1685 *Sam Stephenson*
+
+*   Correct reflected table name for singular associations.  #1688 *court3nay*
+
+*   Fixed optimistic locking with SQL Server #1660 *tom@popdog.net*
+
+*   Added ActiveRecord::Migrator.migrate that can figure out whether to go up or down based on the target version and the current
+
+*   Added better error message for "packets out of order" #1630 *court3nay*
+
+*   Fixed first run of "rake migrate" on PostgreSQL by not expecting a return value on the id #1640
+
+
+## 1.11.0 (6 July, 2005) ##
+
+*   Fixed that Yaml error message in fixtures hid the real error #1623 *Nicholas Seckar*
+
+*   Changed logging of SQL statements to use the DEBUG level instead of INFO
+
+*   Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Lütke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
+
+*   Added callback hooks to association collections #1549 [Florian Weber]. Example:
+
+        class Project
+          has_and_belongs_to_many :developers, :before_add => :evaluate_velocity
+
+          def evaluate_velocity(developer)
+            ...
+          end
+        end
+
+    ..raising an exception will cause the object not to be added (or removed, with before_remove).
+
+
+*   Fixed Base.content_columns call for SQL Server adapter #1450 *DeLynn Berry*
+
+*   Fixed Base#write_attribute to work with both symbols and strings #1190 *Paul Legato*
+
+*   Fixed that has_and_belongs_to_many didn't respect single table inheritance types #1081 *Florian Weber*
+
+*   Speed up ActiveRecord#method_missing for the common case (read_attribute).
+
+*   Only notify observers on after_find and after_initialize if these methods are defined on the model.  #1235 *Stefan Kaes*
+
+*   Fixed that single-table inheritance sub-classes couldn't be used to limit the result set with eager loading #1215 *Chris McGrath*
+
+*   Fixed validates_numericality_of to work with overrided getter-method when :allow_nil is on #1316 *raidel@onemail.at*
+
+*   Added roots, root, and siblings to the batch of methods added by acts_as_tree #1541 *Michael Schuerig*
+
+*   Added support for limit/offset with the MS SQL Server driver so that pagination will now work #1569 *DeLynn Berry*
+
+*   Added support for ODBC connections to MS SQL Server so you can connect from a non-Windows machine #1569 *Mark Imbriaco/DeLynn Berry*
+
+*   Fixed that multiparameter posts ignored attr_protected #1532 *alec+rails@veryclever.net*
+
+*   Fixed problem with eager loading when using a has_and_belongs_to_many association using :association_foreign_key #1504 *flash@vanklinkenbergsoftware.nl*
+
+*   Fixed Base#find to honor the documentation on how :joins work and make them consistent with Base#count #1405 [pritchie@gmail.com]. What used to be:
+
+        Developer.find :all, :joins => 'developers_projects', :conditions => 'id=developer_id AND project_id=1'
+
+    ...should instead be:
+
+        Developer.find(
+          :all,
+          :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
+          :conditions => 'project_id=1'
+        )
+
+*   Fixed that validations didn't respecting custom setting for too_short, too_long messages #1437 *Marcel Molina Jr.*
+
+*   Fixed that clear_association_cache doesn't delete new associations on new records (so you can safely place new records in the session with Action Pack without having new associations wiped) #1494 *cluon*
+
+*   Fixed that calling Model.find([]) returns [] and doesn't throw an exception #1379
+
+*   Fixed that adding a record to a has_and_belongs_to collection would always save it -- now it only saves if its a new record #1203 *Alisdair McDiarmid*
+
+*   Fixed saving of in-memory association structures to happen as a after_create/after_update callback instead of after_save -- that way you can add new associations in after_create/after_update callbacks without getting them saved twice
+
+*   Allow any Enumerable, not just Array, to work as bind variables #1344 *Jeremy Kemper*
+
+*   Added actual database-changing behavior to collection assigment for has_many and has_and_belongs_to_many #1425 [Sebastian Kanthak].
+    Example:
+
+        david.projects = [Project.find(1), Project.new("name" => "ActionWebSearch")]
+        david.save
+
+    If david.projects already contain the project with ID 1, this is left unchanged. Any other projects are dropped. And the new
+    project is saved when david.save is called.
+
+    Also included is a way to do assignments through IDs, which is perfect for checkbox updating, so you get to do:
+
+        david.project_ids = [1, 5, 7]
+
+*   Corrected typo in find SQL for has_and_belongs_to_many.  #1312 *ben@bensinclair.com*
+
+*   Fixed sanitized conditions for has_many finder method.  #1281 *jackc@hylesanderson.com, pragdave, Tobias Lütke*
+
+*   Comprehensive PostgreSQL schema support.  Use the optional schema_search_path directive in database.yml to give a comma-separated list of schemas to search for your tables.  This allows you, for example, to have tables in a shared schema without having to use a custom table name.  See http://www.postgresql.org/docs/8.0/interactive/ddl-schemas.html to learn more.  #827 *dave@cherryville.org*
+
+*   Corrected @@configurations typo #1410 *david@ruppconsulting.com*
+
+*   Return PostgreSQL columns in the order they were declared #1374 *perlguy@gmail.com*
+
+*   Allow before/after update hooks to work on models using optimistic locking
+
+*   Eager loading of dependent has_one associations won't delete the association #1212
+
+*   Added a second parameter to the build and create method for has_one that controls whether the existing association should be replaced (which means nullifying its foreign key as well). By default this is true, but false can be passed to prevent it.
+
+*   Using transactional fixtures now causes the data to be loaded only once.
+
+*   Added fixture accessor methods that can be used when instantiated fixtures are disabled.
+
+        fixtures :web_sites
+
+        def test_something
+          assert_equal "Ruby on Rails", web_sites(:rubyonrails).name
+        end
+
+*   Added DoubleRenderError exception that'll be raised if render* is called twice #518 *Nicholas Seckar*
+
+*   Fixed exceptions occuring after render has been called #1096 *Nicholas Seckar*
+
+*   CHANGED: validates_presence_of now uses Errors#add_on_blank, which will make "  " fail the validation where it didn't before #1309
+
+*   Added Errors#add_on_blank which works like Errors#add_on_empty, but uses Object#blank? instead
+
+*   Added the :if option to all validations that can either use a block or a method pointer to determine whether the validation should be run or not. #1324 [Duane Johnson/jhosteny]. Examples:
+
+    Conditional validations such as the following are made possible:
+        validates_numericality_of :income, :if => :employed?
+
+    Conditional validations can also solve the salted login generator problem:
+        validates_confirmation_of :password, :if => :new_password?
+
+    Using blocks:
+        validates_presence_of :username, :if => Proc.new { |user| user.signup_step > 1 }
+
+*   Fixed use of construct_finder_sql when using :join #1288 *dwlt@dwlt.net*
+
+*   Fixed that :delete_sql in has_and_belongs_to_many associations couldn't access record properties #1299 *Rick Olson*
+
+*   Fixed that clone would break when an aggregate had the same name as one of its attributes #1307 *Jeremy Kemper*
+
+*   Changed that destroying an object will only freeze the attributes hash, which keeps the object from having attributes changed (as that wouldn't make sense), but allows for the querying of associations after it has been destroyed.
+
+*   Changed the callbacks such that observers are notified before the in-object callbacks are triggered. Without this change, it wasn't possible to act on the whole object in something like a before_destroy observer without having the objects own callbacks (like deleting associations) called first.
+
+*   Added option for passing an array to the find_all version of the dynamic finders and have it evaluated as an IN fragment. Example:
+
+        # SELECT * FROM topics WHERE title IN ('First', 'Second')
+        Topic.find_all_by_title(["First", "Second"])
+
+*   Added compatibility with camelCase column names for dynamic finders #533 *Dee Zsombor*
+
+*   Fixed extraneous comma in count() function that made it not work with joins #1156 *Jarkko Laine/Dee Zsombor*
+
+*   Fixed incompatibility with Base#find with an array of ids that would fail when using eager loading #1186 *Alisdair McDiarmid*
+
+*   Fixed that validate_length_of lost :on option when :within was specified #1195 *jhosteny@mac.com*
+
+*   Added encoding and min_messages options for PostgreSQL #1205 [Shugo Maeda]. Configuration example:
+
+        development:
+          adapter: postgresql
+          database: rails_development
+          host: localhost
+          username: postgres
+          password:
+          encoding: UTF8
+          min_messages: ERROR
+
+*   Fixed acts_as_list where deleting an item that was removed from the list would ruin the positioning of other list items #1197 *Jamis Buck*
+
+*   Added validates_exclusion_of as a negative of validates_inclusion_of
+
+*   Optimized counting of has_many associations by setting the association to empty if the count is 0 so repeated calls doesn't trigger database calls
+
+
+## 1.10.1 (20th April, 2005) ##
+
+*   Fixed frivilous database queries being triggered with eager loading on empty associations and other things
+
+*   Fixed order of loading in eager associations
+
+*   Fixed stray comma when using eager loading and ordering together from has_many associations #1143
+
+
+## 1.10.0 (19th April, 2005) ##
+
+*   Added eager loading of associations as a way to solve the N+1 problem more gracefully without piggy-back queries. Example:
+
+        for post in Post.find(:all, :limit => 100)
+          puts "Post:            " + post.title
+          puts "Written by:      " + post.author.name
+          puts "Last comment on: " + post.comments.first.created_on
+        end
+
+    This used to generate 301 database queries if all 100 posts had both author and comments. It can now be written as:
+
+        for post in Post.find(:all, :limit => 100, :include => [ :author, :comments ])
+
+    ...and the number of database queries needed is now 1.
+
+*   Added new unified Base.find API and deprecated the use of find_first and find_all. See the documentation for Base.find. Examples:
+
+        Person.find(1, :conditions => "administrator = 1", :order => "created_on DESC")
+        Person.find(1, 5, 6, :conditions => "administrator = 1", :order => "created_on DESC")
+        Person.find(:first, :order => "created_on DESC", :offset => 5)
+        Person.find(:all, :conditions => [ "category IN (?)", categories], :limit => 50)
+        Person.find(:all, :offset => 10, :limit => 10)
+
+*   Added acts_as_nested_set #1000 [wschenk]. Introduction:
+
+        This acts provides Nested Set functionality.  Nested Set is similiar to Tree, but with
+        the added feature that you can select the children and all of it's descendants with
+        a single query.  A good use case for this is a threaded post system, where you want
+        to display every reply to a comment without multiple selects.
+
+*   Added Base.save! that attempts to save the record just like Base.save but will raise a RecordInvalid exception instead of returning false if the record is not valid *Dave Thomas*
+
+*   Fixed PostgreSQL usage of fixtures with regards to public schemas and table names with dots #962 *gnuman1@gmail.com*
+
+*   Fixed that fixtures were being deleted in the same order as inserts causing FK errors #890 *andrew.john.peters@gmail.com*
+
+*   Fixed loading of fixtures in to be in the right order (or PostgreSQL would bark) #1047 *stephenh@chase3000.com*
+
+*   Fixed page caching for non-vhost applications living underneath the root #1004 *Ben Schumacher*
+
+*   Fixes a problem with the SQL Adapter which was resulting in IDENTITY_INSERT not being set to ON when it should be #1104 *adelle*
+
+*   Added the option to specify the acceptance string in validates_acceptance_of #1106 *caleb@aei-tech.com*
+
+*   Added insert_at(position) to acts_as_list #1083 *DeLynnB*
+
+*   Removed the default order by id on has_and_belongs_to_many queries as it could kill performance on large sets (you can still specify by hand with :order)
+
+*   Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 *yon@milliped.com*
+
+*   Fixed boolean saving on Oracle #1093 *mparrish@pearware.org*
+
+*   Moved build_association and create_association for has_one and belongs_to out of deprecation as they work when the association is nil unlike association.build and association.create, which require the association to be already in place #864
+
+*   Added rollbacks of transactions if they're active as the dispatcher is killed gracefully (TERM signal) #1054 *Leon Bredt*
+
+*   Added quoting of column names for fixtures #997 *jcfischer@gmail.com*
+
+*   Fixed counter_sql when no records exist in database for PostgreSQL (would give error, not 0) #1039 *Caleb Tennis*
+
+*   Fixed that benchmarking times for rendering included db runtimes #987 *Stefan Kaes*
+
+*   Fixed boolean queries for t/f fields in PostgreSQL #995 *dave@cherryville.org*
+
+*   Added that model.items.delete(child) will delete the child, not just set the foreign key to nil, if the child is dependent on the model #978 *Jeremy Kemper*
+
+*   Fixed auto-stamping of dates (created_on/updated_on) for PostgreSQL #985 *dave@cherryville.org*
+
+*   Fixed Base.silence/benchmark to only log if a logger has been configured #986 *Stefan Kaes*
+
+*   Added a join parameter as the third argument to Base.find_first and as the second to Base.count #426, #988 *Stefan Kaes*
+
+*   Fixed bug in Base#hash method that would treat records with the same string-based id as different *Dave Thomas*
+
+*   Renamed DateHelper#distance_of_time_in_words_to_now to DateHelper#time_ago_in_words (old method name is still available as a deprecated alias)
+
+
+## 1.9.1 (27th March, 2005) ##
+
+*   Fixed that Active Record objects with float attribute could not be cloned #808
+
+*   Fixed that MissingSourceFile's wasn't properly detected in production mode #925 *Nicholas Seckar*
+
+*   Fixed that :counter_cache option would look for a line_items_count column for a LineItem object instead of lineitems_count
+
+*   Fixed that AR exists?() would explode on postgresql if the passed id did not match the PK type #900 *Scott Barron*
+
+*   Fixed the MS SQL adapter to work with the new limit/offset approach and with binary data (still suffering from 7KB limit, though) #901 *delynnb*
+
+
+## 1.9.0 (22th March, 2005) ##
+
+*   Added adapter independent limit clause as a two-element array with the first being the limit, the second being the offset #795 [Sam Stephenson]. Example:
+
+        Developer.find_all nil, 'id ASC', 5      # return the first five developers
+        Developer.find_all nil, 'id ASC', [3, 8] # return three developers, starting from #8 and forward
+
+    This doesn't yet work with the DB2 or MS SQL adapters. Patches to make that happen are encouraged.
+
+*   Added alias_method :to_param, :id to Base, such that Active Record objects to be used as URL parameters in Action Pack automatically #812 *Nicholas Seckar/Sam Stephenson*
+
+*   Improved the performance of the OCI8 adapter for Oracle #723 *pilx/gjenkins*
+
+*   Added type conversion before saving a record, so string-based values like "10.0" aren't left for the database to convert #820 *dave@cherryville.org*
+
+*   Added with additional settings for working with transactional fixtures and pre-loaded test databases #865 *mindel*
+
+*   Fixed acts_as_list to trigger remove_from_list on destroy after the fact, not before, so a unique position can be maintained #871 *Alisdair McDiarmid*
+
+*   Added the possibility of specifying fixtures in multiple calls #816 *kim@tinker.com*
+
+*   Added Base.exists?(id) that'll return true if an object of the class with the given id exists #854 *stian@grytoyr.net*
+
+*   Added optionally allow for nil or empty strings with validates_numericality_of #801 *Sebastian Kanthak*
+
+*   Fixed problem with using slashes in validates_format_of regular expressions #801 *Sebastian Kanthak*
+
+*   Fixed that SQLite3 exceptions are caught and reported properly #823 *yerejm*
+
+*   Added that all types of after_find/after_initialized callbacks are triggered if the explicit implementation is present, not only the explicit implementation itself
+
+*   Fixed that symbols can be used on attribute assignment, like page.emails.create(:subject => data.subject, :body => data.body)
+
+
+## 1.8.0 (7th March, 2005) ##
+
+*   Added ActiveRecord::Base.colorize_logging to control whether to use colors in logs or not (on by default)
+
+*   Added support for timestamp with time zone in PostgreSQL #560 *Scott Barron*
+
+*   Added MultiparameterAssignmentErrors and AttributeAssignmentError exceptions #777 [demetrius]. Documentation:
+
+     * +MultiparameterAssignmentErrors+ -- collection of errors that occurred during a mass assignment using the
+         +attributes=+ method. The +errors+ property of this exception contains an array of +AttributeAssignmentError+
+         objects that should be inspected to determine which attributes triggered the errors.
+     * +AttributeAssignmentError+ -- an error occurred while doing a mass assignment through the +attributes=+ method.
+         You can inspect the +attribute+ property of the exception object to determine which attribute triggered the error.
+
+*   Fixed that postgresql adapter would fails when reading bytea fields with null value #771 *rodrigo k*
+
+*   Added transactional fixtures that uses rollback to undo changes to fixtures instead of DELETE/INSERT -- it's much faster. See documentation under Fixtures #760 *Jeremy Kemper*
+
+*   Added destruction of dependent objects in has_one associations when a new assignment happens #742 [mindel]. Example:
+
+        class Account < ActiveRecord::Base
+          has_one :credit_card, :dependent => true
+        end
+        class CreditCard < ActiveRecord::Base
+          belongs_to :account
+        end
+
+        account.credit_card # => returns existing credit card, lets say id = 12
+        account.credit_card = CreditCard.create("number" => "123")
+        account.save # => CC with id = 12 is destroyed
+
+
+*   Added validates_numericality_of #716 [Sebastian Kanthak/Chris McGrath]. Docuemntation:
+
+        Validates whether the value of the specified attribute is numeric by trying to convert it to
+        a float with Kernel.Float (if <tt>integer</tt> is false) or applying it to the regular expression
+        <tt>/^[\+\-]?\d+$/</tt> (if <tt>integer</tt> is set to true).
+
+          class Person < ActiveRecord::Base
+            validates_numericality_of :value, :on => :create
+          end
+
+        Configuration options:
+        * <tt>message</tt> - A custom error message (default is: "is not a number")
+        * <tt>on</tt> Specifies when this validation is active (default is :save, other options :create, :update)
+        * <tt>only_integer</tt> Specifies whether the value has to be an integer, e.g. an integral value (default is false)
+
+
+*   Fixed that HasManyAssociation#count was using :finder_sql rather than :counter_sql if it was available #445 *Scott Barron*
+
+*   Added better defaults for composed_of, so statements like composed_of :time_zone, :mapping => %w( time_zone time_zone ) can be written without the mapping part (it's now assumed)
+
+*   Added MacroReflection#macro which will return a symbol describing the macro used (like :composed_of or :has_many) #718, #248 *james@slashetc.com*
+
+
+## 1.7.0 (24th February, 2005) ##
+
+*   Changed the auto-timestamping feature to use ActiveRecord::Base.default_timezone instead of entertaining the parallel ActiveRecord::Base.timestamps_gmt method. The latter is now deprecated and will throw a warning on use (but still work) #710 *Jamis Buck*
+
+*   Added a OCI8-based Oracle adapter that has been verified to work with Oracle 8 and 9 #629 [Graham Jenkins]. Usage notes:
+
+        1.  Key generation uses a sequence "rails_sequence" for all tables. (I couldn't find a simple
+            and safe way of passing table-specific sequence information to the adapter.)
+        2.  Oracle uses DATE or TIMESTAMP datatypes for both dates and times. Consequently I have had to
+            resort to some hacks to get data converted to Date or Time in Ruby.
+            If the column_name ends in _at (like created_at, updated_at) it's created as a Ruby Time. Else if the
+            hours/minutes/seconds are 0, I make it a Ruby Date. Else it's a Ruby Time.
+            This is nasty - but if you use Duck Typing you'll probably not care very much.
+            In 9i it's tempting to map DATE to Date and TIMESTAMP to Time but I don't think that is
+            valid - too many databases use DATE for both.
+            Timezones and sub-second precision on timestamps are not supported.
+        3.  Default values that are functions (such as "SYSDATE") are not supported. This is a
+            restriction of the way active record supports default values.
+        4.  Referential integrity constraints are not fully supported. Under at least
+            some circumstances, active record appears to delete parent and child records out of
+            sequence and out of transaction scope. (Or this may just be a problem of test setup.)
+
+    The OCI8 driver can be retrieved from http://rubyforge.org/projects/ruby-oci8/
+
+*   Added option :schema_order to the PostgreSQL adapter to support the use of multiple schemas per database #697 *YuriSchimke*
+
+*   Optimized the SQL used to generate has_and_belongs_to_many queries by listing the join table first #693 *yerejm*
+
+*   Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 *tonka*
+
+*   Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 *Nicholas Seckar*
+
+*   Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 *daniel@nightrunner.com*
+
+*   Added automatic dropping/creating of test tables for running the unit tests on all databases #587 *adelle@bullet.net.au*
+
+*   Fixed that find_by_* would fail when column names had numbers #670 *demetrius*
+
+*   Fixed the SQL Server adapter on a bunch of issues #667 *DeLynn*
+
+        1. Created a new columns method that is much cleaner.
+        2. Corrected a problem with the select and select_all methods
+           that didn't account for the LIMIT clause being passed into raw SQL statements.
+        3. Implemented the string_to_time method in order to create proper instances of the time class.
+        4. Added logic to the simplified_type method that allows the database to specify the scale of float data.
+        5. Adjusted the quote_column_name to account for the fact that MS SQL is bothered by a forward slash in the data string.
+
+*   Fixed that the dynamic finder like find_all_by_something_boolean(false) didn't work #649 *lmarlow*
+
+*   Added validates_each that validates each specified attribute against a block #610 [Jeremy Kemper]. Example:
+
+        class Person < ActiveRecord::Base
+          validates_each :first_name, :last_name do |record, attr|
+            record.errors.add attr, 'starts with z.' if attr[0] == ?z
+          end
+        end
+
+*   Added :allow_nil as an explicit option for validates_length_of, so unless that's set to true having the attribute as nil will also return an error if a range is specified as :within #610 *Jeremy Kemper*
+
+*   Added that validates_* now accept blocks to perform validations #618 [Tim Bates]. Example:
+
+        class Person < ActiveRecord::Base
+          validate { |person| person.errors.add("title", "will never be valid") if SHOULD_NEVER_BE_VALID }
+        end
+
+*   Addded validation for validate all the associated objects before declaring failure with validates_associated #618 *Tim Bates*
+
+*   Added keyword-style approach to defining the custom relational bindings #545 [Jamis Buck]. Example:
+
+        class Project < ActiveRecord::Base
+          primary_key "sysid"
+          table_name "XYZ_PROJECT"
+          inheritance_column { original_inheritance_column + "_id" }
+        end
+
+*   Fixed Base#clone for use with PostgreSQL #565 *hanson@surgery.wisc.edu*
+
+
+## 1.6.0 (January 25th, 2005) ##
+
+*   Added that has_many association build and create methods can take arrays of record data like Base#create and Base#build to build/create multiple records at once.
+
+*   Added that Base#delete and Base#destroy both can take an array of ids to delete/destroy #336
+
+*   Added the option of supplying an array of attributes to Base#create, so that multiple records can be created at once.
+
+*   Added the option of supplying an array of ids and attributes to Base#update, so that multiple records can be updated at once (inspired by #526/Duane Johnson). Example
+
+        people = { 1 => { "first_name" => "David" }, 2 => { "first_name" => "Jeremy"} }
+        Person.update(people.keys, people.values)
+
+*   Added ActiveRecord::Base.timestamps_gmt that can be set to true to make the automated timestamping use GMT instead of local time #520 *Scott Baron*
+
+*   Added that update_all calls sanitize_sql on its updates argument, so stuff like MyRecord.update_all(['time = ?', Time.now]) works #519 *notahat*
+
+*   Fixed that the dynamic finders didn't treat nil as a "IS NULL" but rather "= NULL" case #515 *Demetrius*
+
+*   Added bind-named arrays for interpolating a group of ids or strings in conditions #528 *Jeremy Kemper*
+
+*   Added that has_and_belongs_to_many associations with additional attributes also can be created between unsaved objects and only committed to the database when Base#save is called on the associator #524 *Eric Anderson*
+
+*   Fixed that records fetched with piggy-back attributes or through rich has_and_belongs_to_many associations couldn't be saved due to the extra attributes not part of the table #522 *Eric Anderson*
+
+*   Added mass-assignment protection for the inheritance column -- regardless of a custom column is used or not
+
+*   Fixed that association proxies would fail === tests like PremiumSubscription === @account.subscription
+
+*   Fixed that column aliases didn't work as expected with the new MySql411 driver #507 *Demetrius*
+
+*   Fixed that find_all would produce invalid sql when called sequentialy #490 *Scott Baron*
+
+
+## 1.5.1 (January 18th, 2005) ##
+
+*   Fixed that the belongs_to and has_one proxy would fail a test like 'if project.manager' -- this unfortunately also means that you can't call methods like project.manager.build unless there already is a manager on the project #492 *Tim Bates*
+
+*   Fixed that the Ruby/MySQL adapter wouldn't connect if the password was empty #503 *Pelle*
+
+
+## 1.5.0 (January 17th, 2005) ##
+
+*   Fixed that unit tests for MySQL are now run as the "rails" user instead of root #455 *Eric Hodel*
+
+*   Added validates_associated that enables validation of objects in an unsaved association #398 [Tim Bates]. Example:
+
+        class Book < ActiveRecord::Base
+          has_many :pages
+          belongs_to :library
+
+          validates_associated :pages, :library
+        end
+
+*   Added support for associating unsaved objects #402 [Tim Bates]. Rules that govern this addition:
+
+        == Unsaved objects and associations
+
+        You can manipulate objects and associations before they are saved to the database, but there is some special behaviour you should be
+        aware of, mostly involving the saving of associated objects.
+
+        === One-to-one associations
+
+        * Assigning an object to a has_one association automatically saves that object, and the object being replaced (if there is one), in
+          order to update their primary keys - except if the parent object is unsaved (new_record? == true).
+        * If either of these saves fail (due to one of the objects being invalid) the assignment statement returns false and the assignment
+          is cancelled.
+        * If you wish to assign an object to a has_one association without saving it, use the #association.build method (documented below).
+        * Assigning an object to a belongs_to association does not save the object, since the foreign key field belongs on the parent. It does
+          not save the parent either.
+
+        === Collections
+
+        * Adding an object to a collection (has_many or has_and_belongs_to_many) automatically saves that object, except if the parent object
+          (the owner of the collection) is not yet stored in the database.
+        * If saving any of the objects being added to a collection (via #push or similar) fails, then #push returns false.
+        * You can add an object to a collection without automatically saving it by using the #collection.build method (documented below).
+        * All unsaved (new_record? == true) members of the collection are automatically saved when the parent is saved.
+
+*   Added replace to associations, so you can do project.manager.replace(new_manager) or project.milestones.replace(new_milestones) #402 *Tim Bates*
+
+*   Added build and create methods to has_one and belongs_to associations, so you can now do project.manager.build(attributes) #402 *Tim Bates*
+
+*   Added that if a before_* callback returns false, all the later callbacks and the associated action are cancelled. If an after_* callback returns false, all the later callbacks are cancelled. Callbacks are generally run in the order they are defined, with the exception of callbacks defined as methods on the model, which are called last. #402 *Tim Bates*
+
+*   Fixed that Base#== wouldn't work for multiple references to the same unsaved object #402 *Tim Bates*
+
+*   Fixed binary support for PostgreSQL #444 *alex@byzantine.no*
+
+*   Added a differenciation between AssociationCollection#size and -length. Now AssociationCollection#size returns the size of the
+    collection by executing a SELECT COUNT(*) query if the collection hasn't been loaded and calling collection.size if it has. If
+    it's more likely than not that the collection does have a size larger than zero and you need to fetch that collection afterwards,
+    it'll take one less SELECT query if you use length.
+
+*   Added Base#attributes that returns a hash of all the attributes with their names as keys and clones of their objects as values #433 *atyp.de*
+
+*   Fixed that foreign keys named the same as the association would cause stack overflow #437 *Eric Anderson*
+
+*   Fixed default scope of acts_as_list from "1" to "1 = 1", so it'll work in PostgreSQL (among other places) #427 *Alexey*
+
+*   Added Base#reload that reloads the attributes of an object from the database #422 *Andreas Schwarz*
+
+*   Added SQLite3 compatibility through the sqlite3-ruby adapter by Jamis Buck #381 *Jeremy Kemper*
+
+*   Added support for the new protocol spoken by MySQL 4.1.1+ servers for the Ruby/MySQL adapter that ships with Rails #440 *Matt Mower*
+
+*   Added that Observers can use the observes class method instead of overwriting self.observed_class().
+
+        Before:
+          class ListSweeper < ActiveRecord::Base
+            def self.observed_class() [ List, Item ]
+          end
+
+        After:
+          class ListSweeper < ActiveRecord::Base
+            observes List, Item
+          end
+
+*   Fixed that conditions in has_many and has_and_belongs_to_many should be interpolated just like the finder_sql is
+
+*   Fixed Base#update_attribute to be indifferent to whether a string or symbol is used to describe the name
+
+*   Added Base#toggle(attribute) and Base#toggle!(attribute) that makes it easier to flip a switch or flag.
+
+        Before: topic.update_attribute(:approved, !approved?)
+        After : topic.toggle!(:approved)
+
+*   Added Base#increment!(attribute) and Base#decrement!(attribute) that also saves the records. Example:
+
+        page.views # => 1
+        page.increment!(:views) # executes an UPDATE statement
+        page.views # => 2
+
+        page.increment(:views).increment!(:views)
+        page.views # => 4
+
+*   Added Base#increment(attribute) and Base#decrement(attribute) that encapsulates the += 1 and -= 1 patterns.
+
+
+## 1.4.0 (January 4th, 2005) ##
+
+*   Added automated optimistic locking if the field <tt>lock_version</tt> is present.  Each update to the
+    record increments the lock_version column and the locking facilities ensure that records instantiated twice
+    will let the last one saved raise a StaleObjectError if the first was also updated. Example:
+
+        p1 = Person.find(1)
+        p2 = Person.find(1)
+
+        p1.first_name = "Michael"
+        p1.save
+
+        p2.first_name = "should fail"
+        p2.save # Raises a ActiveRecord::StaleObjectError
+
+    You're then responsible for dealing with the conflict by rescuing the exception and either rolling back, merging,
+    or otherwise apply the business logic needed to resolve the conflict.
+
+    \#384 *Michael Koziarski*
+
+*   Added dynamic attribute-based finders as a cleaner way of getting objects by simple queries without turning to SQL.
+    They work by appending the name of an attribute to <tt>find_by_</tt>, so you get finders like <tt>Person.find_by_user_name,
+    Payment.find_by_transaction_id</tt>. So instead of writing <tt>Person.find_first(["user_name = ?", user_name])</tt>, you just do
+    <tt>Person.find_by_user_name(user_name)</tt>.
+
+    It's also possible to use multiple attributes in the same find by separating them with "_and_", so you get finders like
+    <tt>Person.find_by_user_name_and_password</tt> or even <tt>Payment.find_by_purchaser_and_state_and_country</tt>. So instead of writing
+    <tt>Person.find_first(["user_name = ? AND password = ?", user_name, password])</tt>, you just do
+    <tt>Person.find_by_user_name_and_password(user_name, password)</tt>.
+
+    While primarily a construct for easier find_firsts, it can also be used as a construct for find_all by using calls like
+    <tt>Payment.find_all_by_amount(50)</tt> that is turned into <tt>Payment.find_all(["amount = ?", 50])</tt>. This is something not as equally useful,
+    though, as it's not possible to specify the order in which the objects are returned.
+
+*   Added block-style for callbacks #332 [Jeremy Kemper].
+
+        Before:
+          before_destroy(Proc.new{ |record| Person.destroy_all "firm_id = #{record.id}" })
+
+        After:
+          before_destroy { |record| Person.destroy_all "firm_id = #{record.id}" }
+
+*   Added :counter_cache option to acts_as_tree that works just like the one you can define on belongs_to #371 *Josh Peek*
+
+*   Added Base.default_timezone accessor that determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling dates
+    and times from the database. This is set to :local by default.
+
+*   Added the possibility for adapters to overwrite add_limit! to implement a different limiting scheme than "LIMIT X" used by MySQL, PostgreSQL, and SQLite.
+
+*   Added the possibility of having objects with acts_as_list created before their scope is available or...
+
+*   Added a db2 adapter that only depends on the Ruby/DB2 bindings (http://raa.ruby-lang.org/project/ruby-db2/) #386 *Maik Schmidt*
+
+*   Added the final touches to the Microsoft SQL Server adapter by Joey Gibson that makes it suitable for actual use #394 *DeLynn Barry*
+
+*   Added that Base#find takes an optional options hash, including :conditions. Base#find_on_conditions deprecated in favor of #find with :conditions #407 *Jeremy Kemper*
+
+*   Added HasManyAssociation#count that works like Base#count #413 *intinig*
+
+*   Fixed handling of binary content in blobs and similar fields for Ruby/MySQL and SQLite #409 *xal*
+
+*   Fixed a bug in the Ruby/MySQL that caused binary content to be escaped badly and come back mangled #405 *Tobias Lütke*
+
+*   Fixed that the const_missing autoload assumes the requested constant is set by require_association and calls const_get to retrieve it.
+    If require_association did not set the constant then const_get will call const_missing, resulting in an infinite loop #380 *Jeremy Kemper*
+
+*   Fixed broken transactions that were actually only running object-level and not db level transactions *andreas*
+
+*   Fixed that validates_uniqueness_of used 'id' instead of defined primary key #406
+
+*   Fixed that the overwritten respond_to? method didn't take two parameters like the original #391
+
+*   Fixed quoting in validates_format_of that would allow some rules to pass regardless of input #390 *Dmitry V. Sabanin*
+
+
+## 1.3.0 (December 23, 2004) ##
+
+*   Added a require_association hook on const_missing that makes it possible to use any model class without requiring it first. This makes STI look like:
+
+        before:
+          require_association 'person'
+          class Employee < Person
+          end
+
+        after:
+          class Employee < Person
+          end
+
+    This also reduces the usefulness of Controller.model in Action Pack to currently only being for documentation purposes.
+
+*   Added that Base.update_all and Base.delete_all return an integer of the number of affected rows #341
+
+*   Added scope option to validation_uniqueness #349 *Kent Sibilev*
+
+*   Added respondence to *_before_type_cast for all attributes to return their string-state before they were type casted by the column type.
+    This is helpful for getting "100,000" back on a integer-based validation where the value would normally be "100".
+
+*   Added allow_nil options to validates_inclusion_of so that validation is only triggered if the attribute is not nil *what-a-day*
+
+*   Added work-around for PostgreSQL and the problem of getting fixtures to be created from id 1 on each test case.
+    This only works for auto-incrementing primary keys called "id" for now #359 *Scott Baron*
+
+*   Added Base#clear_association_cache to empty all the cached associations #347 *Tobias Lütke*
+
+*   Added more informative exceptions in establish_connection #356 *Jeremy Kemper*
+
+*   Added Base#update_attributes that'll accept a hash of attributes and save the record (returning true if it passed validation, false otherwise).
+
+        Before:
+          person.attributes = @params["person"]
+          person.save
+
+        Now:
+          person.update_attributes(@params["person"])
+
+*   Added Base.destroy and Base.delete to remove records without holding a reference to them first.
+
+*   Added that query benchmarking will only happen if its going to be logged anyway #344
+
+*   Added higher_item and lower_item as public methods for acts_as_list #342 *Tobias Lütke*
+
+*   Fixed that options[:counter_sql] was overwritten with interpolated sql rather than original sql #355 *Jeremy Kemper*
+
+*   Fixed that overriding an attribute's accessor would be disregarded by add_on_empty and add_on_boundary_breaking because they simply used
+    the attributes[] hash instead of checking for @base.respond_to?(attr.to_s). *Marten*
+
+*   Fixed that Base.table_name would expect a parameter when used in has_and_belongs_to_many joins *Anna Lissa Cruz*
+
+*   Fixed that nested transactions now work by letting the outer most transaction have the responsibilty of starting and rolling back the transaction.
+    If any of the inner transactions swallow the exception raised, though, the transaction will not be rolled back. So always let the transaction
+    bubble up even when you've dealt with local issues. Closes #231 and #340.
+
+*   Fixed validates_{confirmation,acceptance}_of to only happen when the virtual attributes are not nil #348 *dpiddy@gmail.com*
+
+*   Changed the interface on AbstractAdapter to require that adapters return the number of affected rows on delete and update operations.
+
+*   Fixed the automated timestamping feature when running under Rails' development environment that resets the inheritable attributes on each request.
+
+
+
+## 1.2.0 ##
+
+*   Added Base.validates_inclusion_of that validates whether the value of the specified attribute is available in a particular enumerable
+    object. *what-a-day*
+
+        class Person < ActiveRecord::Base
+          validates_inclusion_of :gender, :in=>%w( m f ), :message=>"woah! what are you then!??!!"
+          validates_inclusion_of :age, :in=>0..99
+        end
+
+*   Added acts_as_list that can decorates an existing class with methods like move_higher/lower, move_to_top/bottom. [Tobias Lütke] Example:
+
+        class TodoItem < ActiveRecord::Base
+          acts_as_list :scope => :todo_list_id
+          belongs_to :todo_list
+        end
+
+*   Added acts_as_tree that can decorates an existing class with a many to many relationship with itself. Perfect for categories in
+    categories and the likes. *Tobias Lütke*
+
+*   Added that Active Records will automatically record creation and/or update timestamps of database objects if fields of the names
+    created_at/created_on or updated_at/updated_on are present. *Tobias Lütke*
+
+*   Added Base.default_error_messages as a hash of all the error messages used in the validates_*_of so they can be changed in one place *Tobias Lütke*
+
+*   Added automatic transaction block around AssociationCollection.<<, AssociationCollection.delete, and AssociationCollection.destroy_all
+
+*   Fixed that Base#find will return an array if given an array -- regardless of the number of elements #270 *Marten*
+
+*   Fixed that has_and_belongs_to_many would generate bad sql when naming conventions differed from using vanilla "id" everywhere *RedTerror*
+
+*   Added a better exception for when a type column is used in a table without the intention of triggering single-table inheritance. Example:
+
+        ActiveRecord::SubclassNotFound: The single-table inheritance mechanism failed to locate the subclass: 'bad_class!'.
+        This error is raised because the column 'type' is reserved for storing the class in case of inheritance.
+        Please rename this column if you didn't intend it to be used for storing the inheritance class or
+        overwrite Company.inheritance_column to use another column for that information.
+
+*   Added that single-table inheritance will only kick in if the inheritance_column (by default "type") is present. Otherwise, inheritance won't
+    have any magic side effects.
+
+*   Added the possibility of marking fields as being in error without adding a message (using nil) to it that'll get displayed wth full_messages #208 *mjobin*
+
+*   Fixed Base.errors to be indifferent as to whether strings or symbols are used. Examples:
+
+        Before:
+          errors.add(:name, "must be shorter") if name.size > 10
+          errors.on(:name)  # => "must be shorter"
+          errors.on("name") # => nil
+
+        After:
+          errors.add(:name, "must be shorter") if name.size > 10
+          errors.on(:name)  # => "must be shorter"
+          errors.on("name") # => "must be shorter"
+
+*   Added Base.validates_format_of that Validates whether the value of the specified attribute is of the correct form by matching
+    it against the regular expression provided. *Marcel Molina Jr.*
+
+        class Person < ActiveRecord::Base
+          validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/, :on => :create
+        end
+
+*   Added Base.validates_length_of that delegates to add_on_boundary_breaking #312 [Tobias Lütke]. Example:
+
+        Validates that the specified attribute matches the length restrictions supplied in either:
+
+          - configuration[:minimum]
+          - configuration[:maximum]
+          - configuration[:is]
+          - configuration[:within] (aka. configuration[:in])
+
+        Only one option can be used at a time.
+
+          class Person < ActiveRecord::Base
+            validates_length_of :first_name, :maximum=>30
+            validates_length_of :last_name, :maximum=>30, :message=>"less than %d if you don't mind"
+            validates_length_of :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name"
+            validates_length_of :fav_bra_size, :minimum=>1, :too_short=>"please enter at least %d character"
+            validates_length_of :smurf_leader, :is=>4, :message=>"papa is spelled with %d characters... don't play me."
+          end
+
+*   Added Base.validate_presence as an alternative to implementing validate and doing errors.add_on_empty yourself.
+
+*   Added Base.validates_uniqueness_of that alidates whether the value of the specified attributes are unique across the system.
+    Useful for making sure that only one user can be named "davidhh".
+
+        class Person < ActiveRecord::Base
+          validates_uniqueness_of :user_name
+        end
+
+    When the record is created, a check is performed to make sure that no record exist in the database with the given value for the specified
+    attribute (that maps to a column). When the record is updated, the same check is made but disregarding the record itself.
+
+
+*   Added Base.validates_confirmation_of that encapsulates the pattern of wanting to validate a password or email address field with a confirmation. Example:
+
+         Model:
+           class Person < ActiveRecord::Base
+             validates_confirmation_of :password
+           end
+
+         View:
+           <%= password_field "person", "password" %>
+           <%= password_field "person", "password_confirmation" %>
+
+     The person has to already have a password attribute (a column in the people table), but the password_confirmation is virtual.
+     It exists only as an in-memory variable for validating the password. This check is performed both on create and update.
+
+
+*   Added Base.validates_acceptance_of that encapsulates the pattern of wanting to validate the acceptance of a terms of service check box (or similar agreement). Example:
+
+     class Person < ActiveRecord::Base
+         validates_acceptance_of :terms_of_service
+     end
+
+    The terms_of_service attribute is entirely virtual. No database column is needed. This check is performed both on create and update.
+
+    NOTE: The agreement is considered valid if it's set to the string "1". This makes it easy to relate it to an HTML checkbox.
+
+
+*   Added validation macros to make the stackable just like the life cycle callbacks. Examples:
+
+        class Person < ActiveRecord::Base
+          validate { |record| record.errors.add("name", "too short") unless name.size > 10 }
+          validate { |record| record.errors.add("name", "too long")  unless name.size < 20 }
+          validate_on_create :validate_password
+
+          private
+            def validate_password
+              errors.add("password", "too short") unless password.size > 6
+            end
+        end
+
+*   Added the option for sanitizing find_by_sql and the offset parts in regular finds [Sam Stephenson]. Examples:
+
+        Project.find_all ["category = ?", category_name], "created ASC", ["? OFFSET ?", 15, 20]
+        Post.find_by_sql ["SELECT * FROM posts WHERE author = ? AND created > ?", author_id, start_date]
+
+*   Fixed value quoting in all generated SQL statements, so that integers are not surrounded in quotes and that all sanitation are happening
+    through the database's own quoting routine. This should hopefully make it lots easier for new adapters that doesn't accept '1' for integer
+    columns.
+
+*   Fixed has_and_belongs_to_many guessing of foreign key so that keys are generated correctly for models like SomeVerySpecialClient
+    *Florian Weber*
+
+*   Added counter_sql option for has_many associations [Jeremy Kemper]. Documentation:
+
+        <tt>:counter_sql</tt> - specify a complete SQL statement to fetch the size of the association. If +:finder_sql+ is
+        specified but +:counter_sql+, +:counter_sql+ will be generated by replacing SELECT ... FROM with SELECT COUNT(*) FROM.
+
+*   Fixed that methods wrapped in callbacks still return their original result #260 *Jeremy Kemper*
+
+*   Fixed the Inflector to handle the movie/movies pair correctly #261 *Scott Baron*
+
+*   Added named bind-style variable interpolation #281 [Michael Koziarski]. Example:
+
+        Person.find(["id = :id and first_name = :first_name", { :id => 5, :first_name = "bob' or 1=1" }])
+
+*   Added bind-style variable interpolation for the condition arrays that uses the adapter's quote method *Michael Koziarski*
+
+    Before:
+        find_first([ "user_name = '%s' AND password = '%s'", user_name, password ])]
+        find_first([ "firm_id = %s", firm_id ])] # unsafe!
+
+    After:
+        find_first([ "user_name = ? AND password = ?", user_name, password ])]
+        find_first([ "firm_id = ?", firm_id ])]
+
+*   Added CSV format for fixtures #272 [what-a-day]. (See the new and expanded documentation on fixtures for more information)
+
+*   Fixed fixtures using primary key fields called something else than "id" *dave*
+
+*   Added proper handling of time fields that are turned into Time objects with the dummy date of 2000/1/1 *HariSeldon*
+
+*   Added reverse order of deleting fixtures, so referential keys can be maintained #247 *Tim Bates*
+
+*   Added relative path search for sqlite dbfiles in database.yml (if RAILS_ROOT is defined) #233 *Jeremy Kemper*
+
+*   Added option to establish_connection where you'll be able to leave out the parameter to have it use the RAILS_ENV environment variable
+
+*   Fixed problems with primary keys and postgresql sequences (#230) *Tim Bates*
+
+*   Added reloading for associations 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 ActiveRecord::Base.reload_dependencies = false in production environments.
+
+    NOTE: This will only have an effect if you let the associations manage the requiring of model classes. All libraries loaded through
+    require will be "forever" cached. You can, however, use ActiveRecord::Base.load_or_require("library") to get this behavior outside of the
+    auto-loading associations.
+
+*   Added ERB capabilities to the fixture files for dynamic fixture generation. You don't need to do anything, just include ERB blocks like:
+
+        david:
+          id: 1
+          name: David
+
+        jamis:
+          id: 2
+          name: Jamis
+
+        <% for digit in 3..10 %>
+        dev_<%= digit %>:
+          id: <%= digit %>
+          name: fixture_<%= digit %>
+        <% end %>
+
+*   Changed the yaml fixture searcher to look in the root of the fixtures directory, so when you before could have something like:
+
+        fixtures/developers/fixtures.yaml
+        fixtures/accounts/fixtures.yaml
+
+    ...you now need to do:
+
+        fixtures/developers.yaml
+        fixtures/accounts.yaml
+
+*   Changed the fixture format from:
+
+        name: david
+        data:
+         id: 1
+         name: David Heinemeier Hansson
+         birthday: 1979-10-15
+         profession: Systems development
+        ---
+        name: steve
+        data:
+         id: 2
+         name: Steve Ross Kellock
+         birthday: 1974-09-27
+         profession: guy with keyboard
+
+    ...to:
+
+        david:
+         id: 1
+         name: David Heinemeier Hansson
+         birthday: 1979-10-15
+         profession: Systems development
+
+        steve:
+         id: 2
+         name: Steve Ross Kellock
+         birthday: 1974-09-27
+         profession: guy with keyboard
+
+    The change is NOT backwards compatible. Fixtures written in the old YAML style needs to be rewritten!
+
+*   All associations will now attempt to require the classes that they associate to. Relieving the need for most explicit 'require' statements.
+
+
+## 1.1.0 (34) ##
+
+*   Added automatic fixture setup and instance variable availability. Fixtures can also be automatically
+    instantiated in instance variables relating to their names using the following style:
+
+        class FixturesTest < Test::Unit::TestCase
+          fixtures :developers # you can add more with comma separation
+
+          def test_developers
+            assert_equal 3, @developers.size # the container for all the fixtures is automatically set
+            assert_kind_of Developer, @david # works like @developers["david"].find
+            assert_equal "David Heinemeier Hansson", @david.name
+          end
+        end
+
+*   Added HasAndBelongsToManyAssociation#push_with_attributes(object, join_attributes) that can create associations in the join table with additional
+    attributes. This is really useful when you have information that's only relevant to the join itself, such as a "added_on" column for an association
+    between post and category. The added attributes will automatically be injected into objects retrieved through the association similar to the piggy-back
+    approach:
+
+        post.categories.push_with_attributes(category, :added_on => Date.today)
+        post.categories.first.added_on # => Date.today
+
+    NOTE: The categories table doesn't have a added_on column, it's the categories_post join table that does!
+
+*   Fixed that :exclusively_dependent and :dependent can't be activated at the same time on has_many associations *Jeremy Kemper*
+
+*   Fixed that database passwords couldn't be all numeric *Jeremy Kemper*
+
+*   Fixed that calling id would create the instance variable for new_records preventing them from being saved correctly *Jeremy Kemper*
+
+*   Added sanitization feature to HasManyAssociation#find_all so it works just like Base.find_all *Sam Stephenson/Jeremy Kemper*
+
+*   Added that you can pass overlapping ids to find without getting duplicated records back *Jeremy Kemper*
+
+*   Added that Base.benchmark returns the result of the block *Jeremy Kemper*
+
+*   Fixed problem with unit tests on Windows with SQLite *paterno*
+
+*   Fixed that quotes would break regular non-yaml fixtures *Dmitry Sabanin/daft*
+
+*   Fixed fixtures on windows with line endings cause problems under unix / mac *Tobias Lütke*
+
+*   Added HasAndBelongsToManyAssociation#find(id) that'll search inside the collection and find the object or record with that id
+
+*   Added :conditions option to has_and_belongs_to_many that works just like the one on all the other associations
+
+*   Added AssociationCollection#clear to remove all associations from has_many and has_and_belongs_to_many associations without destroying the records *geech*
+
+*   Added type-checking and remove in 1-instead-of-N sql statements to AssociationCollection#delete *geech*
+
+*   Added a return of self to AssociationCollection#<< so appending can be chained, like project << Milestone.create << Milestone.create *geech*
+
+*   Added Base#hash and Base#eql? which means that all of the equality using features of array and other containers now works:
+
+        [ Person.find(1), Person.find(2), Person.find(3) ] & [ Person.find(1), Person.find(4) ] # => [ Person.find(1) ]
+
+*   Added :uniq as an option to has_and_belongs_to_many which will automatically ensure that AssociateCollection#uniq is called
+    before pulling records out of the association. This is especially useful for three-way (and above) has_and_belongs_to_many associations.
+
+*   Added AssociateCollection#uniq which is especially useful for has_and_belongs_to_many associations that can include duplicates,
+    which is common on associations that also use metadata. Usage: post.categories.uniq
+
+*   Fixed respond_to? to use a subclass specific hash instead of an Active Record-wide one
+
+*   Fixed has_and_belongs_to_many to treat associations between classes in modules properly *Florian Weber*
+
+*   Added a NoMethod exception to be raised when query and writer methods are called for attributes that doesn't exist *geech*
+
+*   Added a more robust version of Fixtures that throws meaningful errors when on formatting issues *geech*
+
+*   Added Base#transaction as a compliment to Base.transaction for prettier use in instance methods *geech*
+
+*   Improved the speed of respond_to? by placing the dynamic methods lookup table in a hash *geech*
+
+*   Added that any additional fields added to the join table in a has_and_belongs_to_many association
+    will be placed as attributes when pulling records out through has_and_belongs_to_many associations.
+    This is helpful when have information about the association itself that you want available on retrival.
+
+*   Added better loading exception catching and RubyGems retries to the database adapters *alexeyv*
+
+*   Fixed bug with per-model transactions *daniel*
+
+*   Fixed Base#transaction so that it returns the result of the last expression in the transaction block *alexeyv*
+
+*   Added Fixture#find to find the record corresponding to the fixture id. The record
+    class name is guessed by using Inflector#classify (also new) on the fixture directory name.
+
+        Before: Document.find(@documents["first"]["id"])
+        After : @documents["first"].find
+
+*   Fixed that the table name part of column names ("TABLE.COLUMN") wasn't removed properly *Andreas Schwarz*
+
+*   Fixed a bug with Base#size when a finder_sql was used that didn't capitalize SELECT and FROM *geech*
+
+*   Fixed quoting problems on SQLite by adding quote_string to the AbstractAdapter that can be overwritten by the concrete
+    adapters for a call to the dbm. *Andreas Schwarz*
+
+*   Removed RubyGems backup strategy for requiring SQLite-adapter -- if people want to use gems, they're already doing it with AR.
+
+
+## 1.0.0 (35) ##
+
+*   Added OO-style associations methods [Florian Weber]. Examples:
+
+        Project#milestones_count       => Project#milestones.size
+        Project#build_to_milestones    => Project#milestones.build
+        Project#create_for_milestones  => Project#milestones.create
+        Project#find_in_milestones     => Project#milestones.find
+        Project#find_all_in_milestones => Project#milestones.find_all
+
+*   Added serialize as a new class method to control when text attributes should be YAMLized or not. This means that automated
+    serialization of hashes, arrays, and so on WILL NO LONGER HAPPEN (#10). You need to do something like this:
+
+        class User < ActiveRecord::Base
+          serialize :settings
+        end
+
+    This will assume that settings is a text column and will now YAMLize any object put in that attribute. You can also specify
+    an optional :class_name option that'll raise an exception if a serialized object is retrieved as a descendant of a class not in
+    the hierarchy. Example:
+
+        class User < ActiveRecord::Base
+          serialize :settings, :class_name => "Hash"
+        end
+
+        user = User.create("settings" => %w( one two three ))
+        User.find(user.id).settings # => raises SerializationTypeMismatch
+
+*   Added the option to connect to a different database for one model at a time. Just call establish_connection on the class
+    you want to have connected to another database than Base. This will automatically also connect decendents of that class
+    to the different database [Renald Buter].
+
+*   Added transactional protection for Base#save. Validations can now check for values knowing that it happens in a transaction and callbacks
+    can raise exceptions knowing that the save will be rolled back. *Suggested by Alexey Verkhovsky*
+
+*   Added column name quoting so reserved words, such as "references", can be used as column names *Ryan Platte*
+
+*   Added the possibility to chain the return of what happened inside a logged block [geech]:
+
+        This now works:
+          log { ... }.map { ... }
+
+        Instead of doing:
+          result = []
+          log { result = ... }
+          result.map { ... }
+
+*   Added "socket" option for the MySQL adapter, so you can change it to something else than "/tmp/mysql.sock" *Anna Lissa Cruz*
+
+*   Added respond_to? answers for all the attribute methods. So if Person has a name attribute retrieved from the table schema,
+    person.respond_to? "name" will return true.
+
+*   Added Base.benchmark which can be used to aggregate logging and benchmark, so you can measure and represent multiple statements in a single block.
+    Usage (hides all the SQL calls for the individual actions and calculates total runtime for them all):
+
+        Project.benchmark("Creating project") do
+          project = Project.create("name" => "stuff")
+          project.create_manager("name" => "David")
+          project.milestones << Milestone.find_all
+        end
+
+*   Added logging of invalid SQL statements *Daniel Von Fange*
+
+*   Added alias Errors#[] for Errors#on, so you can now say person.errors["name"] to retrieve the errors for name *Andreas Schwarz*
+
+*   Added RubyGems require attempt if sqlite-ruby is not available through regular methods.
+
+*   Added compatibility with 2.x series of sqlite-ruby drivers. *Jamis Buck*
+
+*   Added type safety for association assignments, so a ActiveRecord::AssociationTypeMismatch will be raised if you attempt to
+    assign an object that's not of the associated class. This cures the problem with nil giving id = 4 and fixnums giving id = 1 on
+    mistaken association assignments. *Reported by Andreas Schwarz*
+
+*   Added the option to keep many fixtures in one single YAML document *what-a-day*
+
+*   Added the class method "inheritance_column" that can be overwritten to return the name of an alternative column than "type" for storing
+    the type for inheritance hierarchies. *Dave Steinberg*
+
+*   Added [] and []= as an alternative way to access attributes when the regular methods have been overwritten *Dave Steinberg*
+
+*   Added the option to observer more than one class at the time by specifying observed_class as an array
+
+*   Added auto-id propagation support for tables with arbitrary primary keys that have autogenerated sequences associated with them
+    on PostgreSQL. *Dave Steinberg*
+
+*   Changed that integer and floats set to "" through attributes= remain as NULL. This was especially a problem for scaffolding and postgresql. (#49)
+
+*   Changed the MySQL Adapter to rely on MySQL for its defaults for socket, host, and port *Andreas Schwarz*
+
+*   Changed ActionControllerError to decent from StandardError instead of Exception. It can now be caught by a generic rescue.
+
+*   Changed class inheritable attributes to not use eval *Caio Chassot*
+
+*   Changed Errors#add to now use "invalid" as the default message instead of true, which means full_messages work with those *Marcel Molina Jr.*
+
+*   Fixed spelling on Base#add_on_boundry_breaking to Base#add_on_boundary_breaking (old naming still works) *Marcel Molina Jr.*
+
+*   Fixed that entries in the has_and_belongs_to_many join table didn't get removed when an associated object was destroyed.
+
+*   Fixed unnecessary calls to SET AUTOCOMMIT=0/1 for MySQL adapter *Andreas Schwarz*
+
+*   Fixed PostgreSQL defaults are now handled gracefully *Dave Steinberg*
+
+*   Fixed increment/decrement_counter are now atomic updates *Andreas Schwarz*
+
+*   Fixed the problems the Inflector had turning Attachment into attuchments and Cases into Casis *radsaq/Florian Gross*
+
+*   Fixed that cloned records would point attribute references on the parent object *Andreas Schwarz*
+
+*   Fixed SQL for type call on inheritance hierarchies *Caio Chassot*
+
+*   Fixed bug with typed inheritance *Florian Weber*
+
+*   Fixed a bug where has_many collection_count wouldn't use the conditions specified for that association
+
+
+## 0.9.5 ##
+
+*   Expanded the table_name guessing rules immensely [Florian Green]. Documentation:
+
+        Guesses the table name (in forced lower-case) based on the name of the class in the inheritance hierarchy descending
+        directly from ActiveRecord. So if the hierarchy looks like: Reply < Message < ActiveRecord, then Message is used
+        to guess the table name from even when called on Reply. The guessing rules are as follows:
+        * Class name ends in "x", "ch" or "ss": "es" is appended, so a Search class becomes a searches table.
+        * Class name ends in "y" preceded by a consonant or "qu": The "y" is replaced with "ies",
+          so a Category class becomes a categories table.
+        * Class name ends in "fe": The "fe" is replaced with "ves", so a Wife class becomes a wives table.
+        * Class name ends in "lf" or "rf": The "f" is replaced with "ves", so a Half class becomes a halves table.
+        * Class name ends in "person": The "person" is replaced with "people", so a Salesperson class becomes a salespeople table.
+        * Class name ends in "man": The "man" is replaced with "men", so a Spokesman class becomes a spokesmen table.
+        * Class name ends in "sis": The "i" is replaced with an "e", so a Basis class becomes a bases table.
+        * Class name ends in "tum" or "ium": The "um" is replaced with an "a", so a Datum class becomes a data table.
+        * Class name ends in "child": The "child" is replaced with "children", so a NodeChild class becomes a node_children table.
+        * Class name ends in an "s": No additional characters are added or removed.
+        * Class name doesn't end in "s": An "s" is appended, so a Comment class becomes a comments table.
+        * Class name with word compositions: Compositions are underscored, so CreditCard class becomes a credit_cards table.
+        Additionally, the class-level table_name_prefix is prepended to the table_name and the table_name_suffix is appended.
+        So if you have "myapp_" as a prefix, the table name guess for an Account class becomes "myapp_accounts".
+
+        You can also overwrite this class method to allow for unguessable links, such as a Mouse class with a link to a
+        "mice" table. Example:
+
+          class Mouse < ActiveRecord::Base
+             def self.table_name() "mice" end
+          end
+
+    This conversion is now done through an external class called Inflector residing in lib/active_record/support/inflector.rb.
+
+*   Added find_all_in_collection to has_many defined collections. Works like this:
+
+        class Firm < ActiveRecord::Base
+          has_many :clients
+        end
+
+        firm.id # => 1
+        firm.find_all_in_clients "revenue > 1000" # SELECT * FROM clients WHERE firm_id = 1 AND revenue > 1000
+
+    *Requested by Dave Thomas*
+
+*   Fixed finders for inheritance hierarchies deeper than one level *Florian Weber*
+
+*   Added add_on_boundry_breaking to errors to accompany add_on_empty as a default validation method. It's used like this:
+
+        class Person < ActiveRecord::Base
+          protected
+            def validation
+              errors.add_on_boundry_breaking "password", 3..20
+            end
+        end
+
+    This will add an error to the tune of "is too short (minimum is 3 characters)" or "is too long (minimum is 20 characters)" if
+    the password is outside the boundry. The messages can be changed by passing a third and forth parameter as message strings.
+
+*   Implemented a clone method that works properly with AR. It returns a clone of the record that
+    hasn't been assigned an id yet and is treated as a new record.
+
+*   Allow for domain sockets in PostgreSQL by not assuming localhost when no host is specified *Scott Barron*
+
+*   Fixed that bignums are saved properly instead of attempted to be YAMLized *Andreas Schwartz*
+
+*   Fixed a bug in the GEM where the rdoc options weren't being passed according to spec *Chad Fowler*
+
+*   Fixed a bug with the exclusively_dependent option for has_many
+
+
+## 0.9.4 ##
+
+*   Correctly guesses the primary key when the class is inside a module [Dave Steinberg].
+
+*   Added [] and []= as alternatives to read_attribute and write_attribute *Dave Steinberg*
+
+*   has_and_belongs_to_many now accepts an :order key to determine in which order the collection is returned [radsaq].
+
+*   The ids passed to find and find_on_conditions are now automatically sanitized.
+
+*   Added escaping of plings in YAML content.
+
+*   Multi-parameter assigns where all the parameters are empty will now be set to nil instead of a new instance of their class.
+
+*   Proper type within an inheritance hierarchy is now ensured already at object initialization (instead of first at create)
+
+
+## 0.9.3 ##
+
+*   Fixed bug with using a different primary key name together with has_and_belongs_to_many *Investigation by Scott*
+
+*   Added :exclusively_dependent option to the has_many association macro. The doc reads:
+
+        If set to true all the associated object are deleted in one SQL statement without having their
+        before_destroy callback run. This should only be used on associations that depend solely on
+        this class and don't need to do any clean-up in before_destroy. The upside is that it's much
+        faster, especially if there's a counter_cache involved.
+
+*   Added :port key to connection options, so the PostgreSQL and MySQL adapters can connect to a database server
+    running on another port than the default.
+
+*   Converted the new natural singleton methods that prevented AR objects from being saved by PStore
+    (and hence be placed in a Rails session) to a module. *Florian Weber*
+
+*   Fixed the use of floats (was broken since 0.9.0+)
+
+*   Fixed PostgreSQL adapter so default values are displayed properly when used in conjunction with
+    Action Pack scaffolding.
+
+*   Fixed booleans support for PostgreSQL (use real true/false on boolean fields instead of 0/1 on tinyints) *radsaq*
+
+
+## 0.9.2 ##
+
+*   Added static method for instantly updating a record
+
+*   Treat decimal and numeric as Ruby floats *Andreas Schwartz*
+
+*   Treat chars as Ruby strings (fixes problem for Action Pack form helpers too)
+
+*   Removed debugging output accidently left in (which would screw web applications)
+
+
+## 0.9.1 ##
+
+*   Added MIT license
+
+*   Added natural object-style assignment for has_and_belongs_to_many associations. Consider the following model:
+
+        class Event < ActiveRecord::Base
+          has_one_and_belongs_to_many :sponsors
+        end
+
+        class Sponsor < ActiveRecord::Base
+          has_one_and_belongs_to_many :sponsors
+        end
+
+    Earlier, you'd have to use synthetic methods for creating associations between two objects of the above class:
+
+        roskilde_festival.add_to_sponsors(carlsberg)
+        roskilde_festival.remove_from_sponsors(carlsberg)
+
+        nike.add_to_events(world_cup)
+        nike.remove_from_events(world_cup)
+
+    Now you can use regular array-styled methods:
+
+        roskilde_festival.sponsors << carlsberg
+        roskilde_festival.sponsors.delete(carlsberg)
+
+        nike.events << world_cup
+        nike.events.delete(world_cup)
+
+*   Added delete method for has_many associations. Using this will nullify an association between the has_many and the belonging
+    object by setting the foreign key to null. Consider this model:
+
+        class Post < ActiveRecord::Base
+          has_many :comments
+        end
+
+        class Comment < ActiveRecord::Base
+          belongs_to :post
+        end
+
+    You could do something like:
+
+        funny_comment.has_post? # => true
+        announcement.comments.delete(funny_comment)
+        funny_comment.has_post? # => false
+
+
+## 0.9.0 ##
+
+*   Active Record is now thread safe! (So you can use it with Cerise and WEBrick applications)
+    *Implementation idea by Michael Neumann, debugging assistance by Jamis Buck*
+
+*   Improved performance by roughly 400% on a basic test case of pulling 100 records and querying one attribute.
+    This brings the tax for using Active Record instead of "riding on the metal" (using MySQL-ruby C-driver directly) down to ~50%.
+    Done by doing lazy type conversions and caching column information on the class-level.
+
+*   Added callback objects and procs as options for implementing the target for callback macros.
+
+*   Added "counter_cache" option to belongs_to that automates the usage of increment_counter and decrement_counter. Consider:
+
+        class Post < ActiveRecord::Base
+          has_many :comments
+        end
+
+        class Comment < ActiveRecord::Base
+          belongs_to :post
+        end
+
+    Iterating over 100 posts like this:
+
+        <% for post in @posts %>
+          <%= post.title %> has <%= post.comments_count %> comments
+        <% end %>
+
+    Will generate 100 SQL count queries -- one for each call to post.comments_count. If you instead add a "comments_count" int column
+    to the posts table and rewrite the comments association macro with:
+
+        class Comment < ActiveRecord::Base
+          belongs_to :post, :counter_cache => true
+        end
+
+    Those 100 SQL count queries will be reduced to zero. Beware that counter caching is only appropriate for objects that begin life
+    with the object it's specified to belong with and is destroyed like that as well. Typically objects where you would also specify
+    :dependent => true. If your objects switch from one belonging to another (like a post that can be move from one category to another),
+    you'll have to manage the counter yourself.
+
+*   Added natural object-style assignment for has_one and belongs_to associations. Consider the following model:
+
+        class Project < ActiveRecord::Base
+          has_one :manager
+        end
+
+        class Manager < ActiveRecord::Base
+          belongs_to :project
+        end
+
+    Earlier, assignments would work like following regardless of which way the assignment told the best story:
+
+        active_record.manager_id = david.id
+
+    Now you can do it either from the belonging side:
+
+        david.project = active_record
+
+    ...or from the having side:
+
+        active_record.manager = david
+
+    If the assignment happens from the having side, the assigned object is automatically saved. So in the example above, the
+    project_id attribute on david would be set to the id of active_record, then david would be saved.
+
+*   Added natural object-style assignment for has_many associations [Florian Weber]. Consider the following model:
+
+        class Project < ActiveRecord::Base
+          has_many :milestones
+        end
+
+        class Milestone < ActiveRecord::Base
+          belongs_to :project
+        end
+
+    Earlier, assignments would work like following regardless of which way the assignment told the best story:
+
+        deadline.project_id = active_record.id
+
+    Now you can do it either from the belonging side:
+
+        deadline.project = active_record
+
+    ...or from the having side:
+
+        active_record.milestones << deadline
+
+    The milestone is automatically saved with the new foreign key.
+
+*   API CHANGE: Attributes for text (or blob or similar) columns will now have unknown classes stored using YAML instead of using
+    to_s. (Known classes that won't be yamelized are: String, NilClass, TrueClass, FalseClass, Fixnum, Date, and Time).
+    Likewise, data pulled out of text-based attributes will be attempted converged using Yaml if they have the "--- " header.
+    This was primarily done to be enable the storage of hashes and arrays without wrapping them in aggregations, so now you can do:
+
+        user = User.find(1)
+        user.preferences = { "background" => "black", "display" => large }
+        user.save
+
+        User.find(1).preferences # => { "background" => "black", "display" => large }
+
+    Please note that this method should only be used when you don't care about representing the object in proper columns in
+    the database. A money object consisting of an amount and a currency is still a much better fit for a value object done through
+    aggregations than this new option.
+
+*   POSSIBLE CODE BREAKAGE: As a consequence of the lazy type conversions, it's a bad idea to reference the @attributes hash
+    directly (it always was, but now it's paramount that you don't). If you do, you won't get the type conversion. So to implement
+    new accessors for existing attributes, use read_attribute(attr_name) and write_attribute(attr_name, value) instead. Like this:
+
+        class Song < ActiveRecord::Base
+          # Uses an integer of seconds to hold the length of the song
+
+          def length=(minutes)
+            write_attribute("length", minutes * 60)
+          end
+
+          def length
+            read_attribute("length") / 60
+          end
+        end
+
+    The clever kid will notice that this opens a door to sidestep the automated type conversion by using @attributes directly.
+    This is not recommended as read/write_attribute may be granted additional responsibilities in the future, but if you think
+    you know what you're doing and aren't afraid of future consequences, this is an option.
+
+*   Applied a few minor bug fixes reported by Daniel Von Fange.
+
+
+## 0.8.4 ##
+
+    _Reflection_
+*   Added ActiveRecord::Reflection with a bunch of methods and classes for reflecting in aggregations and associations.
+
+*   Added Base.columns and Base.content_columns which returns arrays of column description (type, default, etc) objects.
+
+*   Added Base#attribute_names which returns an array of names for the attributes available on the object.
+
+*   Added Base#column_for_attribute(name) which returns the column description object for the named attribute.
+
+
+    _Misc_
+*   Added multi-parameter assignment:
+
+        # Instantiate objects for all attribute classes that needs more than one constructor parameter. This is done
+        # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
+        # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
+        # written_on (a date type) with Date.new("2004", "6", "24"). You can also specify a typecast character in the
+        # parenteses to have the parameters typecasted before they're used in the constructor. Use i for Fixnum, f for Float,
+        # s for String, and a for Array.
+
+    This is incredibly useful for assigning dates from HTML drop-downs of month, year, and day.
+
+*   Fixed bug with custom primary key column name and Base.find on multiple parameters.
+
+*   Fixed bug with dependent option on has_one associations if there was no associated object.
+
+
+## 0.8.3 ##
+
+    _Transactions_
+*   Added transactional protection for destroy (important for the new :dependent option) *Suggested by Carl Youngblood*
+
+*   Fixed so transactions are ignored on MyISAM tables for MySQL (use InnoDB to get transactions)
+
+*   Changed transactions so only exceptions will cause a rollback, not returned false.
+
+
+    _Mapping_
+*   Added support for non-integer primary keys *Aredridel/earlier work by Michael Neumann*
+
+        User.find "jdoe"
+        Product.find "PDKEY-INT-12"
+
+*   Added option to specify naming method for primary key column. ActiveRecord::Base.primary_key_prefix_type can either
+    be set to nil, :table_name, or :table_name_with_underscore. :table_name will assume that Product class has a primary key
+    of "productid" and :table_name_with_underscore will assume "product_id". The default nil will just give "id".
+
+*   Added an overwriteable primary_key method that'll instruct AR to the name of the
+    id column *Aredridele/earlier work by Guan Yang*
+
+        class Project < ActiveRecord::Base
+          def self.primary_key() "project_id" end
+        end
+
+*   Fixed that Active Records can safely associate inside and out of modules.
+
+        class MyApplication::Account < ActiveRecord::Base
+          has_many :clients # will look for MyApplication::Client
+          has_many :interests, :class_name => "Business::Interest" # will look for Business::Interest
+        end
+
+*   Fixed that Active Records can safely live inside modules *Aredridel*
+
+        class MyApplication::Account < ActiveRecord::Base
+        end
+
+
+    _Misc_
+*   Added freeze call to value object assignments to ensure they remain immutable *Spotted by Gavin Sinclair*
+
+*   Changed interface for specifying observed class in observers. Was OBSERVED_CLASS constant, now is
+    observed_class() class method. This is more consistant with things like self.table_name(). Works like this:
+
+        class AuditObserver < ActiveRecord::Observer
+          def self.observed_class() Account end
+          def after_update(account)
+            AuditTrail.new(account, "UPDATED")
+          end
+        end
+
+    *Suggested by Gavin Sinclair*
+
+*   Create new Active Record objects by setting the attributes through a block. Like this:
+
+        person = Person.new do |p|
+          p.name = 'Freddy'
+          p.age  = 19
+        end
+
+    *Suggested by Gavin Sinclair*
+
+
+## 0.8.2 ##
+
+*   Added inheritable callback queues that can ensure that certain callback methods or inline fragments are
+    run throughout the entire inheritance hierarchy. Regardless of whether a descendant overwrites the callback
+    method:
+
+        class Topic < ActiveRecord::Base
+          before_destroy :destroy_author, 'puts "I'm an inline fragment"'
+        end
+
+    Learn more in link:classes/ActiveRecord/Callbacks.html
+
+*   Added :dependent option to has_many and has_one, which will automatically destroy associated objects when
+    the holder is destroyed:
+
+        class Album < ActiveRecord::Base
+          has_many :tracks, :dependent => true
+        end
+
+    All the associated tracks are destroyed when the album is.
+
+*   Added Base.create as a factory that'll create, save, and return a new object in one step.
+
+*   Automatically convert strings in config hashes to symbols for the _connection methods. This allows you
+    to pass the argument hashes directly from yaml. (Luke)
+
+*   Fixed the install.rb to include simple.rb *Spotted by Kevin Bullock*
+
+*   Modified block syntax to better follow our code standards outlined in
+    http://www.rubyonrails.org/CodingStandards
+
+
+## 0.8.1 ##
+
+*   Added object-level transactions *Austin Ziegler*
+
+*   Changed adapter-specific connection methods to use centralized ActiveRecord::Base.establish_connection,
+    which is parametized through a config hash with symbol keys instead of a regular parameter list.
+    This will allow for database connections to be opened in a more generic fashion. (Luke)
+
+    NOTE: This requires all *_connections to be updated! Read more in:
+    http://ar.rubyonrails.org/classes/ActiveRecord/Base.html#M000081
+
+*   Fixed SQLite adapter so objects fetched from has_and_belongs_to_many have proper attributes
+    (t.name is now name). *Spotted by Garrett Rooney*
+
+*   Fixed SQLite adapter so dates are returned as Date objects, not Time objects *Spotted by Gavin Sinclair*
+
+*   Fixed requirement of date class, so date conversions are succesful regardless of whether you
+    manually require date or not.
+
+
+## 0.8.0 ##
+
+*   Added transactions
+
+*   Changed Base.find to also accept either a list (1, 5, 6) or an array of ids ([5, 7])
+    as parameter and then return an array of objects instead of just an object
+
+*   Fixed method has_collection? for has_and_belongs_to_many macro to behave as a
+    collection, not an association
+
+*   Fixed SQLite adapter so empty or nil values in columns of datetime, date, or time type
+    aren't treated as current time *Spotted by Gavin Sinclair*
+
+
+## 0.7.6 ##
+
+*   Fixed the install.rb to create the lib/active_record/support directory *Spotted by Gavin Sinclair*
+*   Fixed that has_association? would always return true *Daniel Von Fange*
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
deleted file mode 100644
index bd496a1263..0000000000
--- a/activeresource/CHANGELOG
+++ /dev/null
@@ -1,337 +0,0 @@
-*Rails 3.2.0 (unreleased)*
-
-* Redirect responses: 303 See Other and 307 Temporary Redirect now behave like
-  301 Moved Permanently and 302 Found.  GH #3302.
-
-  [Jim Herz]
-
-
-*Rails 3.1.1 (October 7, 2011)*
-
-* No changes.
-
-
-*Rails 3.1.0 (August 30, 2011)*
-
-* The default format has been changed to JSON for all requests. If you want to continue to use XML you will need to set `self.format = :xml` in the class. eg.
-
-class User < ActiveResource::Base
-  self.format = :xml
-end
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* No changes.
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* No changes
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  [Santiago Pastorino]
-
-* Add support for errors in JSON format.  #1956 [Fabien Jakimowicz]
-
-* Recognizes 410 as Resource Gone. #2316 [Jordan Brough, Jatinder Singh]
-
-* More thorough SSL support.  #2370 [Roy Nicholson]
-
-* HTTP proxy support.  #2133 [Marshall Huss, Sébastien Dabet]
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* Nothing new, just included in 2.3.2
-
-
-*2.2.1 [RC2] (November 14th, 2008)*
-
-* Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything #525 [Paolo Angelini]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 [Rasik Pandey, Cody Fauser]
-
-* Add ActiveResource::Base.find(:last). [#754 state:resolved] (Adrian Mugnolo)
-
-* Fixed problems with the logger used if the logging string included %'s [#840 state:resolved] (Jamis Buck)
-
-* Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)
-
-
-*2.1.0 (May 31st, 2008)*
-
-* Fixed response logging to use length instead of the entire thing (seangeo) [#27]
-
-* Fixed that to_param should be used and honored instead of hardcoding the id #11406 [gspiers]
-
-* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
-
-* Use HEAD instead of GET in exists? [bscofield]
-
-* Fix small documentation typo.  Closes #10670 [Luca Guidi]
-
-* find_or_create_resource_for handles module nesting.  #10646 [xavier]
-
-* Allow setting ActiveResource::Base#format before #site.  [Rick Olson]
-
-* Support agnostic formats when calling custom methods.  Closes #10635 [joerichsen]
-
-* Document custom methods.  #10589 [Cheah Chu Yeow]
-
-* Ruby 1.9 compatibility.  [Jeremy Kemper]
-
-
-*2.0.2 (December 16th, 2007)*
-
-* Added more specific exceptions for 400, 401, and 403 (all descending from ClientError so existing rescues will work) #10326 [trek]
-
-* Correct empty response handling.  #10445 [seangeo]
-
-
-*2.0.1 (December 7th, 2007)*
-
-* Don't cache net/http object so that ActiveResource is more thread-safe.  Closes #10142 [kou]
-
-* Update XML documentation examples to include explicit type attributes. Closes #9754 [Josh Susser]
-
-* Added one-off declarations of mock behavior [David Heinemeier Hansson]. Example:
-
-    Before:
-      ActiveResource::HttpMock.respond_to do |mock|
-        mock.get "/people/1.xml", {}, "<person><name>David</name></person>"
-      end
-
-    Now:
-      ActiveResource::HttpMock.respond_to.get "/people/1.xml", {}, "<person><name>David</name></person>"
-
-* Added ActiveResource.format= which defaults to :xml but can also be set to :json [David Heinemeier Hansson]. Example:
-
-    class Person < ActiveResource::Base
-      self.site   = "http://app/"
-      self.format = :json
-    end
-
-    person = Person.find(1) # => GET http://app/people/1.json
-    person.name = "David"
-    person.save             # => PUT http://app/people/1.json {name: "David"}
-
-    Person.format = :xml
-    person.name = "Mary"
-    person.save             # => PUT http://app/people/1.json <person><name>Mary</name></person>
-
-* Fix reload error when path prefix is used.  #8727 [Ian Warshak]
-
-* Remove ActiveResource::Struct because it hasn't proven very useful. Creating a new ActiveResource::Base subclass is often less code and always clearer.  #8612 [Josh Peek]
-
-* Fix query methods on resources. [Cody Fauser]
-
-* pass the prefix_options to the instantiated record when using find without a specific id. Closes #8544 [Eloy Duran]
-
-* Recognize and raise an exception on 405 Method Not Allowed responses.  #7692 [Josh Peek]
-
-* Handle string and symbol param keys when splitting params into prefix params and query params.
-
-    Comment.find(:all, :params => { :article_id => 5, :page => 2 }) or Comment.find(:all, :params => { 'article_id' => 5, :page => 2 })
-
-* Added find-one with symbol [David Heinemeier Hansson]. Example: Person.find(:one, :from => :leader) # => GET /people/leader.xml
-
-* BACKWARDS INCOMPATIBLE: Changed the finder API to be more extensible with :params and more strict usage of scopes [David Heinemeier Hansson]. Changes:
-
-    Person.find(:all, :title => "CEO")      ...becomes: Person.find(:all, :params => { :title => "CEO" })
-    Person.find(:managers)                  ...becomes: Person.find(:all, :from => :managers)
-    Person.find("/companies/1/manager.xml") ...becomes: Person.find(:one, :from => "/companies/1/manager.xml")
-
-* Add support for setting custom headers per Active Resource model [Rick Olson]
-
-  class Project
-    headers['X-Token'] = 'foo'
-  end
-
-  # makes the GET request with the custom X-Token header
-  Project.find(:all)
-
-* Added find-by-path options to ActiveResource::Base.find [David Heinemeier Hansson]. Examples:
-
-    employees = Person.find(:all, :from => "/companies/1/people.xml") # => GET /companies/1/people.xml
-    manager   = Person.find("/companies/1/manager.xml")               # => GET /companies/1/manager.xml
-
-
-* Added support for using classes from within a single nested module [David Heinemeier Hansson]. Example:
-
-    module Highrise
-      class Note < ActiveResource::Base
-        self.site = "http://37s.sunrise.i:3000"
-      end
-
-      class Comment < ActiveResource::Base
-        self.site = "http://37s.sunrise.i:3000"
-      end
-    end
-
-  assert_kind_of Highrise::Comment, Note.find(1).comments.first
-
-
-* Added load_attributes_from_response as a way of loading attributes from other responses than just create [David Heinemeier Hansson]
-
-    class Highrise::Task < ActiveResource::Base
-      def complete
-        load_attributes_from_response(post(:complete))
-      end
-    end
-
-  ...will set "done_at" when complete is called.
-
-
-* Added support for calling custom methods #6979 [rwdaigle]
-
-    Person.find(:managers)    # => GET /people/managers.xml
-    Kase.find(1).post(:close) # => POST /kases/1/close.xml
-
-* Remove explicit prefix_options parameter for ActiveResource::Base#initialize. [Rick Olson]
-  ActiveResource splits the prefix_options from it automatically.
-
-* Allow ActiveResource::Base.delete with custom prefix. [Rick Olson]
-
-* Add ActiveResource::Base#dup [Rick Olson]
-
-* Fixed constant warning when fetching the same object multiple times [David Heinemeier Hansson]
-
-* Added that saves which get a body response (and not just a 201) will use that response to update themselves [David Heinemeier Hansson]
-
-* Disregard namespaces from the default element name, so Highrise::Person will just try to fetch from "/people", not "/highrise/people" [David Heinemeier Hansson]
-
-* Allow array and hash query parameters.  #7756 [Greg Spurrier]
-
-* Loading a resource preserves its prefix_options.  #7353 [Ryan Daigle]
-
-* Carry over the convenience of #create from ActiveRecord.  Closes #7340.  [Ryan Daigle]
-
-* Increase ActiveResource::Base test coverage.  Closes #7173, #7174 [Rich Collins]
-
-* Interpret 422 Unprocessable Entity as ResourceInvalid.  #7097 [dkubb]
-
-* Mega documentation patches. #7025, #7069 [rwdaigle]
-
-* Base.exists?(id, options) and Base#exists? check whether the resource is found.  #6970 [rwdaigle]
-
-* Query string support.  [untext, Jeremy Kemper]
-    # GET /forums/1/topics.xml?sort=created_at
-    Topic.find(:all, :forum_id => 1, :sort => 'created_at')
-
-* Base#==, eql?, and hash methods. == returns true if its argument is identical to self or if it's an instance of the same class, is not new?, and has the same id. eql? is an alias for ==. hash delegates to id.  [Jeremy Kemper]
-
-* Allow subclassed resources to share the site info [Rick Olson, Jeremy Kemper]
-d
-    class BeastResource < ActiveResource::Base
-      self.site = 'http://beast.caboo.se'
-    end
-
-    class Forum < BeastResource
-      # taken from BeastResource
-      # self.site = 'http://beast.caboo.se'
-    end
-
-    class Topic < BeastResource
-      self.site += '/forums/:forum_id'
-    end
-
-* Fix issues with ActiveResource collection handling.  Closes #6291. [bmilekic]
-
-* Use attr_accessor_with_default to dry up attribute initialization. References #6538. [Stuart Halloway]
-
-* Add basic logging support for logging outgoing requests. [Jamis Buck]
-
-* Add Base.delete for deleting resources without having to instantiate them first. [Jamis Buck]
-
-* Make #save behavior mimic AR::Base#save (true on success, false on failure). [Jamis Buck]
-
-* Add Basic HTTP Authentication to ActiveResource (closes #6305). [jonathan]
-
-* Extracted #id_from_response as an entry point for customizing how a created resource gets its own ID.
-  By default, it extracts from the Location response header.
-
-* Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response. [Jeremy Kemper]
-
-    # Example controller action
-    def update
-      @person.save!
-    rescue ActiveRecord::StaleObjectError
-      render :xml => @person.reload.to_xml, :status => '409 Conflict'
-    end
-
-* Basic validation support [Rick Olson]
-
-  Parses the xml response of ActiveRecord::Errors#to_xml with a similar interface to ActiveRecord::Errors.
-
-    render :xml => @person.errors.to_xml, :status => '400 Validation Error'
-
-* Deep hashes are converted into collections of resources.  [Jeremy Kemper]
-    Person.new :name => 'Bob',
-               :address => { :id => 1, :city => 'Portland' },
-               :contacts => [{ :id => 1 }, { :id => 2 }]
-  Looks for Address and Contact resources and creates them if unavailable.
-  So clients can fetch a complex resource in a single request if you e.g.
-    render :xml => @person.to_xml(:include => [:address, :contacts])
-  in your controller action.
-
-* Major updates [Rick Olson]
-
-  * Add full support for find/create/update/destroy
-  * Add support for specifying prefixes.
-  * Allow overriding of element_name, collection_name, and primary key
-  * Provide simpler HTTP mock interface for testing
-
-    # rails routing code
-    map.resources :posts do |post|
-      post.resources :comments
-    end
-
-    # ActiveResources
-    class Post < ActiveResource::Base
-      self.site = "http://37s.sunrise.i:3000/"
-    end
-
-    class Comment < ActiveResource::Base
-      self.site = "http://37s.sunrise.i:3000/posts/:post_id/"
-    end
-
-    @post     = Post.find 5
-    @comments = Comment.find :all, :post_id => @post.id
-
-    @comment  = Comment.new({:body => 'hello world'}, {:post_id => @post.id})
-    @comment.save
-
-* Base.site= accepts URIs. 200...400 are valid response codes. PUT and POST request bodies default to ''. [Jeremy Kemper]
-
-* Initial checkin: object-oriented client for restful HTTP resources which follow the Rails convention. [David Heinemeier Hansson]
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
new file mode 100644
index 0000000000..09d1eeb1c8
--- /dev/null
+++ b/activeresource/CHANGELOG.md
@@ -0,0 +1,334 @@
+## Rails 3.2.0 (unreleased) ##
+
+*   Redirect responses: 303 See Other and 307 Temporary Redirect now behave like
+    301 Moved Permanently and 302 Found.  GH #3302.
+
+    *Jim Herz*
+
+
+## Rails 3.1.1 (October 7, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   The default format has been changed to JSON for all requests. If you want to continue to use XML you will need to set `self.format = :xml` in the class. eg.
+
+    class User < ActiveResource::Base    self.format = :xml
+    end
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   No changes.
+
+
+*   Rails 3.0.6 (April 5, 2011)
+
+*   No changes.
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   No changes.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   No changes
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   JSON: set Base.include_root_in_json = true to include a root value in the JSON: {"post": {"title": ...}}. Mirrors the Active Record option.  *Santiago Pastorino*
+
+*   Add support for errors in JSON format.  #1956 *Fabien Jakimowicz*
+
+*   Recognizes 410 as Resource Gone. #2316 *Jordan Brough, Jatinder Singh*
+
+*   More thorough SSL support.  #2370 *Roy Nicholson*
+
+*   HTTP proxy support.  #2133 *Marshall Huss, Sébastien Dabet*
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+*   Nothing new, just included in 2.3.2
+
+
+## 2.2.1 RC2 (November 14th, 2008) ##
+
+*   Fixed that ActiveResource#post would post an empty string when it shouldn't be posting anything #525 *Paolo Angelini*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+*   Add ActiveResource::Base#to_xml and ActiveResource::Base#to_json. #1011 *Rasik Pandey, Cody Fauser*
+
+*   Add ActiveResource::Base.find(:last). [#754 state:resolved] (Adrian Mugnolo)
+
+*   Fixed problems with the logger used if the logging string included %'s [#840 state:resolved] (Jamis Buck)
+
+*   Fixed Base#exists? to check status code as integer [#299 state:resolved] (Wes Oldenbeuving)
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+*   Fixed response logging to use length instead of the entire thing (seangeo) *#27*
+
+*   Fixed that to_param should be used and honored instead of hardcoding the id #11406 *gspiers*
+
+*   Improve documentation. *Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert*
+
+*   Use HEAD instead of GET in exists? *bscofield*
+
+*   Fix small documentation typo.  Closes #10670 *Luca Guidi*
+
+*   find_or_create_resource_for handles module nesting.  #10646 *xavier*
+
+*   Allow setting ActiveResource::Base#format before #site.  *Rick Olson*
+
+*   Support agnostic formats when calling custom methods.  Closes #10635 *joerichsen*
+
+*   Document custom methods.  #10589 *Cheah Chu Yeow*
+
+*   Ruby 1.9 compatibility.  *Jeremy Kemper*
+
+
+## 2.0.2 (December 16th, 2007) ##
+
+*   Added more specific exceptions for 400, 401, and 403 (all descending from ClientError so existing rescues will work) #10326 *trek*
+
+*   Correct empty response handling.  #10445 *seangeo*
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+*   Don't cache net/http object so that ActiveResource is more thread-safe.  Closes #10142 *kou*
+
+*   Update XML documentation examples to include explicit type attributes. Closes #9754 *Josh Susser*
+
+*   Added one-off declarations of mock behavior [David Heinemeier Hansson]. Example:
+
+        Before:
+          ActiveResource::HttpMock.respond_to do |mock|
+            mock.get "/people/1.xml", {}, "<person><name>David</name></person>"
+          end
+
+        Now:
+          ActiveResource::HttpMock.respond_to.get "/people/1.xml", {}, "<person><name>David</name></person>"
+
+*   Added ActiveResource.format= which defaults to :xml but can also be set to :json [David Heinemeier Hansson]. Example:
+
+        class Person < ActiveResource::Base
+          self.site   = "http://app/"
+          self.format = :json
+        end
+
+        person = Person.find(1) # => GET http://app/people/1.json
+        person.name = "David"
+        person.save             # => PUT http://app/people/1.json {name: "David"}
+
+        Person.format = :xml
+        person.name = "Mary"
+        person.save             # => PUT http://app/people/1.json <person><name>Mary</name></person>
+
+*   Fix reload error when path prefix is used.  #8727 *Ian Warshak*
+
+*   Remove ActiveResource::Struct because it hasn't proven very useful. Creating a new ActiveResource::Base subclass is often less code and always clearer.  #8612 *Josh Peek*
+
+*   Fix query methods on resources. *Cody Fauser*
+
+*   pass the prefix_options to the instantiated record when using find without a specific id. Closes #8544 *Eloy Duran*
+
+*   Recognize and raise an exception on 405 Method Not Allowed responses.  #7692 *Josh Peek*
+
+*   Handle string and symbol param keys when splitting params into prefix params and query params.
+
+        Comment.find(:all, :params => { :article_id => 5, :page => 2 }) or Comment.find(:all, :params => { 'article_id' => 5, :page => 2 })
+
+*   Added find-one with symbol [David Heinemeier Hansson]. Example: Person.find(:one, :from => :leader) # => GET /people/leader.xml
+
+*   BACKWARDS INCOMPATIBLE: Changed the finder API to be more extensible with :params and more strict usage of scopes [David Heinemeier Hansson]. Changes:
+
+        Person.find(:all, :title => "CEO")      ...becomes: Person.find(:all, :params => { :title => "CEO" })
+        Person.find(:managers)                  ...becomes: Person.find(:all, :from => :managers)
+        Person.find("/companies/1/manager.xml") ...becomes: Person.find(:one, :from => "/companies/1/manager.xml")
+
+*   Add support for setting custom headers per Active Resource model *Rick Olson*
+
+    class Project
+        headers['X-Token'] = 'foo'
+    end
+
+    \# makes the GET request with the custom X-Token header
+    Project.find(:all)
+
+*   Added find-by-path options to ActiveResource::Base.find [David Heinemeier Hansson]. Examples:
+
+        employees = Person.find(:all, :from => "/companies/1/people.xml") # => GET /companies/1/people.xml
+        manager   = Person.find("/companies/1/manager.xml")               # => GET /companies/1/manager.xml
+
+
+*   Added support for using classes from within a single nested module [David Heinemeier Hansson]. Example:
+
+        module Highrise
+          class Note < ActiveResource::Base
+            self.site = "http://37s.sunrise.i:3000"
+          end
+
+          class Comment < ActiveResource::Base
+            self.site = "http://37s.sunrise.i:3000"
+          end
+        end
+
+    assert_kind_of Highrise::Comment, Note.find(1).comments.first
+
+
+*   Added load_attributes_from_response as a way of loading attributes from other responses than just create *David Heinemeier Hansson*
+
+        class Highrise::Task < ActiveResource::Base
+          def complete
+            load_attributes_from_response(post(:complete))
+          end
+        end
+
+    ...will set "done_at" when complete is called.
+
+
+*   Added support for calling custom methods #6979 *rwdaigle*
+
+        Person.find(:managers)    # => GET /people/managers.xml
+        Kase.find(1).post(:close) # => POST /kases/1/close.xml
+
+*   Remove explicit prefix_options parameter for ActiveResource::Base#initialize. *Rick Olson*
+    ActiveResource splits the prefix_options from it automatically.
+
+*   Allow ActiveResource::Base.delete with custom prefix. *Rick Olson*
+
+*   Add ActiveResource::Base#dup *Rick Olson*
+
+*   Fixed constant warning when fetching the same object multiple times *David Heinemeier Hansson*
+
+*   Added that saves which get a body response (and not just a 201) will use that response to update themselves *David Heinemeier Hansson*
+
+*   Disregard namespaces from the default element name, so Highrise::Person will just try to fetch from "/people", not "/highrise/people" *David Heinemeier Hansson*
+
+*   Allow array and hash query parameters.  #7756 *Greg Spurrier*
+
+*   Loading a resource preserves its prefix_options.  #7353 *Ryan Daigle*
+
+*   Carry over the convenience of #create from ActiveRecord.  Closes #7340.  *Ryan Daigle*
+
+*   Increase ActiveResource::Base test coverage.  Closes #7173, #7174 *Rich Collins*
+
+*   Interpret 422 Unprocessable Entity as ResourceInvalid.  #7097 *dkubb*
+
+*   Mega documentation patches. #7025, #7069 *rwdaigle*
+
+*   Base.exists?(id, options) and Base#exists? check whether the resource is found.  #6970 *rwdaigle*
+
+*   Query string support.  *untext, Jeremy Kemper*
+        # GET /forums/1/topics.xml?sort=created_at
+        Topic.find(:all, :forum_id => 1, :sort => 'created_at')
+
+*   Base#==, eql?, and hash methods. == returns true if its argument is identical to self or if it's an instance of the same class, is not new?, and has the same id. eql? is an alias for ==. hash delegates to id.  *Jeremy Kemper*
+
+*   Allow subclassed resources to share the site info *Rick Olson, Jeremy Kemper*
+    d        class BeastResource < ActiveResource::Base
+          self.site = 'http://beast.caboo.se'
+        end
+
+        class Forum < BeastResource
+          # taken from BeastResource
+          # self.site = 'http://beast.caboo.se'
+        end
+
+        class Topic < BeastResource
+          self.site += '/forums/:forum_id'
+        end
+
+*   Fix issues with ActiveResource collection handling.  Closes #6291. *bmilekic*
+
+*   Use attr_accessor_with_default to dry up attribute initialization. References #6538. *Stuart Halloway*
+
+*   Add basic logging support for logging outgoing requests. *Jamis Buck*
+
+*   Add Base.delete for deleting resources without having to instantiate them first. *Jamis Buck*
+
+*   Make #save behavior mimic AR::Base#save (true on success, false on failure). *Jamis Buck*
+
+*   Add Basic HTTP Authentication to ActiveResource (closes #6305). *jonathan*
+
+*   Extracted #id_from_response as an entry point for customizing how a created resource gets its own ID.
+    By default, it extracts from the Location response header.
+
+*   Optimistic locking: raise ActiveResource::ResourceConflict on 409 Conflict response. *Jeremy Kemper*
+
+        # Example controller action
+        def update
+          @person.save!
+        rescue ActiveRecord::StaleObjectError
+          render :xml => @person.reload.to_xml, :status => '409 Conflict'
+        end
+
+*   Basic validation support *Rick Olson*
+
+    Parses the xml response of ActiveRecord::Errors#to_xml with a similar interface to ActiveRecord::Errors.
+
+        render :xml => @person.errors.to_xml, :status => '400 Validation Error'
+
+*   Deep hashes are converted into collections of resources.  *Jeremy Kemper*
+        Person.new :name => 'Bob',
+                   :address => { :id => 1, :city => 'Portland' },
+                   :contacts => [{ :id => 1 }, { :id => 2 }]
+    Looks for Address and Contact resources and creates them if unavailable.
+    So clients can fetch a complex resource in a single request if you e.g.
+        render :xml => @person.to_xml(:include => [:address, :contacts])
+    in your controller action.
+
+*   Major updates *Rick Olson*
+
+    * Add full support for find/create/update/destroy
+    * Add support for specifying prefixes.
+    * Allow overriding of element_name, collection_name, and primary key
+    * Provide simpler HTTP mock interface for testing
+
+        # rails routing code
+        map.resources :posts do |post|
+          post.resources :comments
+        end
+
+        # ActiveResources
+        class Post < ActiveResource::Base
+          self.site = "http://37s.sunrise.i:3000/"
+        end
+
+        class Comment < ActiveResource::Base
+          self.site = "http://37s.sunrise.i:3000/posts/:post_id/"
+        end
+
+        @post     = Post.find 5
+        @comments = Comment.find :all, :post_id => @post.id
+
+        @comment  = Comment.new({:body => 'hello world'}, {:post_id => @post.id})
+        @comment.save
+
+*   Base.site= accepts URIs. 200...400 are valid response codes. PUT and POST request bodies default to ''. *Jeremy Kemper*
+
+*   Initial checkin: object-oriented client for restful HTTP resources which follow the Rails convention. *David Heinemeier Hansson*
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
deleted file mode 100644
index 8609198641..0000000000
--- a/activesupport/CHANGELOG
+++ /dev/null
@@ -1,1571 +0,0 @@
-*Rails 3.2.0 (unreleased)*
-
-* Module#qualified_const_(defined?|get|set) are analogous to the corresponding methods
-  in the standard API, but accept qualified constant names. [fxn]
-
-* Added inflection #deconstantize which complements #demodulize. This inflection
-  removes the righmost segment in a qualified constant name. [fxn]
-
-* Added ActiveSupport:TaggedLogging that can wrap any standard Logger class to provide tagging capabilities [DHH]
-
-    Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
-    Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
-    Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
-    Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
-  
-* Added safe_constantize that constantizes a string but returns nil instead of an exception if the constant (or part of it) does not exist [Ryan Oblak]
-
-* ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! [Prem Sichanugrist]
-
-* Added Array#prepend as an alias for Array#unshift and Array#append as an alias for Array#<< [DHH]
-
-* The definition of blank string for Ruby 1.9 has been extended to Unicode whitespace.
-Also, in 1.8 the ideographic space U+3000 is considered to be whitespace. [Akira Matsuda, Damien Mathieu]
-
-* The inflector understands acronyms. [dlee]
-
-* Deprecated ActiveSupport::Memoizable in favor of Ruby memoization pattern [José Valim]
-
-* Added Time#all_day/week/quarter/year as a way of generating ranges (example: Event.where(created_at: Time.now.all_week)) [DHH]
-
-* Added instance_accessor: false as an option to Class#cattr_accessor and friends [DHH]
-
-* Removed ActiveSupport::SecureRandom in favor of SecureRandom from the standard library [Jon Leighton]
-
-* ActiveSupport::OrderedHash now has different behavior for #each and
-#each_pair when given a block accepting its parameters with a splat. [Andrew Radev]
-
-*Rails 3.1.0 (August 30, 2011)*
-
-* ActiveSupport::Dependencies#load and ActiveSupport::Dependencies#require now
-return the value from `super` [Aaron Patterson]
-
-* Fixed ActiveSupport::Gzip to work properly in Ruby 1.8 [Guillermo Iguaran]
-
-* Kernel.require_library_or_gem was deprecated and will be removed in Rails 3.2.0 [Josh Kalderimis]
-
-* ActiveSupport::Duration#duplicable? was fixed for Ruby 1.8 [thedarkone]
-
-* ActiveSupport::BufferedLogger set log encoding to BINARY, but still use text
-mode to output portable newlines. [fxn]
-
-* ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. [Andrew White]
-
-* Deprecated ActiveSupport::SecureRandom in favour of SecureRandom from the standard library [Jon Leighton]
-
-* New reporting method Kernel#quietly. [fxn]
-
-* Add String#inquiry as a convenience method for turning a string into a StringInquirer object [DHH]
-
-* Add Object#in? to test if an object is included in another object [Prem Sichanugrist, Brian Morearty, John Reitano]
-
-* LocalCache strategy is now a real middleware class, not an anonymous class
-posing for pictures.
-
-* ActiveSupport::Dependencies::ClassCache class has been introduced for
-holding references to reloadable classes.
-
-* ActiveSupport::Dependencies::Reference has been refactored to take direct
-advantage of the new ClassCache.
-
-* Backports Range#cover? as an alias for Range#include? in Ruby 1.8 [Diego Carrion, fxn]
-
-* Added weeks_ago and prev_week to Date/DateTime/Time. [Rob Zolkos, fxn]
-
-* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
-
-* JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. [Josh Kalderimis]
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-* Hash.from_xml no longer loses attributes on tags containing only whitespace [André Arko]
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* No changes.
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* Implemented String#strip_heredoc. [fxn]
-
-* Pluggable cache stores: setting config.cache_store = "custom_store" will require 'active_support/cache/custom_store' and look for the CustomStore constant.  #5486 [Mike Perham]
-
-* Removed Object#returning, Object#tap should be used instead. [Santiago Pastorino]
-
-* Deprecation behavior is no longer hardcoded to the name of the environment.
-  Instead, it is set via config.active_support.deprecation and can be one
-  of :log, :stderr or :notify. :notify is a new style that sends the warning
-  via ActiveSupport::Notifications, and is the new default for production
-  [Yehuda Katz]
-
-* Renamed ActiveSupport::Dependecies.load_(once_)paths to autoload_(once_)paths. [fxn]
-
-* Added ActiveSupport::FileUpdateChecker to execute a block only if a set of files changed, used by Router and I18n locale files. [José Valim]
-
-* Added ActiveSupport::DescendantsTracker to track descendants with support to constants reloading. [José Valim]
-
-* ActiveSupport::OrderedHash#merge and #merge! accept a block. #4838 [Paul Mucur, fxn]
-
-* Date#since, #ago, #beginning_of_day, #end_of_day, and #xmlschema honor now the user time zone if set. [Geoff Buesing]
-
-* Extracted String#truncate from TextHelper#truncate [DHH]
-
-* Ruby 1.9: support UTF-8 case folding.  #4595 [Norman Clarke]
-
-* Removes Array#rand and backports Array#sample from Ruby 1.9, thanks to Marc-Andre Lafortune. [fxn]
-
-* Ruby 1.9: Renames last_(month|year) to prev_(month|year) in Date and Time. [fxn]
-
-* Aliases Date#sunday to Date#end_of_week. [fxn]
-
-* Backports Date#>> from 1.9 so that calculations do the right thing around the calendar reform. [fxn]
-
-* Date#to_time handles properly years in the range 0..138. [fxn]
-
-* Deprecate {{}} as interpolation syntax for I18n in favor of %{} [José Valim]
-
-* Array#to_xml is more powerful and able to handle the same types as Hash#to_xml #4490 [Neeraj Singh]
-
-* Harmonize the caching API and refactor the backends.  #4452 [Brian Durand]
-  All caches:
-  * Add default options to initializer that will be sent to all read, write, fetch, exist?, increment, and decrement
-  * Add support for the :expires_in option to fetch and write for all caches. Cache entries are stored with the create timestamp and a ttl so that expiration can be handled independently of the implementation.
-  * Add support for a :namespace option. This can be used to set a global prefix for cache entries.
-  * Deprecate expand_cache_key on ActiveSupport::Cache and move it to ActionController::Caching and ActionDispatch::Http::Cache since the logic in the method used some Rails specific environment variables and was only used by ActionPack classes. Not very DRY but there didn't seem to be a good shared spot and ActiveSupport really shouldn't be Rails specific.
-  * Add support for :race_condition_ttl to fetch. This setting can prevent race conditions on fetch calls where several processes try to regenerate a recently expired entry at once.
-  * Add support for :compress option to fetch and write which will compress any data over a configurable threshold.
-  * Nil values can now be stored in the cache and are distinct from cache misses for fetch.
-  * Easier API to create new implementations. Just need to implement the methods read_entry, write_entry, and delete_entry instead of overwriting existing methods.
-  * Since all cache implementations support storing objects, update the docs to state that ActiveCache::Cache::Store implementations should store objects. Keys, however, must be strings since some implementations require that.
-  * Increase test coverage.
-  * Document methods which are provided as convenience but which may not be universally available.
-
-  MemoryStore:
-  * MemoryStore can now safely be used as the cache for single server sites.
-  * Make thread safe so that the default cache implementation used by Rails is thread safe. The overhead is minimal and it is still the fastest store available.
-  * Provide :size initialization option indicating the maximum size of the cache in memory (defaults to 32Mb).
-  * Add prune logic that removes the least recently used cache entries to keep the cache size from exceeding the max.
-  * Deprecated SynchronizedMemoryStore since it isn't needed anymore.
-
-  FileStore:
-  * Escape key values so they will work as file names on all file systems, be consistent, and case sensitive
-  * Use a hash algorithm to segment the cache into sub directories so that a large cache doesn't exceed file system limits.
-  * FileStore can be slow so implement the LocalCache strategy to cache reads for the duration of a request.
-  * Add cleanup method to keep the disk from filling up with expired entries.
-  * Fix increment and decrement to use file system locks so they are consistent between processes.
-
-  MemCacheStore:
-  * Support all keys. Previously keys with spaces in them would fail
-  * Deprecate CompressedMemCacheStore since it isn't needed anymore (use :compress => true)
-
-* JSON: encode objects that don't have a native JSON representation using to_hash, if available, instead of instance_values (the old fallback) or to_s (other encoders' default). Encode BigDecimal and Regexp encode as strings to conform with other encoders. Try to transcode non-UTF-8 strings.  [Jeremy Kemper]
-
-* HashWithIndifferentAccess: remove inherited symbolize_keys! since its keys are always strings.  [Santiago Pastorino]
-
-* Improve transliteration quality.  #4374 [Norman Clarke]
-
-* Speed up and add Ruby 1.9 support for ActiveSupport::Multibyte::Chars#tidy_bytes.  #4350 [Norman Clarke]
-
-* Reduced load time by deferring configuration of classes using
-  ActiveSupport::on_load(:component_name) [YK]
-
-* Rename #metaclass to #singleton_class now that ruby-core has decided [JK]
-
-* New assertions assert_blank and assert_present.  #4299 [Juanjo Bazan]
-
-* Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.  [Jeremy Kemper]
-
-* JSON backend for YAJL. Preferred if available.  #2666 [Brian Lopez]
-
-* Introduce class_attribute to declare inheritable class attributes. Writing an attribute on a subclass behaves just like overriding the superclass reader method.  Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute.  [Jeremy Kemper, Yehuda Katz]
-
-* Time#- with a DateTime argument behaves the same as with a Time argument, i.e. returns the difference between self and arg as a Float #3476 [Geoff Buesing]
-
-* YAML serialization for OrderedHash.  #3608 [Gregor Schmidt]
-
-* Update bundled TZInfo to v0.3.16 [Geoff Buesing]
-
-* Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" #1821 [Geoff Buesing, Reuben Sivan]
-
-* Changed the default ActiveSupport.use_standard_json_time_format from false to true and
-ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH]
-
-* Added Object#presence that returns the object if it's #present? otherwise returns nil [DHH/Colin Kelley]
-
-* Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !x.include?/else calls [DHH]
-
-* Update Edinburgh TimeZone to use "Europe/London" instead of "Europe/Dublin" #3310 [Phil Ross]
-
-* Update bundled TZInfo to v0.3.15 [Geoff Buesing]
-
-* JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON library agnostic.  [Jeremy Kemper]
-
-* String #to_time and #to_datetime: handle fractional seconds #864 [Jason Frey]
-
-* Update bundled TZInfo to v0.3.13 [Geoff Buesing]
-
-* Allow MemCacheStore to be initialized with a MemCache-like object instead of addresses and options [Bryan Helmkamp]
-
-* Change spelling of Kyev timezone to Kyiv #2613 [Alexander Dymo]
-
-* Add ActiveSupport.parse_json_times to disable time parsing in JSON backends that don't support it or don't need it. [rick]
-
-* Add pluggable JSON backends with support for the JSON gem. [rick]
-    Example: ActiveSupport::JSON.backend = "JSONGem"
-
- All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode().  Use of #to_json is not recommended, as it may clash with other libraries that overwrite it.  However, you can recover Rails specific functionality
- if you really want to use #to_json.
-
-    gem 'json'
-    ActiveSupport::JSON.backend = "JSONGem"
-
-    class ActiveRecord::Base
-      alias to_json rails_to_json
-    end
-
-* require 'active_support' no longer orders the whole menu of core extensions. Ask for just what you need: e.g. require 'active_support/core/time' to use timezones, durations, and stdlib date/time extensions. [Jeremy Kemper]
-
-* Removed rarely-used DRb cache store.  [Jeremy Kemper]
-
-* TimeWithZone.name returns 'Time', to further thwart type checking [Geoff Buesing]
-
-* Time.local instances: Adding 24.hours across the DST boundary adds 24 hours instead of one day #2066 [Michael Curtis]
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* XmlMini supports LibXML and Nokogiri backends.  #2084, #2190 [Bart ten Brinke, Aaron Patterson]
-    Example: XmlMini.backend = 'Nokogiri'
-
-* Vendorize i18n 0.1.3 gem (fixes issues with incompatible character encodings in Ruby 1.9) #2038 [Akira Matsuda]
-
-* Update bundled memcache-client from 1.5.0.5 to 1.6.4.99. See http://www.mikeperham.com/2009/02/15/memcache-client-performance/  [Mike Perham]
-
-* Ruby 1.9.1p0 fix: URI.unescape can decode multibyte chars.  #2033 [MOROHASHI Kyosuke]
-
-* Time#to_s(:rfc822) uses #formatted_offset instead of unreliable and non-standard %z directive #1899 [Zachary Zolton]
-
-* Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s #1796 [Levin Alexander]
-
-* Introduce Array.wrap(foo) to wrap the argument in an array unless it's already an array. Wraps nil as an empty array. Use instead of Array(foo) and foo.to_a since they treat String as Enumerable.  [Jeremy Kemper]
-
-* TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 state:resolved] [Nicholas Dainty]
-
-* Object#tap shim for Ruby < 1.8.7. Similar to Object#returning, tap yields self then returns self.  [Jeremy Kemper]
-    array.select { ... }.tap(&:inspect).map { ... }
-
-* TimeWithZone#- gives correct result with wrapped DateTime, and with DateTime argument [Geoff Buesing]
-
-* Updated i18n gem to version 0.1.1 #1635 [Yaroslav Markin]
-
-* Add :allow_nil option to delegate. #1127 [Sergio Gil]
-
-* Add Benchmark.ms convenience method to benchmark realtime in milliseconds.  [Jeremy Kemper]
-
-* Updated included memcache-client to the 1.5.0.5 version which includes fixes from fiveruns and 37signals to deal with failover and timeouts #1535 [Joshua Sierles]
-
-* Multibyte: add multibyte-safe Chars#ord rather than falling back to String#ord.  #1483 [Jason Cheow]
-
-* I18n support for Array#to_sentence. Introduces support.array.words_connector, .two_words_connector, and .last_word_connector translation keys.  #1397 [Akira Matsuda]
-
-* Added ActiveSupport::OrderedHash#each_key and ActiveSupport::OrderedHash#each_value #1410 [Christoffer Sawicki]
-
-* Added ActiveSupport::MessageVerifier and MessageEncryptor to aid users who need to store signed and/or encrypted messages. [Michael Koziarski]
-
-* Added ActiveSupport::BacktraceCleaner to cut down on backtrace noise according to filters and silencers [David Heinemeier Hansson]
-
-* Added Object#try. ( Taken from http://ozmm.org/posts/try.html ) [Chris Wanstrath]
-
-* Added Enumerable#none? to check that none of the elements match the block #1408 [Damian Janowski]
-
-* TimeZone offset tests: use current_period, to ensure TimeZone#utc_offset is up-to-date [Geoff Buesing]
-
-* Update bundled TZInfo to 0.3.12 [Geoff Buesing]
-
-* Added lambda merging to OptionMerger (especially useful with named_scope and with_options) #726 [Paweł Kondzior]
-
-
-*2.2.1 [RC2] (November 14th, 2008)*
-
-* Increment the version of our altered memcache-client to prevent confusion caused when the 1.5.0 gem is installed.
-
-* Fixed the option merging in Array#to_xml #1126 [Rudolf Gavlas]
-
-* Make I18n::Backend::Simple reload its translations in development mode [David Heinemeier Hansson/Sven Fuchs]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* TimeWithZone#freeze: preload instance variables so that we can actually freeze [Geoff Buesing]
-
-* Fix Brasilia timezone #1180 [Marcus Derencius, Kane]
-
-* Time#advance recognizes fractional days and weeks. Deprecate Durations of fractional months and years #970 [Tom Lea]
-
-* Add ActiveSupport::Rescuable module abstracting ActionController::Base rescue_from features. [Norbert Crombach, Pratik Naik]
-
-* Switch from String#chars to String#mb_chars for the unicode proxy.  [Manfred Stienstra]
-
-  This helps with 1.8.7 compatibility and also improves performance for some operations by reducing indirection.
-
-* TimeWithZone #wday, #yday and #to_date avoid trip through #method_missing [Geoff Buesing]
-
-* Added Time, Date, DateTime and TimeWithZone #past?, #future? and #today? #720 [Clemens Kofler, Geoff Buesing]
-
-* Fixed Sri Jayawardenepura time zone to map to Asia/Colombo [Jamis Buck]
-
-* Added Inflector#parameterize for easy slug generation ("Donald E. Knuth".parameterize => "donald-e-knuth") #713 [Matt Darby]
-
-* Changed cache benchmarking to be reported in milliseconds [David Heinemeier Hansson]
-
-* Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved] [Luca Guidi, Geoff Buesing]
-
-* Add Array#in_groups which splits or iterates over the array in specified number of groups. #579. [Adrian Mugnolo] Example:
-
-  a = (1..10).to_a
-  a.in_groups(3)        # => [[1, 2, 3, 4], [5, 6, 7, nil], [8, 9, 10, nil]]
-  a.in_groups(3, false) # => [[1, 2, 3, 4], [5, 6, 7], [8, 9, 10]]
-
-* Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone [Geoff Buesing]
-
-* Added Memoizable mixin for caching simple lazy loaded attributes [Josh Peek]
-
-* Move the test related core_ext stuff out of core_ext so it's only loaded by the test helpers.  [Michael Koziarski]
-
-* Add Inflection rules for String#humanize. #535 [Dan Manges]
-
-  ActiveSupport::Inflector.inflections do |inflect|
-    inflect.human(/_cnt$/i, '\1_count')
-  end
-
-  'jargon_cnt'.humanize # => 'Jargon count'
-
-* TimeWithZone: when crossing DST boundary, treat Durations of days, months or years as variable-length, and all other values as absolute length. A time + 24.hours will advance exactly 24 hours, but a time + 1.day will advance 23-25 hours, depending on the day. Ensure consistent behavior across all advancing methods [Geoff Buesing]
-
-* Added TimeZone #=~, to support matching zones by regex in time_zone_select. #195 [Ernie Miller]
-
-* Added Array#second through Array#fifth as aliases for Array#[1] through Array#[4] + Array#forty_two as alias for Array[41] [David Heinemeier Hansson]
-
-* Added test/do declaration style testing to ActiveSupport::TestCase [DHH via Jay Fields]
-
-* Added Object#present? which is equivalent to !Object#blank? [David Heinemeier Hansson]
-
-* Added Enumberable#many? to encapsulate collection.size > 1 [David Heinemeier Hansson/Damian Janowski]
-
-* Add more standard Hash methods to ActiveSupport::OrderedHash [Steve Purcell]
-
-* Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveSupport [Josh Peek]
-
-* Added StringInquirer for doing things like StringInquirer.new("production").production? # => true and StringInquirer.new("production").development? # => false [David Heinemeier Hansson]
-
-* Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
-
-
-*2.1.0 (May 31st, 2008)*
-
-* TimeZone#to_s shows offset as GMT instead of UTC, because GMT will be more familiar to end users (see time zone selects used by Windows OS, google.com and yahoo.com.) Reverts [8370] [Geoff Buesing]
-
-* Hash.from_xml: datetime xml types overflow to Ruby DateTime class when out of range of Time. Adding tests for utc offsets [Geoff Buesing]
-
-* TimeWithZone #+ and #- : ensure overflow to DateTime with Numeric arg [Geoff Buesing]
-
-* Time#to_json: don't convert to utc before encoding. References #175 [Geoff Buesing]
-
-* Remove unused JSON::RESERVED_WORDS, JSON.valid_identifier? and JSON.reserved_word? methods. Resolves #164. [Cheah Chu Yeow]
-
-* Adding Date.current, which returns Time.zone.today if config.time_zone is set; otherwise returns Date.today [Geoff Buesing]
-
-* TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing [Geoff Buesing]
-
-* Time.zone.parse return nil for strings with no date information [Geoff Buesing]
-
-* Time.zone.parse respects offset information in string. Resolves #105. [Scott Fleckenstein, Geoff Buesing]
-
-* Added Ruby 1.8 implementation of Process.daemon
-
-* Duration #since and #ago with no argument (e.g., 5.days.ago) return TimeWithZone when config.time_zone is set. Introducing Time.current, which returns Time.zone.now if config.time_zone is set, otherwise just returns Time.now [Geoff Buesing]
-
-* Time#since behaves correctly when passed a Duration. Closes #11527 [kemiller]
-
-* Add #getutc alias for DateTime#utc [Geoff Buesing]
-
-* Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through method_missing [Geoff Buesing]
-
-* TimeWithZone respects config.active_support.use_standard_json_time_format [Geoff Buesing]
-
-* Add config.active_support.escape_html_entities_in_json to allow disabling of html entity escaping.  [Rick Olson]
-
-* Improve documentation. [Xavier Noria]
-
-* Modified ActiveSupport::Callbacks::Callback#call to accept multiple arguments.
-
-* Time #yesterday and #tomorrow behave correctly crossing DST boundary. Closes #7399 [sblackstone]
-
-* TimeWithZone: Adding tests for dst and leap day edge cases when advancing time [Geoff Buesing]
-
-* TimeWithZone#method_missing: send to utc to advance with dst correctness, otherwise send to time. Adding tests for time calculations methods [Geoff Buesing]
-
-* Add config.active_support.use_standard_json_time_format setting so that Times and Dates export to ISO 8601 dates.  [Rick Olson]
-
-* TZInfo: Removing unneeded TimezoneProxy class [Geoff Buesing]
-
-* TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not including Indexes::Timezones [Geoff Buesing]
-
-* Removing unnecessary uses_tzinfo helper from tests, given that TZInfo is now bundled [Geoff Buesing]
-
-* Bundling abbreviated version of TZInfo gem 0.3.8: only the classes and zone definitions required to support Rails time zone features are included. If a recent version of the full TZInfo gem is installed, this will take precedence over the bundled version [Geoff Buesing]
-
-* TimeWithZone#marshal_load does zone lookup via Time.get_zone, so that tzinfo/Olson identifiers are handled [Geoff Buesing]
-
-* Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; wraps result in TimeZone instance [Geoff Buesing]
-
-* TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, because TZInfo does this internally [Geoff Buesing]
-
-* TimeWithZone#usec returns 0 instead of error when DateTime is wrapped [Geoff Buesing]
-
-* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
-
-* Ensure that TimeWithZone#to_yaml works when passed a YAML::Emitter.  [Rick Olson]
-
-* Ensure correct TimeWithZone#to_date [Geoff Buesing]
-
-* Make TimeWithZone work with tzinfo 0.2.x: use TZInfo::Timezone#zone_identifier alias for #abbreviation, silence warnings on tests. Raise LoadError when TZInfo version is < 0.2 by sniffing for TZInfo::TimeOrDateTime constant. Move all tzinfo-dependent TimeZone tests into uses_tzinfo block [Geoff Buesing]
-
-* Time, DateTime and TimeWithZone #in_time_zone defaults to Time.zone. Removing now unneeded #in_current_time_zone [Geoff Buesing]
-
-* TZInfo caches Timezone instances in its own internal hash cache, so TimeZone::MAPPING doesn't need to cache them as well [Geoff Buesing]
-
-* Adding TimeZone#parse [Geoff Buesing]
-
-* Adding TimeZone#at and DateTime#to_f [Geoff Buesing]
-
-* TimeWithZone responds to Ruby 1.9 weekday-named query methods [Geoff Buesing]
-
-* TimeWithZone caches TZInfo::TimezonePeriod used for time conversion so that it can be reused, and enforces DST rules correctly when instance is created from a local time [Geoff Buesing]
-
-* Fixed that BufferedLogger should create its own directory if one doesn't already exist #11285 [lotswholetime]
-
-* Fix Numeric time tests broken by DST change by anchoring them to fixed times instead of Time.now. Anchor TimeZone#now DST test to time specified with Time.at instead of Time.local to work around platform differences with Time.local and DST representation [Geoff Buesing]
-
-* Removing unneeded #change_time_zone method from Time, DateTime and TimeWithZone [Geoff Buesing]
-
-* TimeZone #local and #now correctly enforce DST rules [Geoff Buesing]
-
-* TimeWithZone instances correctly enforce DST rules. Adding TimeZone#period_for_utc [Geoff Buesing]
-
-* test_time_with_datetime_fallback expects DateTime.local_offset instead of DateTime.now.offset [Geoff Buesing]
-
-* Adding TimeWithZone #marshal_dump and #marshal_load [Geoff Buesing]
-
-* Add OrderedHash#to_hash [Josh Peek]
-
-* Adding Time#end_of_day, _quarter, _week, and _year.  #9312 [Juanjo Bazan, Tarmo Tänav, BigTitus]
-
-* Adding TimeWithZone#between? [Geoff Buesing]
-
-* Time.=== returns true for TimeWithZone instances [Geoff Buesing]
-
-* TimeWithZone #+ and #- behave consistently with numeric arguments regardless of whether wrapped time is a Time or DateTime; consistenty answers false to #acts_like?(:date) [Geoff Buesing]
-
-* Add String#squish and String#squish! to remove consecutive chunks of whitespace.  #11123 [Jordi Bunster, Henrik N]
-
-* Serialize BigDecimals as Floats when using to_yaml. #8746 [Ernesto Jimenez]
-
-* Adding TimeWithZone #to_yaml, #to_datetime, #eql? and method aliases for duck-typing compatibility with Time [Geoff Buesing]
-
-* TimeWithZone #in_time_zone returns +self+ if zone argument is the same as #time_zone [Geoff Buesing]
-
-* Adding TimeWithZone #to_a, #to_f, #to_i, #httpdate, #rfc2822 [Geoff Buesing]
-
-* Pruning unneeded TimeWithZone#change_time_zone_to_current [Geoff Buesing]
-
-* Time#zone=, #in_time_zone and #change_time_zone accept a Duration [Geoff Buesing]
-
-* Time#in_time_zone handles Time.local instances correctly [Geoff Buesing]
-
-* Pruning unneeded Time#change_time_zone_to_current. Enhanced docs to #change_time_zone to explain the difference between this method and #in_time_zone [Geoff Buesing]
-
-* TimeZone#new method renamed #local; when used with Time.zone, constructor now reads: Time.zone.local() [Geoff Buesing]
-
-* Added Base64.encode64s to encode values in base64 without the newlines. This makes the values immediately usable as URL parameters or memcache keys without further processing [David Heinemeier Hansson]
-
-* Remove :nodoc: entries around the ActiveSupport test/unit assertions.  #10946 [dancroak, jamesh]
-
-* Add Time.zone_default accessor for setting the default time zone.  Rails::Configuration.time_zone sets this.  #10982 [Geoff Buesing]
-
-* cache.fetch(key, :force => true) to force a cache miss.  [Jeremy Kemper]
-
-* Support retrieving TimeZones with a Duration.  TimeZone[-28800] == TimeZone[-480.minutes].  [Rick Olson]
-
-* TimeWithZone#- added, so that #- can handle a Time or TimeWithZone argument correctly [Geoff Buesing]
-
-* with_timezone test helper renamed with_env_tz, to distinguish between setting ENV['TZ'] and setting Time.zone in tests [Geoff Buesing]
-
-* Time#- coerces TimeWithZone argument to a Time instance so that difference in seconds can be calculated. Closes #10914 [Geoff Buesing, yyyc514]
-
-* Adding UTC zone to TimeZone; TimeWithZone no longer has to fake UTC zone with nil [Geoff Buesing]
-
-* Time.get_zone refactored to private method, given that the encapsulated logic is only useful internally [Geoff Buesing]
-
-* Time.zone uses thread-local variable for thread safety. Adding Time.use_zone, for overriding Time.zone locally inside a block. Removing unneeded Time.zone_reset! [Geoff Buesing]
-
-* TimeZone#to_s uses UTC rather than GMT; reapplying change that was undone in [8679]. #1689 [Cheah Chu Yeow]
-
-* Time.days_in_month defaults to current year if no year is supplied as argument #10799 [Radar], uses Date.gregorian_leap? to determine leap year, and uses constant lookup to determine days in month [Geoff Buesing]
-
-* Adding Time and DateTime #compare_with_coercion, which layers behavior on #<=> so that any combination of Time, DateTime and ActiveSupport::TimeWithZone instances can be chronologically compared [Geoff Buesing]
-
-* TimeZone#now returns an ActiveSupport::TimeWithZone [Geoff Buesing]
-
-* Time #in_current_time_zone and #change_time_zone_to_current return self when Time.zone is nil [Geoff Buesing]
-
-* Remove unneeded #to_datetime_default_s alias for DateTime#to_s, given that we inherit a #to_default_s from Date that does exactly the same thing [Geoff Buesing]
-
-* Refactor Time and DateTime #to_formatted_s: use ternary instead of nested if/else [Geoff Buesing]
-
-* Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset strings with cross-platform consistency [Geoff Buesing]
-
-* Adding alternate_utc_string option to TimeZone#formatted_offset. Removing unneeded TimeZone#offset. [Geoff Buesing]
-
-* Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. [Geoff Buesing]
-
-* Replace non-dst-aware TimeZone class with dst-aware class from tzinfo_timezone plugin. TimeZone#adjust and #unadjust are no longer available; tzinfo gem must now be present in order to perform time zone calculations, via #local_to_utc and #utc_to_local methods. [Geoff Buesing]
-
-* Extract ActiveSupport::Callbacks from Active Record, test case setup and teardown, and ActionController::Dispatcher.  #10727 [Josh Peek]
-
-* Introducing DateTime #utc, #utc? and #utc_offset, for duck-typing compatibility with Time. Closes #10002 [Geoff Buesing]
-
-* Time#to_json uses Numeric#to_utc_offset_s to output a cross-platform-consistent representation without having to convert to DateTime. References #9750 [Geoff Buesing]
-
-* Refactor number-to-HH:MM-string conversion logic from TimeZone#formatted_offset to a reusable Numeric#to_utc_offset_s method. [Geoff Buesing]
-
-* Continue evolution toward ActiveSupport::TestCase.  #10679 [Josh Peek]
-
-* TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  [Jeremy Kemper]
-
-* Added ActiveSupport::Gzip.decompress/compress(source) as an easy wrapper for Zlib [Tobias Lütke]
-
-* Included MemCache-Client to make the improved ActiveSupport::Cache::MemCacheStore work out of the box [Bob Cottrell, Eric Hodel]
-
-* Added ActiveSupport::Cache::* framework as an extraction from ActionController::Caching::Fragments::* [David Heinemeier Hansson]
-
-* Fixed String#titleize to work for strings with 's too #10571 [trek]
-
-* Changed the implementation of Enumerable#group_by to use a double array approach instead of a hash such that the insert order is honored [David Heinemeier Hansson/Marcel Molina Jr.]
-
-* remove multiple enumerations from ActiveSupport::JSON#convert_json_to_yaml when dealing with date/time values.  [Rick Olson]
-
-* Hash#symbolize_keys skips keys that can't be symbolized.  #10500 [Brad Greenlee]
-
-* Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554, #10594, #10632 [Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink, Xavier Noria]
-
-* TimeZone#to_s uses UTC rather than GMT.  #1689 [Cheah Chu Yeow]
-
-* Refactor of Hash#symbolize_keys! to use Hash#replace.  Closes #10420 [ReinH]
-
-* Fix HashWithIndifferentAccess#to_options! so it doesn't clear the options hash.  Closes #10419 [ReinH]
-
-
-*2.0.1* (December 7th, 2007)
-
-* Added Array#from and Array#to that behaves just from String#from and String#to [David Heinemeier Hansson]
-
-* Fix that empty collections should be treated as empty arrays regardless of whitespace for Hash#from_xml #10255 [adamj]
-
-* Time#time_with_datetime_fallback, Time#to_datetime, Date#to_datetime and String#to_datetime honor Ruby's default calendar reform setting. #10201 [Geoff Buesing]
-
-* Change Time and DateTime #end_of_month to return last second of month instead of beginning of last day of month. Closes #10200 [Geoff Buesing]
-
-* Speedup String#blank?  [Jeremy Kemper, Michael Koziarski]
-
-* Add documentation for Hash#diff. Closes #9306 [Tarmo Tänav]
-
-* Add new superclass_delegating_accessors.  Similar to class inheritable attributes but with subtly different semantics. [Michael Koziarski, Tarmo Tänav]
-
-* Change JSON to encode %w(< > &) as 4 digit hex codes to be in compliance with the JSON spec.  Closes #9975 [Josh Peek, Cheah Chu Yeow, Tim Pope]
-
-* Fix JSON encoding/decoding bugs dealing with /'s.  Closes #9990 [Rick Olson, theamazingrando]
-
-* Introduce a base class for all test cases used by rails applications. ActiveSupport::TestCase [Michael Koziarski]
-
-  The intention is to use this to reduce the amount of monkeypatching / overriding that
-  is done to test/unit's classes.
-
-* Document Enumerable and Hash #to_json.  #9970 [Cheah Chu Yeow]
-
-* Hash#to_xml handles symbol values.  #9954 [Assaf]
-
-* Hash#symbolize_keys behaves well with integer keys.  #9890 [PotatoSalad]
-
-* Multibyte: String#slice supports regexp argument.  #9646 [yob]
-
-* object.duplicable? returns true if object.dup is safe. False for nil, true, false, symbols, and numbers; true otherwise.  #9333 [sur]
-
-* Time, Date and DateTime #advance accept :weeks option.  #9866 [Geoff Buesing]
-
-* Fix Time#years_ago and #years_since from leap days.  #9865 [Geoff Buesing]
-
-* Time and DateTime#advance accept :hours, :minutes, and :seconds options.  #9825 [Geoff Buesing]
-
-* Fix Date#years_ago and #years_since from leap days.  #9864 [Geoff Buesing]
-
-* Refactor Time and Date#months_since and #months_ago to use #advance.  #9863 [Geoff Buesing]
-
-* Rebundle Builder 2.1.2 but prefer a newer RubyGem if available.  [Jeremy Kemper]
-
-* Add Range#overlaps?(range), Range#include?(range), and Range#step without a block. [brandon]
-
-* Correct BufferedLogger#level? checks.  #9806 [wildchild, Johan Sorensen]
-
-* String#to_xs uses Eric Wong's fast_xs extension, if available, for Builder speedup.  http://bogomips.org/fast_xs/  [Jeremy Kemper]
-
-* Introduce BasicObject as Builder::BlankSlate for Ruby 1.9 forward compatibility.  [Jeremy Kemper]
-
-* Unbundle Builder in favor of a gem dependency.  [Jeremy Kemper]
-
-* Disambiguate Time, Date, and DateTime#to_json formatting.  #9750 [Geoff Buesing, Cheah Chu Yeow]
-
-* Hash#to_json takes :only or :except options to specific or omit certain hash keys. Enumerable#to_json passes through its options to each element.  #9751 [Cheah Chu Yeow]
-
-* BufferedLogger#auto_flushing = N flushes the log every N messages. Buffers with an array instead of string. Disabling auto_flushing still flushes when the buffer hits a maximum size, as a failsafe against memory-gobbling.  [Jeremy Kemper]
-
-* Fixed Date#xmlschema for dates outside the range of what can be created with Time #9744 [Geoff Buesing]
-
-* Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 #9735 [bermi]
-
-* Fixed JSON encoding to use quoted keys according to the JSON standard.  #8762 [choonkat, Cheah Chu Yeow]
-
-* Alias Object#send to send! for Ruby 1.9 forward compatibility.  [Jeremy Kemper]
-
-* Backport Object#instance_variable_defined? for Ruby < 1.8.6.  [Jeremy Kemper]
-
-* BufferedLogger#add converts the message to a string.  #9702, #9724 [eigentone, DrMark, Tom Ward]
-
-* Added ActiveSupport::BufferedLogger as a duck-typing alternative (albeit with no formatter) to the Ruby Logger, which provides a very nice speed bump (inspired by Ezra's buffered logger) [David Heinemeier Hansson]
-
-* Object#instance_exec produces fewer garbage methods.  [Mauricio Fernandez]
-
-* Decode json strings as Dates/Times if they're using a YAML-compatible format.  Closes #9614 [Rick Olson]
-
-* Fixed cache_page to use the request url instead of the routing options when picking a save path.  #8614 [Josh Peek]
-
-* Object.subclasses_of includes anonymous subclasses.  [Jeremy Kemper]
-
-* Fixed that pluralizing an empty string should return the same empty string, not "s".  #7720 [Josh Peek]
-
-* Added call to inspect on non-string classes for the logger #8533 [Coda Hale]
-
-* Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change.  [Jeremy Kemper]
-
-* Fix JSON decoder with nested quotes and commas.  #9579 [Zach Dennis]
-
-* Hash#to_xml doesn't double-unescape.  #8806 [Ezran]
-
-* Added Array#rand #9170 [Norbert Crombach]. Examples:
-
-    [].rand       # => nil
-    ['a'].rand    # => 'a'
-    [1,2,3].rand  # => 1 or 2 or 3
-
-* Deprecation: removed Reloadable.  [Jeremy Kemper]
-
-* Make the utf-handler return the correct value for non-matching regular expressions. Closes #9049 [Manfred Stienstra]
-
-* Add ljust, rjust and center to utf8-handler. Closes #9165 [Manfred Stienstra]
-
-* Fix Time#advance bug when trying to advance a year from leap day.  Closes #8655 [Geoff Buesing]
-
-* Add support for []= on ActiveSupport::Multibyte::Chars. Closes #9142. [ewan, Manfred Stienstra]
-
-* Added Array#extract_options! to encapsulate the pattern of getting an options hash out of a variable number of parameters.  #8759 [Norbert Crombach]
-
-* Let alias_attribute work with attributes with initial capital letters (legacy columns etc).  Closes #8596 [mpalmer]
-
-* Added Hash#except which is the inverse of Hash#slice -- return the hash except the keys that are specified [David Heinemeier Hansson]
-
-* Added support for pluralization with a different starting letter than the singular version (cow/kine) #4929 [norri_b/Josh Susser]
-
-* Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin.  #8453 [candlerb, Jeremy Kemper]
-
-* Backport clean_logger changes to support ruby 1.8.2 [Mislav Marohnić]
-
-* Added proper handling of arrays #8537 [Josh Susser]
-
-  Before:
-    Hash.from_xml '<images></images>'
-    # => {:images => nil}
-
-    Hash.from_xml '<images><image>foo.jpg</image></images>'
-    # => {:images => {:image => "foo.jpg"}}
-
-    Hash.from_xml '<images><image>foo.jpg</image><image>bar.jpg</image></images>'
-    # => {:images => {:image => ["foo.jpg", "bar.jpg"]}}
-
-  After:
-    Hash.from_xml '<images type="array"></images>'
-    # => {:images => []}
-
-    Hash.from_xml '<images type="array"><image>foo.jpg</image></images>'
-    # => {:images => ["foo.jpg"]}
-
-    Hash.from_xml '<images type="array"><image>foo.jpg</image><image>bar.jpg</image></images>'
-    # => {:images => ["foo.jpg", "bar.jpg"]}
-
-* Improve Time and Date test coverage.  #8646 [Josh Peek]
-
-* Add Date#since, ago, beginning_of_day, and end_of_day. Date + seconds works now.  #8575 [Geoff Buesing]
-
-* String#to_time overflows to DateTime. Add String#to_datetime.  #8572 [Geoff Buesing]
-
-* Date.yesterday and .tomorrow.  #8571 [Geoff Buesing]
-
-* Readable Date and DateTime#inspect.  #8570 [Geoff Buesing]
-
-* Move common DateTime calculations to Date.  #8536 [Geoff Buesing]
-
-* Added Date#change (like Time#change) [David Heinemeier Hansson]
-
-* DateTime#to_time converts to Time unless out of range.  #8512 [Geoff Buesing]
-
-* Date#to_datetime, #to_s(:rfc822).  #8512 [Geoff Buesing]
-
-* Time durations use since instead of + for accuracy.  #8513 [Geoff Buesing]
-
-* escape <'s and >'s in JSON strings. #8371 [Rick Olson]
-
-* Inflections: MatrixTest -> MatrixTests instead of MatricesTest.  #8496 [jbwiv]
-
-* Multibyte strings respond_to the String methods they proxy so they can be duck-typed.  #6549 [Tuxie]
-
-* Array#to_xml yields the builder just like Hash and ActiveRecord::Base.  #8472 [seth]
-
-* Date, Time, and DateTime support formatting blocks in addition to strftime strings. Introduce :long_ordinal format, e.g. "February 21st, 2005".  #8191 [Coda Hale]
-
-* Document Object#blank?.  #6491 [Chris Mear]
-
-* Date, Time, and DateTime#to_json.  #8399 [wycats]
-
-* Simplify API of assert_difference by passing in an expression that is evaluated before and after the passed in block. See documenation for examples of new API. [Marcel Molina Jr.]
-
-* Added assert_difference and assert_no_difference to test/unit assertions [Tobias Lütke]
-
-* Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [David Heinemeier Hansson]
-
-* Added parsing of file type in Hash.xml_in so you can easily do file uploads with base64 from an API [David Heinemeier Hansson]
-
-    <person>
-      <name>David</name>
-      <avatar type="file" name="me.jpg" content_type="image/jpg">R0lGODlhkACZAPUAAM5lcfjrtMQCG=\n</avatar>
-    </person>
-
-  ...becomes:
-
-    attributes = { :person => { :name => "David", :avatar => #<StringIO> } }
-    attributes[:person][:avatar].content_type      # => "image/jpg"
-    attributes[:person][:avatar].original_filename # => "me.jpg"
-    attributes[:person][:avatar].read # => binary data of the file
-
-  Which is duck-type compatible with the files that you get when doing multipart uploads through HTML.
-
-* Improved multibyte performance by relying less on exception raising #8159 [Blaine]
-
-* Use XSD-compatible type names for Hash#to_xml and make the converters extendable #8047 [Tim Pope]
-
-* Added yielding of builder in Hash#to_xml [David Heinemeier Hansson]
-
-* Hash#with_indifferent_access now also converts hashes kept in arrays to indifferent access (makes it easier to treat HTML and XML parameters the same) [David Heinemeier Hansson]
-
-* Hash#to_xml supports YAML attributes.  #7502 [jonathan]
-
-* Refactor ActiveSupport::JSON to be less obtuse.  Add support for JSON decoding by way of Syck with ActiveSupport::JSON.decode(json_string).  Prevent hash keys that are JavaScript reserved words from being unquoted during encoding.  [Sam Stephenson]
-
-* alias_method_chain preserves the original method's visibility.  #7854 [Jonathan Viney]
-
-* Update Dependencies to ignore constants inherited from ancestors. Closes #6951. [Nicholas Seckar]
-
-* Array#to_query preserves its ordering.  #7756 [Greg Spurrier]
-
-* Out-of-range Time calculations transparently overflow to DateTime. Introduce Time#to_datetime.  #7706, #7715 [Geoff Buesing]
-
-* DateTime calculations analogous to the Date and Time extensions.  #7693 [Geoff Buesing]
-
-* Give DateTime correct .to_s implementations, lets it play nice with ActiveRecord quoting.  #7649 [Geoff Buesing]
-
-* Add File.atomic_write,  allows you to write large files in an atomic manner, preventing users from seeing half written files.  [Michael Koziarski]
-
-* Allow users to provide custom formatters to Logger. [Anthony Eden]
-
-* Hash#to_query CGI-escapes its keys.  [Jeremy Kemper]
-
-* Optimize Class Inheritable Attributes so that unnecessary hashes are not created.  Closes #7472 [Bruce Perens]
-
-* :db format for Date#to_s [Jeremy Kemper]
-    Date.new(2007, 1, 27).to_s(:db) # => '2007-01-27'
-
-* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick Olson]
-
-* Added Hash#to_query to turn a hash of values into a form-encoded query string [Nicholas Seckar]
-
-* Increase test coverage for subclasses_of. Closes #7335. [Roman2K, Nicholas Seckar]
-
-* Remove unused code from Duration#inspect.  Closes #7180.  [Rich Collins]
-
-* Added test coverage for Inflector.inflections.clear.  Closes #7179. [Rich Collins]
-
-* ActiveSupport::Multibyte::Handlers::UTF8Handler should raise when a range and an integer are passed in (just like the native implementation).  Closes #7176 [Rich Collins]
-
-* A couple extra tests for #classify.  Closes #7273. [Josh Susser]
-
-* Better docs for Object extensions [zackchandler, Jamis Buck]
-
-* Fix that Dates couldn't be subtracted from Dates after [5940].  [Sam Stephenson]
-
-* Add Object#acts_like? and Time#acts_like_time? and Date#acts_like_date? to facilitate duck-typing. [Jamis Buck]
-
-* Make 1.months and friends accurate by introducing a Duration class.  #6835 [eventualbuddha]
-
-
-*1.4.2* (March 12th, 2007)
-
-* Ruby 1.8.6 and 1.9 define private Time#to_date and #to_datetime; make them
-public for compatibility.  [Jeremy Kemper]
-
-* Deprecation: warn on stderr if RAILS_DEFAULT_LOGGER isn't set yet.  [Jeremy Kemper]
-
-
-*1.4.1* (February 5th, 2007)
-
-* Optimize Class Inheritable Attributes so that unnecessary hashes are not created.  Closes #7472 [Bruce Perens]
-
-* Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  [Rick Olson]
-
-* Full test coverage for Inflector.  #7228 [Dan Kubb]
-
-
-*1.4.0* (January 16th, 2007)
-
-* Document Inflector.ordinalize and merge docs from String inflections.  #7023 [smeade]
-
-* Unbundle flexmock.  [Jeremy Kemper]
-
-* Fix Dependencies.autoloaded? to ignore anonymous modules. Closes #6561. [Nicholas Seckar]
-
-* Update load once paths to prevent nested once constants from being detected and claimed by an external non-once load. [Nicholas Seckar]
-
-* Deprecation: silence warnings when reporting test errors.  [Jeremy Kemper]
-
-* Hash#slice(*keys) returns a new hash with only the given keys. #slice! replaces the hash with only the given keys. Works with HashWithIndifferentAccess also.  [Jeremy Kemper]
-
-* HashWithIndifferentAccess#to_hash converts to a Hash with String keys and the same default value.  [Jeremy Kemper]
-
-* Fix remove_constant to correctly handle constant names of the form "::A::...". References #6720. [Nicholas Seckar]
-
-* Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) #6610 [thkarcher/cyu]
-
-* Added Time#to_s(:time) which will just return H:M, like 17:44 [David Heinemeier Hansson]
-
-* Add Module#attr_accessor_with_default to initialize value of attribute before setting it. Closes #6538. [Stuart Halloway, Marcel Molina Jr.]
-
-* Hash#to_xml handles keys with the same name as Kernel methods.  #6613 [Jonathan del Strother]
-
-* Added Time#end_of_day to get 23:59:59 of that day [David Heinemeier Hansson]
-
-* Don't quote hash keys in Hash#to_json if they're valid JavaScript identifiers.  Disable this with ActiveSupport::JSON.unquote_hash_key_identifiers = false if you need strict JSON compliance. [Sam Stephenson]
-
-* Lazily load the Unicode Database in the UTF-8 Handler [Rick Olson]
-
-* Update dependencies to delete partially loaded constants. [Nicholas Seckar]
-
-* Fix unicode JSON regexp for Onigurama compatibility.  #6494 [whitley]
-
-* update XmlSimple to 1.0.10. Closes #6532. [Nick Sieger]
-
-* Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. [Nicholas Seckar]
-
-* next_week respects DST changes.  #6483, #5617, #2353, #2509, #4551 [marclove, Rob Biedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net]
-
-* Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. [sergeykojin@gmail.com, Marcel Molina Jr.]
-
-* Ensure Chars#tidy_bytes only tidies broken bytes. Closes #6397 [Manfred Stienstra]
-
-* Add 'unloadable', a method used to mark any constant as requiring an unload after each request. [Nicholas Seckar]
-
-* Make core_ext/string/access.rb multibyte safe. Closes #6388 [Manfred Stienstra]
-
-* Make String#chars slicing behaviour consistent with String. Closes #6387 [Manfred Stienstra]
-
-* Pull in latest multibyte patch. Closes #6346 [Manfred Stienstra]
-
-* Add ActiveSupport::Multibyte.  Provides String#chars which lets you deal with strings as a sequence of chars, not of bytes. Closes #6242 [Julian Tarkhanov, Manfred Stienstra, Thijs van der Vossen & Jan Behrens]
-
-* Fix issue with #class_inheritable_accessor saving updates to the parent class when initialized with an Array or Hash [mojombo]
-
-* Hash#to_xml supports Bignum and BigDecimal.  #6313 [edibiase]
-
-* Don't undefine #class in OptionMerger [Rick Olson]
-
-* Hash.create_from_xml has been renamed to Hash.from_xml, alias will exist until Rails 2.0 [David Heinemeier Hansson]
-
-* alias_method_chain works with accessor= methods also.  #6153 [Caio Chassot]
-
-* Fix loadable_constants_for_path to handle load paths that do not end with a slash. [Nicholas Seckar]
-
-* Fix logic error in determining what was loaded by a given file. Closes #6039. [Nicholas Seckar]
-
-* Equate Kernel.const_missing with Object.const_missing. Fixes #5988. [Nicholas Seckar]
-
-* Add ApplicationController special case to Dependencies. [Nicholas Seckar]
-
-* Don't pad remaining places with in_groups_of if specified padding value is false. [Marcel Molina Jr.]
-
-* Fix cases where empty xml nodes weren't being translated to nil in Hash.create_from_xml [Rick Olso n]
-
-  <written-on type="date"></written-on> # => { :type => 'date' } # WRONG
-  <written-on type="date"></written-on> # => nil # RIGHT
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]
-
-* Inflections: don't singularize -ies plurals.  [foamdino@gmail.com, Mark Van Holstyn]
-
-* Update Initializer to use load_once_paths to avoid plugin reloading. References #5852. [Nicholas Seckar]
-
-* Use Array#assoc in ActiveSupport::OrderedHash. [Mauricio Fernandez]
-
-* Greatly increased performance of String.to_json, which speeds up RJS considerably on large pages, fixes #3473 [Shugo Maeda]
-
-* Detect missing_constants calls from removed modules and fail accordingly. [Nicholas Seckar]
-
-* Stop using defined? in Dependencies.qualified_const_defined? since defined? may invoke const_missing. [Nicholas Seckar]
-
-* Dependencies can autoload directories of nested classes. [Jeremy Kemper]
-    Example:
-      invoice.rb            class Invoice
-      invoice/lineitem.rb   class Invoice::Lineitem
-
-* Add Deprecation.silence so that Reloadable does not scold itself. [Nicholas Seckar]
-
-* Add debugging logging to Dependencies. Currently can be enabled with Dependencies.log_activity = true; adding to Initializer and documenting is forthcoming. [Nicholas Seckar]
-
-* Replace Reloadable with improvements to the Dependencies mechanism. [Nicholas Seckar]
-
-* DateTime#to_time gives hour/minute/second resolution.  #5747 [jon.evans@pobox.com]
-
-* attr_internal to support namespacing and deprecation. Like attr_* except backed by internally-named instance variable. Set attr_internal_naming_format to change the format from the default '@_%s'. [Jeremy Kemper]
-    # def foo()   @foo__rofl      end
-    # def foo=(v) @foo__rofl = v  end
-    self.attr_internal_naming_format = '@%s__rofl'
-    attr_internal :foo
-
-* Raise fully qualified names upon name errors. #5533 [Lars Pind, Nicholas Seckar]
-
-* Add extention to obtain the missing constant from NameError instances. [Nicholas Seckar]
-
-* Thoroughly document inflections.  #5700 [petermichaux@gmail.com]
-
-* Added Module#alias_attribute [Jamis/David Heinemeier Hansson]. Example:
-
-    class Content < ActiveRecord::Base
-      # has a title attribute
-    end
-
-    class Email < ActiveRecord::Base
-      alias_attribute :subject, :title
-    end
-
-    e = Email.find(1)
-    e.title    # => "Superstars"
-    e.subject  # => "Superstars"
-    e.subject? # => true
-    e.subject = "Megastars"
-    e.title    # => "Megastars"
-
-* Deprecation: easier to work with warning behavior as procs; default behaviors for each environment so users needn't update env.rb; and testing pleasure with assert_deprecated, assert_not_deprecated. [Jeremy Kemper]
-  By default, test prints to $stderr, dev logs, production ignores.
-  Provide your own per-environment in e.g. config/environments/development.rb:
-    ActiveSupport::Deprecation.behavior = Proc.new { |message| raise message }
-
-* First cut of the Rails Deprecation system.   [Michael Koziarski]
-
-* Strip boolean XML content before checking for 'true' [Rick Olson]
-
-* Customize default BigDecimal formatting. References #5672 [Dave Thomas]
-
-* Correctly convert <foo nil="true"> to nil when using Hash.create_from_xml.  [Rick Olson]
-
-* Optional identity for Enumerable#sum defaults to zero. #5657 [gensym@mac.com]
-
-* HashWithIndifferentAccess shouldn't confuse false and nil. #5601 [Shugo Maeda]
-
-* Fixed HashWithIndifferentAccess#default #5586 [chris@seagul.co.uk]
-
-* More compatible Hash.create_from_xml. #5523 [nunemaker@gmail.com]
-
-* Added Enumerable#sum for calculating a sum from the elements [David Heinemeier Hansson, jonathan@daikini.com]. Examples:
-
-    [1, 2, 3].sum
-    payments.sum { |p| p.price * p.tax_rate }
-    payments.sum(&:price)
-
-  This is instead of payments.inject(0) { |sum, p| sum + p.price }
-
-* Correct and clarify Array#to_sentence docs.  #5458 [brad@madriska.com]
-
-* alias_method_chain preserves method punctuation so foo, foo?, and foo! may be chained with the same feature. [Jeremy Kemper]
-    Example:
-      alias_method_chain :save!, :validation
-    is equivalent to
-      alias_method :save_without_validation!, :save!
-      alias_method :save!, :save_with_validation!
-
-* Enhance Symbol#to_proc so it works with list objects, such as multi-dimensional arrays. Closes #5295 [nov@yo.rim.or.jp].  Example:
-
-    {1 => "one", 2 => "two", 3 => "three"}.sort_by(&:first).map(&:last)
-    # => ["one", "two", "three"]
-
-* Added Hash.create_from_xml(string) which will create a hash from a XML string and even typecast if possible [David Heinemeier Hansson]. Example:
-
-    Hash.create_from_xml <<-EOT
-      <note>
-        <title>This is a note</title>
-        <created-at type="date">2004-10-10</created-at>
-      </note>
-    EOT
-
-  ...would return:
-
-    { :note => { :title => "This is a note", :created_at => Date.new(2004, 10, 10) } }
-
-* Added Jim Weirich's excellent FlexMock class to vendor (Copyright 2003, 2004 by Jim Weirich (jim@weriichhouse.org)) -- it's not automatically required, though, so require 'flexmock' is still necessary [David Heinemeier Hansson]
-
-* Fixed that Module#alias_method_chain should work with both foo? foo! and foo at the same time #4954 [anna@wota.jp]
-
-* to_xml fixes, features, and speedup: introduce :dasherize option that converts updated_at to updated-at if true (the existing default); binary columns get encoding="base64" attribute; nil values get nil="true" attribute to distinguish empty values; add type information for float columns; allow arbitrarily deep :include; include SQL type information as the type attribute.  #4989 [Blair Zajac <blair@orcaware.com>]
-
-* Add OrderedHash#values. [Sam Stephenson]
-
-* Added Array#to_s(:db) that'll produce a comma-separated list of ids [David Heinemeier Hansson]. Example:
-
-    Purchase.find(:all, :conditions => "product_id IN (#{shops.products.to_s(:db)})"
-
-* Normalize classify's argument to a String so that it plays nice with Symbols. [Marcel Molina Jr.]
-
-* Strip out leading schema name in classify. References #5139. [Michael Schoen]
-
-* Remove Enumerable#first_match since break(value) handles the use case well enough. [Nicholas Seckar]
-
-  Enumerable#first_match was like detect, but instead of returning the matching element, the yielded value returned. For example:
-
-    user_xml = adapters(:from => User, :to => Xml).first_match do |adapter|
-      adapter.adapt @user
-    end
-
-  But this is just as easily done with:
-
-    user_xml = adapters(:from => User, :to => Xml).each do
-      break adapter.adapt(@user)
-    end
-
-* Make Array#in_groups_of just return the grouped collection if a block isn't given. [Marcel Molina Jr.]
-
-* Don't destroy a HashWithIndifferentAccess if symbolize_keys! or  stringify_keys! is called on it. Closes #5076. [Marcel Molina Jr., guy.naor@famundo.com]
-
-* Document Module::delegate. #5002 [pergesu@gmail.com]
-
-* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
-
-* Strip out punctuation on predicates or bang methods being aliased with alias_method_chain since target?_without_feature is not a valid method name. Add tests for Module#alias_method_chain. [Marcel Molina Jr.]
-
-* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
-
-* Allow default options in with_options to be overridden. Closes #4480. [murphy@cYcnus.de]
-
-* Added Module#alias_method_chain [Jamis Buck]
-
-* Updated to Builder 2.0 [David Heinemeier Hansson]
-
-* Add Array#split for dividing arrays into one or more subarrays by value or block. [Sam Stephenson]
-
-*1.3.1* (April 6th, 2006)
-
-* Clean paths inside of exception messages and traces. [Nicholas Seckar]
-
-* Add Pathname.clean_within for cleaning all the paths inside of a string. [Nicholas Seckar]
-
-* provide an empty Dependencies::LoadingModule.load which prints deprecation warnings.  Lets 1.0 applications function with .13-style environment.rb.
-
-
-*1.3.0* (March 27th, 2006)
-
-* When possible, avoid incorrectly obtaining constants from parent modules. Fixes #4221. [Nicholas Seckar]
-
-* Add more tests for dependencies; refactor existing cases. [Nicholas Seckar]
-
-* Move Module#parent and Module#as_load_path into core_ext. Add Module#parent. [Nicholas Seckar]
-
-* Add CachingTools::HashCaching to simplify the creation of nested, autofilling hashes. [Nicholas Seckar]
-
-* Remove a hack intended to avoid unloading the same class twice, but which would not work anyways. [Nicholas Seckar]
-
-* Update Object.subclasses_of to locate nested classes. This affects Object.remove_subclasses_of in that nested classes will now be unloaded. [Nicholas Seckar]
-
-* Update Object.remove_subclasses_of to use Class.remove_class, reducing duplication. [Nicholas Seckar]
-
-* Added Fixnum#seconds for consistency, so you can say 5.minutes + 30.seconds instead of 5.minutes + 30 #4389 [François Beausoleil]
-
-* Added option to String#camelize to generate lower-cased camel case by passing in :lower, like "super_man".camelize(:lower) # => "superMan" [David Heinemeier Hansson]
-
-* Added Hash#diff to show the difference between two hashes [Chris McGrath]
-
-* Added Time#advance to do precise time time calculations for cases where a month being approximated to 30 days won't do #1860 [Rick Olson]
-
-* Enhance Inflector.underscore to convert '-' into '_' (as the inverse of Inflector.dasherize) [Jamis Buck]
-
-* Switched to_xml to use the xml schema format for datetimes.  This allows the encoding of time zones and should improve operability. [Michael Koziarski]
-
-* Added a note to the documentation for the Date related Numeric extensions to indicate that they're
-approximations and shouldn't be used for critical calculations. [Michael Koziarski]
-
-* Added Hash#to_xml and Array#to_xml that makes it much easier to produce XML from basic structures [David Heinemeier Hansson]. Examples:
-
-    { :name => "David", :street_name => "Paulina", :age => 26, :moved_on => Date.new(2005, 11, 15) }.to_xml
-
-  ...returns:
-
-      <person>
-        <street-name>Paulina</street-name>
-        <name>David</name>
-        <age type="integer">26</age>
-        <moved-on type="date">2005-11-15</moved-on>
-      </person>
-
-* Moved Jim Weirich's wonderful Builder from Action Pack to Active Support (it's simply too useful to be stuck in AP) [David Heinemeier Hansson]
-
-* Fixed that Array#to_sentence will return "" on an empty array instead of ", and" #3842, #4031 [rubyonrails@beautifulpixel.com]
-
-* Add Enumerable#group_by for grouping collections based on the result of some
-  block. Useful, for example, for grouping records by date.
-
-  ex.
-
-     latest_transcripts.group_by(&:day).each do |day, transcripts|
-       p "#{day} -> #{transcripts.map(&:class) * ', '}"
-     end
-     "2006-03-01 -> Transcript"
-     "2006-02-28 -> Transcript"
-     "2006-02-27 -> Transcript, Transcript"
-     "2006-02-26 -> Transcript, Transcript"
-
-  Add Array#in_groups_of, for iterating over an array in groups of a certain
-  size.
-
-  ex.
-
-     %w(1 2 3 4 5 6 7).in_groups_of(3) {|g| p g}
-     ["1", "2", "3"]
-     ["4", "5", "6"]
-     ["7", nil, nil]
-
-  [Marcel Molina Jr., Sam Stephenson]
-
-* Added Kernel#daemonize to turn the current process into a daemon that can be killed with a TERM signal [David Heinemeier Hansson]
-
-* Add 'around' methods to Logger,  to make it easy to log before and after messages for a given block as requested in #3809. [Michael Koziarski]  Example:
-
-  logger.around_info("Start rendering component (#{options.inspect}): ",
-                     "\n\nEnd of component rendering") { yield }
-
-* Added Time#beginning_of_quarter #3607 [cohen.jeff@gmail.com]
-
-* Fix Object.subclasses_of to only return currently defined objects [Jonathan Viney <jonathan@bluewire.net.nz>]
-
-* Fix constantize to properly handle names beginning with '::'. [Nicholas Seckar]
-
-* Make String#last return the string instead of nil when it is shorter than the limit [Scott Barron].
-
-* Added delegation support to Module that allows multiple delegations at once (unlike Forwardable in the stdlib) [David Heinemeier Hansson]. Example:
-
-    class Account < ActiveRecord::Base
-      has_one :subscription
-      delegate :free?, :paying?, :to => :subscription
-      delegate :overdue?, :to => "subscription.last_payment"
-    end
-
-    account.free?    # => account.subscription.free?
-    account.overdue? # => account.subscription.last_payment.overdue?
-
-* Fix Reloadable to handle the case where a class that has been 'removed' has not yet been garbage collected. [Nicholas Seckar]
-
-* Don't allow Reloadable to be included into Modules.
-
-* Remove LoadingModule. [Nicholas Seckar]
-
-* Add documentation for Reloadable::Subclasses. [Nicholas Seckar]
-
-* Add Reloadable::Subclasses which handles the common case where a base class should not be reloaded, but its subclasses should be. [Nicholas Seckar]
-
-* Further improvements to reloading code [Nicholas Seckar, Trevor Squires]
-
-  - All classes/modules which include Reloadable can define reloadable? for fine grained control of reloading
-  - Class.remove_class uses Module#parent to access the parent module
-  - Class.remove_class expanded to handle multiple classes in a single call
-  - LoadingModule.clear! has been removed as it is no longer required
-  - Module#remove_classes_including has been removed in favor of Reloadable.reloadable_classes
-
-* Added reusable reloading support through the inclusion of the Relodable module that all subclasses of ActiveRecord::Base, ActiveRecord::Observer, ActiveController::Base, and ActionMailer::Base automatically gets. This means that these classes will be reloaded by the dispatcher when Dependencies.mechanism = :load. You can make your own models reloadable easily:
-
-    class Setting
-      include Reloadable
-    end
-
-  Reloading a class is done by removing its constant which will cause it to be loaded again on the next reference. [David Heinemeier Hansson]
-
-* Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb [Nicholas Seckar]
-
-* Add Object#instance_exec, like instance_eval but passes its arguments to the block.  (Active Support will not override the Ruby 1.9 implementation of this method.) [Sam Stephenson]
-
-* Add Proc#bind(object) for changing a proc or block's self by returning a Method bound to the given object. Based on why the lucky stiff's "cloaker" method. [Sam Stephenson]
-
-* Fix merge and dup for hashes with indifferent access #3404 [Ken Miller]
-
-* Fix the requires in option_merger_test to unbreak AS tests. [Sam Stephenson]
-
-* Make HashWithIndifferentAccess#update behave like Hash#update by returning the hash. #3419, #3425 [asnem@student.ethz.ch, JanPrill@blauton.de, Marcel Molina Jr.]
-
-* Add ActiveSupport::JSON and Object#to_json for converting Ruby objects to JSON strings. [Sam Stephenson]
-
-* Add Object#with_options for DRYing up multiple calls to methods having shared options. [Sam Stephenson]  Example:
-
-  ActionController::Routing::Routes.draw do |map|
-    # Account routes
-    map.with_options(:controller => 'account') do |account|
-      account.home   '',       :action => 'dashboard'
-      account.signup 'signup', :action => 'new'
-      account.logout 'logout', :action => 'logout'
-    end
-  end
-
-* Introduce Dependencies.warnings_on_first_load setting.  If true, enables warnings on first load of a require_dependency.  Otherwise, loads without warnings.  Disabled (set to false) by default.  [Jeremy Kemper]
-
-* Active Support is warnings-safe.  #1792 [Eric Hodel]
-
-* Introduce enable_warnings counterpart to silence_warnings.  Turn warnings on when loading a file for the first time if Dependencies.mechanism == :load.  Common mistakes such as redefined methods will print warnings to stderr.  [Jeremy Kemper]
-
-* Add Symbol#to_proc, which allows for, e.g. [:foo, :bar].map(&:to_s). [Marcel Molina Jr.]
-
-* Added the following methods [Marcel Molina Jr., Sam Stephenson]:
-  * Object#copy_instance_variables_from(object) to copy instance variables from one object to another
-  * Object#extended_by to get an instance's included/extended modules
-  * Object#extend_with_included_modules_from(object) to extend an instance with the modules from another instance
-
-*1.2.5* (December 13th, 2005)
-
-* Become part of Rails 1.0
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-*1.2.3* (November 7th, 2005)
-
-* Change Inflector#constantize to use eval instead of const_get. [Nicholas Seckar]
-
-* Fix const_missing handler to ignore the trailing '.rb' on files when comparing paths. [Nicholas Seckar]
-
-* Define kernel.rb methods in "class Object" instead of "module Kernel" to work around a Windows peculiarity [Sam Stephenson]
-
-* Fix broken tests caused by incomplete loading of active support. [Nicholas Seckar]
-
-* Fix status pluralization bug so status_codes doesn't get pluralized as statuses_code.  #2758 [keithm@infused.org]
-
-* Added Kernel#silence_stderr to silence stderr for the duration of the given block [Sam Stephenson]
-
-* Changed Kernel#` to print a message to stderr (like Unix) instead of raising Errno::ENOENT on Win32 [Sam Stephenson]
-
-* Changed 0.blank? to false rather than true since it violates everyone's expectation of blankness.  #2518, #2705 [rails@jeffcole.net]
-
-* When loading classes using const_missing, raise a NameError if and only if the file we tried to load was not present. [Nicholas Seckar]
-
-* Added petabytes and exebytes to numeric extensions #2397 [timct@mac.com]
-
-* Added Time#end_of_month to accompany Time#beginning_of_month #2514 [Jens-Christian Fischer]
-
-
-*1.2.2* (October 26th, 2005)
-
-* Set Logger.silencer = false to disable Logger#silence.  Useful for debugging fixtures.
-
-* Add title case method to String to do, e.g., 'action_web_service'.titlecase #  => 'Action Web Service'. [Marcel Molina Jr.]
-
-
-*1.2.1* (October 19th, 2005)
-
-* Classify generated routing code as framework code to avoid appearing in application traces. [Nicholas Seckar]
-
-* Show all framework frames in the framework trace. [Nicholas Seckar]
-
-
-*1.2.0* (October 16th, 2005)
-
-* Update Exception extension to show the first few framework frames in an application trace. [Nicholas Seckar]
-
-* Added Exception extension to provide support for clean backtraces. [Nicholas Seckar]
-
-* Updated whiny nil to be more concise and useful. [Nicholas Seckar]
-
-* Added Enumerable#first_match [Nicholas Seckar]
-
-* Fixed that Time#change should also reset usec when also resetting minutes #2459 [ikeda@dream.big.or.jp]
-
-* Fix Logger compatibility for distributions that don't keep Ruby and its standard library in sync.
-
-* Replace '%e' from long and short time formats as Windows does not support it. #2344. [Tom Ward <tom@popdog.net>]
-
-* Added to_s(:db) to Range, so you can get "BETWEEN '2005-12-10' AND '2005-12-12'" from Date.new(2005, 12, 10)..Date.new(2005, 12, 12) (and likewise with Times)
-
-* Moved require_library_or_gem into Kernel. #1992 [Michael Schuerig <michael@schuerig.de>]
-
-* Add :rfc822 as an option for Time#to_s (to get rfc822-formatted times)
-
-* Chain the const_missing hook to any previously existing hook so rails can play nicely with rake
-
-* Clean logger is compatible with both 1.8.2 and 1.8.3 Logger.  #2263 [Michael Schuerig <michael@schuerig.de>]
-
-* Added native, faster implementations of .blank? for the core types #2286 [skae]
-
-* Fixed clean logger to work with Ruby 1.8.3 Logger class #2245
-
-* Fixed memory leak with Active Record classes when Dependencies.mechanism = :load #1704 [Chris McGrath]
-
-* Fixed Inflector.underscore for use with acronyms, so HTML becomes html instead of htm_l #2173 [k@v2studio.com]
-
-* Fixed dependencies related infinite recursion bug when a controller file does not contain a controller class. Closes #1760. [rcolli2@tampabay.rr.com]
-
-* Fixed inflections for status, quiz, move #2056 [deirdre@deirdre.net]
-
-* Added Hash#reverse_merge, Hash#reverse_merge!, and Hash#reverse_update to ease the use of default options
-
-* Added Array#to_sentence that'll turn ['one', 'two', 'three'] into "one, two, and three" #2157 [Manfred Stienstra]
-
-* Added Kernel#silence_warnings to turn off warnings temporarily for the passed block
-
-* Added String#starts_with? and String#ends_with? #2118 [Thijs van der Vossen]
-
-* Added easy extendability to the inflector through Inflector.inflections (using the Inflector::Inflections singleton class). Examples:
-
-    Inflector.inflections do |inflect|
-      inflect.plural /^(ox)$/i, '\1\2en'
-      inflect.singular /^(ox)en/i, '\1'
-
-      inflect.irregular 'octopus', 'octopi'
-
-      inflect.uncountable "equipment"
-    end
-
-* Added String#at, String#from, String#to, String#first, String#last in ActiveSupport::CoreExtensions::String::Access to ease access to individual characters and substrings in a string serving basically as human names for range access.
-
-* Make Time#last_month work when invoked on the 31st of a month.
-
-* Add Time.days_in_month, and make Time#next_month work when invoked on the 31st of a month
-
-* Fixed that Time#midnight would have a non-zero usec on some platforms #1836
-
-* Fixed inflections of "index/indices" #1766 [damn_pepe@gmail.com]
-
-* Added stripping of _id to String#humanize, so "employee_id" becomes "Employee" #1574 [Justin French]
-
-* Factor Fixnum and Bignum extensions into Integer extensions [Nicholas Seckar]
-
-* Hooked #ordinalize into Fixnum and Bignum classes. [Nicholas Seckar, danp]
-
-* Added Fixnum#ordinalize to turn 1.ordinalize to "1st", 3.ordinalize to "3rd", and 10.ordinalize to "10th" and so on #1724 [paul@cnt.org]
-
-
-*1.1.1* (11 July, 2005)
-
-* Added more efficient implementation of the development mode reset of classes #1638 [Chris McGrath]
-
-
-*1.1.0* (6 July, 2005)
-
-* Fixed conflict with Glue gem #1606 [Rick Olson]
-
-* Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, virus => viri, archive => archives #1571, #1583, #1490, #1599, #1608 [foamdino@gmail.com/others]
-
-* Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 [Chris McGrath]
-
-* Made 1.year == 365.25.days to account for leap years.  This allows you to do User.find(:all, :conditions => ['birthday > ?', 50.years.ago]) without losing a lot of days.  #1488 [tuxie@dekadance.se]
-
-* Added an exception if calling id on nil to WhinyNil #584 [kevin-temp@writesoon.com]
-
-* Added Fix/Bignum#multiple_of? which returns true on 14.multiple_of?(7) and false on 16.multiple_of?(7) #1464 [Thomas Fuchs]
-
-* Added even? and odd? to work with Bignums in addition to Fixnums #1464 [Thomas Fuchs]
-
-* Fixed Time#at_beginning_of_week returned the next Monday instead of the previous one when called on a Sunday #1403 [jean.helou@gmail.com]
-
-* Increased the speed of indifferent hash access by using Hash#default.  #1436 [Nicholas Seckar]
-
-* Added that "   " is now also blank? (using strip if available)
-
-* Fixed Dependencies so all modules are able to load missing constants #1173 [Nicholas Seckar]
-
-* Fixed the Inflector to underscore strings containing numbers, so Area51Controller becomes area51_controller #1176 [Nicholas Seckar]
-
-* Fixed that HashWithIndifferentAccess stringified all keys including symbols, ints, objects, and arrays #1162 [Nicholas Seckar]
-
-* Fixed Time#last_year to go back in time, not forward #1278 [fabien@odilat.com]
-
-* Fixed the pluralization of analysis to analyses #1295 [seattle@rootimage.msu.edu]
-
-* Fixed that Time.local(2005,12).months_since(1) would raise "ArgumentError: argument out of range" #1311 [jhahn@niveon.com]
-
-* Added silencing to the default Logger class
-
-
-*1.0.4* (19th April, 2005)
-
-* 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]
-
-* Fixed inflection of perspectives and similar words #1045 [Thijs van der Vossen]
-
-* Added Fixnum#even? and Fixnum#odd?
-
-* Fixed problem with classes being required twice. Object#const_missing now uses require_dependency to load files. It used to use require_or_load which would cause models to be loaded twice, which was not good for validations and other class methods #971 [Nicholas Seckar]
-
-
-*1.0.3* (27th March, 2005)
-
-* Fixed Inflector.pluralize to handle capitalized words #932 [Jeremy Kemper]
-
-* Added Object#suppress which allows you to make a saner choice around with exceptions to swallow #980. Example:
-
-    suppress(ZeroDivisionError) { 1/0 }
-
-  ...instead of:
-
-    1/0 rescue nil # BAD, EVIL, DIRTY.
-
-
-*1.0.2* (22th March, 2005)
-
-* Added Kernel#returning -- a Ruby-ized realization of the K combinator, courtesy of Mikael Brockman.
-
-    def foo
-      returning values = [] do
-        values << 'bar'
-        values << 'baz'
-      end
-    end
-
-    foo # => ['bar', 'baz']
-
-
-*1.0.1* (7th March, 2005)
-
-* Fixed Hash#indifferent_access to also deal with include? and fetch and nested hashes #726 [Nicholas Seckar]
-
-* Added Object#blank? -- see http://redhanded.hobix.com/inspect/objectBlank.html #783 [_why the lucky stiff]
-
-* Added inflection rules for "sh" words, like "wish" and "fish" #755 [phillip@pjbsoftware.com]
-
-* Fixed an exception when using Ajax based requests from Safari because Safari appends a \000 to the post body. Symbols can't have \000 in them so indifferent access would throw an exception in the constructor. Indifferent hashes now use strings internally instead. #746 [Tobias Lütke]
-
-* Added String#to_time and String#to_date for wrapping ParseDate
-
-
-*1.0.0* (24th February, 2005)
-
-* Added TimeZone as the first of a number of value objects that among others Active Record can use rich value objects using composed_of #688 [Jamis Buck]
-
-* Added Date::Conversions for getting dates in different convenient string representations and other objects
-
-* Added Time::Conversions for getting times in different convenient string representations and other objects
-
-* Added Time::Calculations to ask for things like Time.now.tomorrow, Time.now.yesterday, Time.now.months_ago(4) #580 [DP|Flurin]. Examples:
-
-    "Later today"         => now.in(3.hours),
-    "Tomorrow morning"    => now.tomorrow.change(:hour => 9),
-    "Tomorrow afternoon"  => now.tomorrow.change(:hour => 14),
-    "In a couple of days" => now.tomorrow.tomorrow.change(:hour => 9),
-    "Next monday"         => now.next_week.change(:hour => 9),
-    "In a month"          => now.next_month.change(:hour => 9),
-    "In 6 months"         => now.months_since(6).change(:hour => 9),
-    "In a year"           => now.in(1.year).change(:hour => 9)
-
-* Upgraded to breakpoint 92 which fixes:
-
-    * overload IRB.parse_opts(), fixes #443
-      => breakpoints in tests work even when running them via rake
-    * untaint handlers, might fix an issue discussed on the Rails ML
-    * added verbose mode to breakpoint_client
-    * less noise caused by breakpoint_client by default
-    * ignored TerminateLineInput exception in signal handler
-      => quiet exit on Ctrl-C
-
-* Fixed Inflector for words like "news" and "series" that are the same in plural and singular #603 [echion], #615 [marcenuc]
-
-* Added Hash#stringify_keys and Hash#stringify_keys!
-
-* Added IndifferentAccess as a way to wrap a hash by a symbol-based store that also can be accessed by string keys
-
-* Added Inflector.constantize to turn "Admin::User" into a reference for the constant Admin::User
-
-* Added that Inflector.camelize and Inflector.underscore can deal with modules like turning "Admin::User" into "admin/user" and back
-
-* Added Inflector.humanize to turn attribute names like employee_salary into "Employee salary". Used by automated error reporting in AR.
-
-* Added availability of class inheritable attributes to the masses #477 [Jeremy Kemper]
-
-    class Foo
-      class_inheritable_reader :read_me
-      class_inheritable_writer :write_me
-      class_inheritable_accessor :read_and_write_me
-      class_inheritable_array :read_and_concat_me
-      class_inheritable_hash :read_and_update_me
-    end
-
-    # Bar gets a clone of (not a reference to) Foo's attributes.
-    class Bar < Foo
-    end
-
-    Bar.read_and_write_me == Foo.read_and_write_me
-    Bar.read_and_write_me = 'bar'
-    Bar.read_and_write_me != Foo.read_and_write_me
-
-* Added Inflections as an extension on String, so Inflector.pluralize(Inflector.classify(name)) becomes name.classify.pluralize #476 [Jeremy Kemper]
-
-* Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 [Marcel Molina Jr.]
-
-* Fixed that Dependencies.reload can't load the same file twice #420 [Kent Sibilev]
-
-* Added Fixnum#ago/until, Fixnum#since/from_now #450 [Jeremy Kemper]
-
-* Added that Inflector now accepts Symbols and Classes by calling .to_s on the word supplied
-
-* Added time unit extensions to Fixnum that'll return the period in seconds, like 2.days + 4.hours.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
new file mode 100644
index 0000000000..ad3828d5e8
--- /dev/null
+++ b/activesupport/CHANGELOG.md
@@ -0,0 +1,1571 @@
+## Rails 3.2.0 (unreleased) ##
+
+*   Module#qualified_const_(defined?|get|set) are analogous to the corresponding methods
+    in the standard API, but accept qualified constant names. *fxn*
+
+*   Added inflection #deconstantize which complements #demodulize. This inflection
+    removes the righmost segment in a qualified constant name. *fxn*
+
+*   Added ActiveSupport:TaggedLogging that can wrap any standard Logger class to provide tagging capabilities *DHH*
+
+        Logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+        Logger.tagged("BCX") { Logger.info "Stuff" }                            # Logs "[BCX] Stuff"
+        Logger.tagged("BCX", "Jason") { Logger.info "Stuff" }                   # Logs "[BCX] [Jason] Stuff"
+        Logger.tagged("BCX") { Logger.tagged("Jason") { Logger.info "Stuff" } } # Logs "[BCX] [Jason] Stuff"
+
+*   Added safe_constantize that constantizes a string but returns nil instead of an exception if the constant (or part of it) does not exist *Ryan Oblak*
+
+*   ActiveSupport::OrderedHash is now marked as extractable when using Array#extract_options! *Prem Sichanugrist*
+
+*   Added Array#prepend as an alias for Array#unshift and Array#append as an alias for Array#<< *DHH*
+
+*   The definition of blank string for Ruby 1.9 has been extended to Unicode whitespace.
+    Also, in 1.8 the ideographic space U+3000 is considered to be whitespace. *Akira Matsuda, Damien Mathieu*
+
+*   The inflector understands acronyms. *dlee*
+
+*   Deprecated ActiveSupport::Memoizable in favor of Ruby memoization pattern *José Valim*
+
+*   Added Time#all_day/week/quarter/year as a way of generating ranges (example: Event.where(created_at: Time.now.all_week)) *DHH*
+
+*   Added instance_accessor: false as an option to Class#cattr_accessor and friends *DHH*
+
+*   Removed ActiveSupport::SecureRandom in favor of SecureRandom from the standard library *Jon Leighton*
+
+*   ActiveSupport::OrderedHash now has different behavior for #each and
+    \#each_pair when given a block accepting its parameters with a splat. *Andrew Radev*
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   ActiveSupport::Dependencies#load and ActiveSupport::Dependencies#require now
+    return the value from `super` *Aaron Patterson*
+
+*   Fixed ActiveSupport::Gzip to work properly in Ruby 1.8 *Guillermo Iguaran*
+
+*   Kernel.require_library_or_gem was deprecated and will be removed in Rails 3.2.0 *Josh Kalderimis*
+
+*   ActiveSupport::Duration#duplicable? was fixed for Ruby 1.8 *thedarkone*
+
+*   ActiveSupport::BufferedLogger set log encoding to BINARY, but still use text
+    mode to output portable newlines. *fxn*
+
+*   ActiveSupport::Dependencies now raises NameError if it finds an existing constant in load_missing_constant. This better reflects the nature of the error which is usually caused by calling constantize on a nested constant. *Andrew White*
+
+*   Deprecated ActiveSupport::SecureRandom in favour of SecureRandom from the standard library *Jon Leighton*
+
+*   New reporting method Kernel#quietly. *fxn*
+
+*   Add String#inquiry as a convenience method for turning a string into a StringInquirer object *DHH*
+
+*   Add Object#in? to test if an object is included in another object *Prem Sichanugrist, Brian Morearty, John Reitano*
+
+*   LocalCache strategy is now a real middleware class, not an anonymous class
+    posing for pictures.
+
+*   ActiveSupport::Dependencies::ClassCache class has been introduced for
+    holding references to reloadable classes.
+
+*   ActiveSupport::Dependencies::Reference has been refactored to take direct
+    advantage of the new ClassCache.
+
+*   Backports Range#cover? as an alias for Range#include? in Ruby 1.8 *Diego Carrion, fxn*
+
+*   Added weeks_ago and prev_week to Date/DateTime/Time. *Rob Zolkos, fxn*
+
+*   Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! *Andrew White*
+
+*   JSON decoding now uses the multi_json gem which also vendors a json engine called OkJson. The yaml backend has been removed in favor of OkJson as a default engine for 1.8.x, while the built in 1.9.x json implementation will be used by default. *Josh Kalderimis*
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   Hash.from_xml no longer loses attributes on tags containing only whitespace *André Arko*
+
+
+*   Rails 3.0.6 (April 5, 2011)
+
+*   No changes.
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   No changes.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! *Andrew White*
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   Implemented String#strip_heredoc. *fxn*
+
+*   Pluggable cache stores: setting config.cache_store = "custom_store" will require 'active_support/cache/custom_store' and look for the CustomStore constant.  #5486 *Mike Perham*
+
+*   Removed Object#returning, Object#tap should be used instead. *Santiago Pastorino*
+
+*   Deprecation behavior is no longer hardcoded to the name of the environment.
+    Instead, it is set via config.active_support.deprecation and can be one
+    of :log, :stderr or :notify. :notify is a new style that sends the warning
+    via ActiveSupport::Notifications, and is the new default for production
+    *Yehuda Katz*
+
+*   Renamed ActiveSupport::Dependecies.load_(once_)paths to autoload_(once_)paths. *fxn*
+
+*   Added ActiveSupport::FileUpdateChecker to execute a block only if a set of files changed, used by Router and I18n locale files. *José Valim*
+
+*   Added ActiveSupport::DescendantsTracker to track descendants with support to constants reloading. *José Valim*
+
+*   ActiveSupport::OrderedHash#merge and #merge! accept a block. #4838 *Paul Mucur, fxn*
+
+*   Date#since, #ago, #beginning_of_day, #end_of_day, and #xmlschema honor now the user time zone if set. *Geoff Buesing*
+
+*   Extracted String#truncate from TextHelper#truncate *DHH*
+
+*   Ruby 1.9: support UTF-8 case folding.  #4595 *Norman Clarke*
+
+*   Removes Array#rand and backports Array#sample from Ruby 1.9, thanks to Marc-Andre Lafortune. *fxn*
+
+*   Ruby 1.9: Renames last_(month|year) to prev_(month|year) in Date and Time. *fxn*
+
+*   Aliases Date#sunday to Date#end_of_week. *fxn*
+
+*   Backports Date#>> from 1.9 so that calculations do the right thing around the calendar reform. *fxn*
+
+*   Date#to_time handles properly years in the range 0..138. *fxn*
+
+*   Deprecate {{}} as interpolation syntax for I18n in favor of %{} *José Valim*
+
+*   Array#to_xml is more powerful and able to handle the same types as Hash#to_xml #4490 *Neeraj Singh*
+
+*   Harmonize the caching API and refactor the backends.  #4452 *Brian Durand*
+    All caches:
+    * Add default options to initializer that will be sent to all read, write, fetch, exist?, increment, and decrement
+    * Add support for the :expires_in option to fetch and write for all caches. Cache entries are stored with the create timestamp and a ttl so that expiration can be handled independently of the implementation.
+    * Add support for a :namespace option. This can be used to set a global prefix for cache entries.
+    * Deprecate expand_cache_key on ActiveSupport::Cache and move it to ActionController::Caching and ActionDispatch::Http::Cache since the logic in the method used some Rails specific environment variables and was only used by ActionPack classes. Not very DRY but there didn't seem to be a good shared spot and ActiveSupport really shouldn't be Rails specific.
+    * Add support for :race_condition_ttl to fetch. This setting can prevent race conditions on fetch calls where several processes try to regenerate a recently expired entry at once.
+    * Add support for :compress option to fetch and write which will compress any data over a configurable threshold.
+    * Nil values can now be stored in the cache and are distinct from cache misses for fetch.
+    * Easier API to create new implementations. Just need to implement the methods read_entry, write_entry, and delete_entry instead of overwriting existing methods.
+    * Since all cache implementations support storing objects, update the docs to state that ActiveCache::Cache::Store implementations should store objects. Keys, however, must be strings since some implementations require that.
+    * Increase test coverage.
+    * Document methods which are provided as convenience but which may not be universally available.
+
+    MemoryStore:
+    * MemoryStore can now safely be used as the cache for single server sites.
+    * Make thread safe so that the default cache implementation used by Rails is thread safe. The overhead is minimal and it is still the fastest store available.
+    * Provide :size initialization option indicating the maximum size of the cache in memory (defaults to 32Mb).
+    * Add prune logic that removes the least recently used cache entries to keep the cache size from exceeding the max.
+    * Deprecated SynchronizedMemoryStore since it isn't needed anymore.
+
+    FileStore:
+    * Escape key values so they will work as file names on all file systems, be consistent, and case sensitive
+    * Use a hash algorithm to segment the cache into sub directories so that a large cache doesn't exceed file system limits.
+    * FileStore can be slow so implement the LocalCache strategy to cache reads for the duration of a request.
+    * Add cleanup method to keep the disk from filling up with expired entries.
+    * Fix increment and decrement to use file system locks so they are consistent between processes.
+
+    MemCacheStore:
+    * Support all keys. Previously keys with spaces in them would fail
+    * Deprecate CompressedMemCacheStore since it isn't needed anymore (use :compress => true)
+
+*   JSON: encode objects that don't have a native JSON representation using to_hash, if available, instead of instance_values (the old fallback) or to_s (other encoders' default). Encode BigDecimal and Regexp encode as strings to conform with other encoders. Try to transcode non-UTF-8 strings.  *Jeremy Kemper*
+
+*   HashWithIndifferentAccess: remove inherited symbolize_keys! since its keys are always strings.  *Santiago Pastorino*
+
+*   Improve transliteration quality.  #4374 *Norman Clarke*
+
+*   Speed up and add Ruby 1.9 support for ActiveSupport::Multibyte::Chars#tidy_bytes.  #4350 *Norman Clarke*
+
+*   Reduced load time by deferring configuration of classes using
+    ActiveSupport::on_load(:component_name) *YK*
+
+*   Rename #metaclass to #singleton_class now that ruby-core has decided *JK*
+
+*   New assertions assert_blank and assert_present.  #4299 *Juanjo Bazan*
+
+*   Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.  *Jeremy Kemper*
+
+*   JSON backend for YAJL. Preferred if available.  #2666 *Brian Lopez*
+
+*   Introduce class_attribute to declare inheritable class attributes. Writing an attribute on a subclass behaves just like overriding the superclass reader method.  Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute.  *Jeremy Kemper, Yehuda Katz*
+
+*   Time#- with a DateTime argument behaves the same as with a Time argument, i.e. returns the difference between self and arg as a Float #3476 *Geoff Buesing*
+
+*   YAML serialization for OrderedHash.  #3608 *Gregor Schmidt*
+
+*   Update bundled TZInfo to v0.3.16 *Geoff Buesing*
+
+*   Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" #1821 *Geoff Buesing, Reuben Sivan*
+
+*   Changed the default ActiveSupport.use_standard_json_time_format from false to true and
+    ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults *DHH*
+
+*   Added Object#presence that returns the object if it's #present? otherwise returns nil *DHH/Colin Kelley*
+
+*   Add Enumerable#exclude? to bring parity to Enumerable#include? and avoid if !x.include?/else calls *DHH*
+
+*   Update Edinburgh TimeZone to use "Europe/London" instead of "Europe/Dublin" #3310 *Phil Ross*
+
+*   Update bundled TZInfo to v0.3.15 *Geoff Buesing*
+
+*   JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON library agnostic.  *Jeremy Kemper*
+
+*   String #to_time and #to_datetime: handle fractional seconds #864 *Jason Frey*
+
+*   Update bundled TZInfo to v0.3.13 *Geoff Buesing*
+
+*   Allow MemCacheStore to be initialized with a MemCache-like object instead of addresses and options *Bryan Helmkamp*
+
+*   Change spelling of Kyev timezone to Kyiv #2613 *Alexander Dymo*
+
+*   Add ActiveSupport.parse_json_times to disable time parsing in JSON backends that don't support it or don't need it. *rick*
+
+*   Add pluggable JSON backends with support for the JSON gem. *rick*
+        Example: ActiveSupport::JSON.backend = "JSONGem"
+
+    All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode().  Use of #to_json is not recommended, as it may clash with other libraries that overwrite it.  However, you can recover Rails specific functionality
+    if you really want to use #to_json.
+
+        gem 'json'
+        ActiveSupport::JSON.backend = "JSONGem"
+
+        class ActiveRecord::Base
+          alias to_json rails_to_json
+        end
+
+*   require 'active_support' no longer orders the whole menu of core extensions. Ask for just what you need: e.g. require 'active_support/core/time' to use timezones, durations, and stdlib date/time extensions. *Jeremy Kemper*
+
+*   Removed rarely-used DRb cache store.  *Jeremy Kemper*
+
+*   TimeWithZone.name returns 'Time', to further thwart type checking *Geoff Buesing*
+
+*   Time.local instances: Adding 24.hours across the DST boundary adds 24 hours instead of one day #2066 *Michael Curtis*
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+*   XmlMini supports LibXML and Nokogiri backends.  #2084, #2190 *Bart ten Brinke, Aaron Patterson*
+        Example: XmlMini.backend = 'Nokogiri'
+
+*   Vendorize i18n 0.1.3 gem (fixes issues with incompatible character encodings in Ruby 1.9) #2038 *Akira Matsuda*
+
+*   Update bundled memcache-client from 1.5.0.5 to 1.6.4.99. See http://www.mikeperham.com/2009/02/15/memcache-client-performance/  *Mike Perham*
+
+*   Ruby 1.9.1p0 fix: URI.unescape can decode multibyte chars.  #2033 *MOROHASHI Kyosuke*
+
+*   Time#to_s(:rfc822) uses #formatted_offset instead of unreliable and non-standard %z directive #1899 *Zachary Zolton*
+
+*   Make TimeWithZone#to_formatted_s an alias to TimeWithZone#to_s #1796 *Levin Alexander*
+
+*   Introduce Array.wrap(foo) to wrap the argument in an array unless it's already an array. Wraps nil as an empty array. Use instead of Array(foo) and foo.to_a since they treat String as Enumerable.  *Jeremy Kemper*
+
+*   TimeWithZone#xmlschema accepts optional fraction_digits argument [#1725 state:resolved] *Nicholas Dainty*
+
+*   Object#tap shim for Ruby < 1.8.7. Similar to Object#returning, tap yields self then returns self.  *Jeremy Kemper*
+        array.select { ... }.tap(&:inspect).map { ... }
+
+*   TimeWithZone#- gives correct result with wrapped DateTime, and with DateTime argument *Geoff Buesing*
+
+*   Updated i18n gem to version 0.1.1 #1635 *Yaroslav Markin*
+
+*   Add :allow_nil option to delegate. #1127 *Sergio Gil*
+
+*   Add Benchmark.ms convenience method to benchmark realtime in milliseconds.  *Jeremy Kemper*
+
+*   Updated included memcache-client to the 1.5.0.5 version which includes fixes from fiveruns and 37signals to deal with failover and timeouts #1535 *Joshua Sierles*
+
+*   Multibyte: add multibyte-safe Chars#ord rather than falling back to String#ord.  #1483 *Jason Cheow*
+
+*   I18n support for Array#to_sentence. Introduces support.array.words_connector, .two_words_connector, and .last_word_connector translation keys.  #1397 *Akira Matsuda*
+
+*   Added ActiveSupport::OrderedHash#each_key and ActiveSupport::OrderedHash#each_value #1410 *Christoffer Sawicki*
+
+*   Added ActiveSupport::MessageVerifier and MessageEncryptor to aid users who need to store signed and/or encrypted messages. *Michael Koziarski*
+
+*   Added ActiveSupport::BacktraceCleaner to cut down on backtrace noise according to filters and silencers *David Heinemeier Hansson*
+
+*   Added Object#try. ( Taken from http://ozmm.org/posts/try.html ) *Chris Wanstrath*
+
+*   Added Enumerable#none? to check that none of the elements match the block #1408 *Damian Janowski*
+
+*   TimeZone offset tests: use current_period, to ensure TimeZone#utc_offset is up-to-date *Geoff Buesing*
+
+*   Update bundled TZInfo to 0.3.12 *Geoff Buesing*
+
+*   Added lambda merging to OptionMerger (especially useful with named_scope and with_options) #726 *Paweł Kondzior*
+
+
+## 2.2.1 RC2 (November 14th, 2008) ##
+
+*   Increment the version of our altered memcache-client to prevent confusion caused when the 1.5.0 gem is installed.
+
+*   Fixed the option merging in Array#to_xml #1126 *Rudolf Gavlas*
+
+*   Make I18n::Backend::Simple reload its translations in development mode *David Heinemeier Hansson/Sven Fuchs*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+*   TimeWithZone#freeze: preload instance variables so that we can actually freeze *Geoff Buesing*
+
+*   Fix Brasilia timezone #1180 *Marcus Derencius, Kane*
+
+*   Time#advance recognizes fractional days and weeks. Deprecate Durations of fractional months and years #970 *Tom Lea*
+
+*   Add ActiveSupport::Rescuable module abstracting ActionController::Base rescue_from features. *Norbert Crombach, Pratik Naik*
+
+*   Switch from String#chars to String#mb_chars for the unicode proxy.  *Manfred Stienstra*
+
+    This helps with 1.8.7 compatibility and also improves performance for some operations by reducing indirection.
+
+*   TimeWithZone #wday, #yday and #to_date avoid trip through #method_missing *Geoff Buesing*
+
+*   Added Time, Date, DateTime and TimeWithZone #past?, #future? and #today? #720 *Clemens Kofler, Geoff Buesing*
+
+*   Fixed Sri Jayawardenepura time zone to map to Asia/Colombo *Jamis Buck*
+
+*   Added Inflector#parameterize for easy slug generation ("Donald E. Knuth".parameterize => "donald-e-knuth") #713 *Matt Darby*
+
+*   Changed cache benchmarking to be reported in milliseconds *David Heinemeier Hansson*
+
+*   Fix Ruby's Time marshaling bug in pre-1.9 versions of Ruby: utc instances are now correctly unmarshaled with a utc zone instead of the system local zone [#900 state:resolved] *Luca Guidi, Geoff Buesing*
+
+*   Add Array#in_groups which splits or iterates over the array in specified number of groups. #579. [Adrian Mugnolo] Example:
+
+    a = (1..10).to_a
+    a.in_groups(3)        # => [[1, 2, 3, 4], [5, 6, 7, nil], [8, 9, 10, nil]]
+    a.in_groups(3, false) # => [[1, 2, 3, 4], [5, 6, 7], [8, 9, 10]]
+
+*   Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, because Ruby's marshaling of Time instances doesn't respect the zone *Geoff Buesing*
+
+*   Added Memoizable mixin for caching simple lazy loaded attributes *Josh Peek*
+
+*   Move the test related core_ext stuff out of core_ext so it's only loaded by the test helpers.  *Michael Koziarski*
+
+*   Add Inflection rules for String#humanize. #535 *Dan Manges*
+
+    ActiveSupport::Inflector.inflections do |inflect|
+        inflect.human(/_cnt$/i, '\1_count')
+    end
+
+    'jargon_cnt'.humanize # => 'Jargon count'
+
+*   TimeWithZone: when crossing DST boundary, treat Durations of days, months or years as variable-length, and all other values as absolute length. A time + 24.hours will advance exactly 24 hours, but a time + 1.day will advance 23-25 hours, depending on the day. Ensure consistent behavior across all advancing methods *Geoff Buesing*
+
+*   Added TimeZone #=~, to support matching zones by regex in time_zone_select. #195 *Ernie Miller*
+
+*   Added Array#second through Array#fifth as aliases for Array#[1] through Array#[4] + Array#forty_two as alias for Array[41] *David Heinemeier Hansson*
+
+*   Added test/do declaration style testing to ActiveSupport::TestCase *DHH via Jay Fields*
+
+*   Added Object#present? which is equivalent to !Object#blank? *David Heinemeier Hansson*
+
+*   Added Enumberable#many? to encapsulate collection.size > 1 *David Heinemeier Hansson/Damian Janowski*
+
+*   Add more standard Hash methods to ActiveSupport::OrderedHash *Steve Purcell*
+
+*   Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveSupport *Josh Peek*
+
+*   Added StringInquirer for doing things like StringInquirer.new("production").production? # => true and StringInquirer.new("production").development? # => false *David Heinemeier Hansson*
+
+*   Fixed Date#end_of_quarter to not blow up on May 31st [#289 state:resolved] (Danger)
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+*   TimeZone#to_s shows offset as GMT instead of UTC, because GMT will be more familiar to end users (see time zone selects used by Windows OS, google.com and yahoo.com.) Reverts [8370] *Geoff Buesing*
+
+*   Hash.from_xml: datetime xml types overflow to Ruby DateTime class when out of range of Time. Adding tests for utc offsets *Geoff Buesing*
+
+*   TimeWithZone #+ and #- : ensure overflow to DateTime with Numeric arg *Geoff Buesing*
+
+*   Time#to_json: don't convert to utc before encoding. References #175 *Geoff Buesing*
+
+*   Remove unused JSON::RESERVED_WORDS, JSON.valid_identifier? and JSON.reserved_word? methods. Resolves #164. *Cheah Chu Yeow*
+
+*   Adding Date.current, which returns Time.zone.today if config.time_zone is set; otherwise returns Date.today *Geoff Buesing*
+
+*   TimeWithZone: date part getter methods (#year #mon #day etc) are defined on class; no longer relying on method_missing *Geoff Buesing*
+
+*   Time.zone.parse return nil for strings with no date information *Geoff Buesing*
+
+*   Time.zone.parse respects offset information in string. Resolves #105. *Scott Fleckenstein, Geoff Buesing*
+
+*   Added Ruby 1.8 implementation of Process.daemon
+
+*   Duration #since and #ago with no argument (e.g., 5.days.ago) return TimeWithZone when config.time_zone is set. Introducing Time.current, which returns Time.zone.now if config.time_zone is set, otherwise just returns Time.now *Geoff Buesing*
+
+*   Time#since behaves correctly when passed a Duration. Closes #11527 *kemiller*
+
+*   Add #getutc alias for DateTime#utc *Geoff Buesing*
+
+*   Refactor TimeWithZone: don't send #since, #ago, #+, #-, #advance through method_missing *Geoff Buesing*
+
+*   TimeWithZone respects config.active_support.use_standard_json_time_format *Geoff Buesing*
+
+*   Add config.active_support.escape_html_entities_in_json to allow disabling of html entity escaping.  *Rick Olson*
+
+*   Improve documentation. *Xavier Noria*
+
+*   Modified ActiveSupport::Callbacks::Callback#call to accept multiple arguments.
+
+*   Time #yesterday and #tomorrow behave correctly crossing DST boundary. Closes #7399 *sblackstone*
+
+*   TimeWithZone: Adding tests for dst and leap day edge cases when advancing time *Geoff Buesing*
+
+*   TimeWithZone#method_missing: send to utc to advance with dst correctness, otherwise send to time. Adding tests for time calculations methods *Geoff Buesing*
+
+*   Add config.active_support.use_standard_json_time_format setting so that Times and Dates export to ISO 8601 dates.  *Rick Olson*
+
+*   TZInfo: Removing unneeded TimezoneProxy class *Geoff Buesing*
+
+*   TZInfo: Removing unneeded TimezoneIndexDefinition, since we're not including Indexes::Timezones *Geoff Buesing*
+
+*   Removing unnecessary uses_tzinfo helper from tests, given that TZInfo is now bundled *Geoff Buesing*
+
+*   Bundling abbreviated version of TZInfo gem 0.3.8: only the classes and zone definitions required to support Rails time zone features are included. If a recent version of the full TZInfo gem is installed, this will take precedence over the bundled version *Geoff Buesing*
+
+*   TimeWithZone#marshal_load does zone lookup via Time.get_zone, so that tzinfo/Olson identifiers are handled *Geoff Buesing*
+
+*   Time.zone= accepts TZInfo::Timezone instances and Olson identifiers; wraps result in TimeZone instance *Geoff Buesing*
+
+*   TimeWithZone time conversions don't need to be wrapped in TimeOrDateTime, because TZInfo does this internally *Geoff Buesing*
+
+*   TimeWithZone#usec returns 0 instead of error when DateTime is wrapped *Geoff Buesing*
+
+*   Improve documentation. *Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert*
+
+*   Ensure that TimeWithZone#to_yaml works when passed a YAML::Emitter.  *Rick Olson*
+
+*   Ensure correct TimeWithZone#to_date *Geoff Buesing*
+
+*   Make TimeWithZone work with tzinfo 0.2.x: use TZInfo::Timezone#zone_identifier alias for #abbreviation, silence warnings on tests. Raise LoadError when TZInfo version is < 0.2 by sniffing for TZInfo::TimeOrDateTime constant. Move all tzinfo-dependent TimeZone tests into uses_tzinfo block *Geoff Buesing*
+
+*   Time, DateTime and TimeWithZone #in_time_zone defaults to Time.zone. Removing now unneeded #in_current_time_zone *Geoff Buesing*
+
+*   TZInfo caches Timezone instances in its own internal hash cache, so TimeZone::MAPPING doesn't need to cache them as well *Geoff Buesing*
+
+*   Adding TimeZone#parse *Geoff Buesing*
+
+*   Adding TimeZone#at and DateTime#to_f *Geoff Buesing*
+
+*   TimeWithZone responds to Ruby 1.9 weekday-named query methods *Geoff Buesing*
+
+*   TimeWithZone caches TZInfo::TimezonePeriod used for time conversion so that it can be reused, and enforces DST rules correctly when instance is created from a local time *Geoff Buesing*
+
+*   Fixed that BufferedLogger should create its own directory if one doesn't already exist #11285 *lotswholetime*
+
+*   Fix Numeric time tests broken by DST change by anchoring them to fixed times instead of Time.now. Anchor TimeZone#now DST test to time specified with Time.at instead of Time.local to work around platform differences with Time.local and DST representation *Geoff Buesing*
+
+*   Removing unneeded #change_time_zone method from Time, DateTime and TimeWithZone *Geoff Buesing*
+
+*   TimeZone #local and #now correctly enforce DST rules *Geoff Buesing*
+
+*   TimeWithZone instances correctly enforce DST rules. Adding TimeZone#period_for_utc *Geoff Buesing*
+
+*   test_time_with_datetime_fallback expects DateTime.local_offset instead of DateTime.now.offset *Geoff Buesing*
+
+*   Adding TimeWithZone #marshal_dump and #marshal_load *Geoff Buesing*
+
+*   Add OrderedHash#to_hash *Josh Peek*
+
+*   Adding Time#end_of_day, _quarter, _week, and _year.  #9312 *Juanjo Bazan, Tarmo Tänav, BigTitus*
+
+*   Adding TimeWithZone#between? *Geoff Buesing*
+
+*   Time.=== returns true for TimeWithZone instances *Geoff Buesing*
+
+*   TimeWithZone #+ and #- behave consistently with numeric arguments regardless of whether wrapped time is a Time or DateTime; consistenty answers false to #acts_like?(:date) *Geoff Buesing*
+
+*   Add String#squish and String#squish! to remove consecutive chunks of whitespace.  #11123 *Jordi Bunster, Henrik N*
+
+*   Serialize BigDecimals as Floats when using to_yaml. #8746 *Ernesto Jimenez*
+
+*   Adding TimeWithZone #to_yaml, #to_datetime, #eql? and method aliases for duck-typing compatibility with Time *Geoff Buesing*
+
+*   TimeWithZone #in_time_zone returns +self+ if zone argument is the same as #time_zone *Geoff Buesing*
+
+*   Adding TimeWithZone #to_a, #to_f, #to_i, #httpdate, #rfc2822 *Geoff Buesing*
+
+*   Pruning unneeded TimeWithZone#change_time_zone_to_current *Geoff Buesing*
+
+*   Time#zone=, #in_time_zone and #change_time_zone accept a Duration *Geoff Buesing*
+
+*   Time#in_time_zone handles Time.local instances correctly *Geoff Buesing*
+
+*   Pruning unneeded Time#change_time_zone_to_current. Enhanced docs to #change_time_zone to explain the difference between this method and #in_time_zone *Geoff Buesing*
+
+*   TimeZone#new method renamed #local; when used with Time.zone, constructor now reads: Time.zone.local() *Geoff Buesing*
+
+*   Added Base64.encode64s to encode values in base64 without the newlines. This makes the values immediately usable as URL parameters or memcache keys without further processing *David Heinemeier Hansson*
+
+*   Remove :nodoc: entries around the ActiveSupport test/unit assertions.  #10946 *dancroak, jamesh*
+
+*   Add Time.zone_default accessor for setting the default time zone.  Rails::Configuration.time_zone sets this.  #10982 *Geoff Buesing*
+
+*   cache.fetch(key, :force => true) to force a cache miss.  *Jeremy Kemper*
+
+*   Support retrieving TimeZones with a Duration.  TimeZone[-28800] == TimeZone[-480.minutes].  *Rick Olson*
+
+*   TimeWithZone#- added, so that #- can handle a Time or TimeWithZone argument correctly *Geoff Buesing*
+
+*   with_timezone test helper renamed with_env_tz, to distinguish between setting ENV['TZ'] and setting Time.zone in tests *Geoff Buesing*
+
+*   Time#- coerces TimeWithZone argument to a Time instance so that difference in seconds can be calculated. Closes #10914 *Geoff Buesing, yyyc514*
+
+*   Adding UTC zone to TimeZone; TimeWithZone no longer has to fake UTC zone with nil *Geoff Buesing*
+
+*   Time.get_zone refactored to private method, given that the encapsulated logic is only useful internally *Geoff Buesing*
+
+*   Time.zone uses thread-local variable for thread safety. Adding Time.use_zone, for overriding Time.zone locally inside a block. Removing unneeded Time.zone_reset! *Geoff Buesing*
+
+*   TimeZone#to_s uses UTC rather than GMT; reapplying change that was undone in [8679]. #1689 *Cheah Chu Yeow*
+
+*   Time.days_in_month defaults to current year if no year is supplied as argument #10799 [Radar], uses Date.gregorian_leap? to determine leap year, and uses constant lookup to determine days in month *Geoff Buesing*
+
+*   Adding Time and DateTime #compare_with_coercion, which layers behavior on #<=> so that any combination of Time, DateTime and ActiveSupport::TimeWithZone instances can be chronologically compared *Geoff Buesing*
+
+*   TimeZone#now returns an ActiveSupport::TimeWithZone *Geoff Buesing*
+
+*   Time #in_current_time_zone and #change_time_zone_to_current return self when Time.zone is nil *Geoff Buesing*
+
+*   Remove unneeded #to_datetime_default_s alias for DateTime#to_s, given that we inherit a #to_default_s from Date that does exactly the same thing *Geoff Buesing*
+
+*   Refactor Time and DateTime #to_formatted_s: use ternary instead of nested if/else *Geoff Buesing*
+
+*   Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset strings with cross-platform consistency *Geoff Buesing*
+
+*   Adding alternate_utc_string option to TimeZone#formatted_offset. Removing unneeded TimeZone#offset. *Geoff Buesing*
+
+*   Introduce ActiveSupport::TimeWithZone, for wrapping Time instances with a TimeZone. Introduce instance methods to Time for creating TimeWithZone instances, and class methods for managing a global time zone. *Geoff Buesing*
+
+*   Replace non-dst-aware TimeZone class with dst-aware class from tzinfo_timezone plugin. TimeZone#adjust and #unadjust are no longer available; tzinfo gem must now be present in order to perform time zone calculations, via #local_to_utc and #utc_to_local methods. *Geoff Buesing*
+
+*   Extract ActiveSupport::Callbacks from Active Record, test case setup and teardown, and ActionController::Dispatcher.  #10727 *Josh Peek*
+
+*   Introducing DateTime #utc, #utc? and #utc_offset, for duck-typing compatibility with Time. Closes #10002 *Geoff Buesing*
+
+*   Time#to_json uses Numeric#to_utc_offset_s to output a cross-platform-consistent representation without having to convert to DateTime. References #9750 *Geoff Buesing*
+
+*   Refactor number-to-HH:MM-string conversion logic from TimeZone#formatted_offset to a reusable Numeric#to_utc_offset_s method. *Geoff Buesing*
+
+*   Continue evolution toward ActiveSupport::TestCase.  #10679 *Josh Peek*
+
+*   TestCase: introduce declared setup and teardown callbacks. Pass a list of methods and an optional block to call before setup or after teardown. Setup callbacks are run in the order declared; teardown callbacks are run in reverse.  *Jeremy Kemper*
+
+*   Added ActiveSupport::Gzip.decompress/compress(source) as an easy wrapper for Zlib *Tobias Lütke*
+
+*   Included MemCache-Client to make the improved ActiveSupport::Cache::MemCacheStore work out of the box *Bob Cottrell, Eric Hodel*
+
+##  Added ActiveSupport::Cache:: framework as an extraction from ActionController::Caching::Fragments:: David Heinemeier Hansson ##
+
+*   Fixed String#titleize to work for strings with 's too #10571 *trek*
+
+*   Changed the implementation of Enumerable#group_by to use a double array approach instead of a hash such that the insert order is honored *David Heinemeier Hansson/Marcel Molina Jr.*
+
+*   remove multiple enumerations from ActiveSupport::JSON#convert_json_to_yaml when dealing with date/time values.  *Rick Olson*
+
+*   Hash#symbolize_keys skips keys that can't be symbolized.  #10500 *Brad Greenlee*
+
+*   Ruby 1.9 compatibility.  #1689, #10466, #10468, #10554, #10594, #10632 *Cheah Chu Yeow, Pratik Naik, Jeremy Kemper, Dirkjan Bussink, Xavier Noria*
+
+*   TimeZone#to_s uses UTC rather than GMT.  #1689 *Cheah Chu Yeow*
+
+*   Refactor of Hash#symbolize_keys! to use Hash#replace.  Closes #10420 *ReinH*
+
+*   Fix HashWithIndifferentAccess#to_options! so it doesn't clear the options hash.  Closes #10419 *ReinH*
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+*   Added Array#from and Array#to that behaves just from String#from and String#to *David Heinemeier Hansson*
+
+*   Fix that empty collections should be treated as empty arrays regardless of whitespace for Hash#from_xml #10255 *adamj*
+
+*   Time#time_with_datetime_fallback, Time#to_datetime, Date#to_datetime and String#to_datetime honor Ruby's default calendar reform setting. #10201 *Geoff Buesing*
+
+*   Change Time and DateTime #end_of_month to return last second of month instead of beginning of last day of month. Closes #10200 *Geoff Buesing*
+
+*   Speedup String#blank?  *Jeremy Kemper, Michael Koziarski*
+
+*   Add documentation for Hash#diff. Closes #9306 *Tarmo Tänav*
+
+*   Add new superclass_delegating_accessors.  Similar to class inheritable attributes but with subtly different semantics. *Michael Koziarski, Tarmo Tänav*
+
+*   Change JSON to encode %w(< > &) as 4 digit hex codes to be in compliance with the JSON spec.  Closes #9975 *Josh Peek, Cheah Chu Yeow, Tim Pope*
+
+*   Fix JSON encoding/decoding bugs dealing with /'s.  Closes #9990 *Rick Olson, theamazingrando*
+
+*   Introduce a base class for all test cases used by rails applications. ActiveSupport::TestCase *Michael Koziarski*
+
+    The intention is to use this to reduce the amount of monkeypatching / overriding that
+    is done to test/unit's classes.
+
+*   Document Enumerable and Hash #to_json.  #9970 *Cheah Chu Yeow*
+
+*   Hash#to_xml handles symbol values.  #9954 *Assaf*
+
+*   Hash#symbolize_keys behaves well with integer keys.  #9890 *PotatoSalad*
+
+*   Multibyte: String#slice supports regexp argument.  #9646 *yob*
+
+*   object.duplicable? returns true if object.dup is safe. False for nil, true, false, symbols, and numbers; true otherwise.  #9333 *sur*
+
+*   Time, Date and DateTime #advance accept :weeks option.  #9866 *Geoff Buesing*
+
+*   Fix Time#years_ago and #years_since from leap days.  #9865 *Geoff Buesing*
+
+*   Time and DateTime#advance accept :hours, :minutes, and :seconds options.  #9825 *Geoff Buesing*
+
+*   Fix Date#years_ago and #years_since from leap days.  #9864 *Geoff Buesing*
+
+*   Refactor Time and Date#months_since and #months_ago to use #advance.  #9863 *Geoff Buesing*
+
+*   Rebundle Builder 2.1.2 but prefer a newer RubyGem if available.  *Jeremy Kemper*
+
+*   Add Range#overlaps?(range), Range#include?(range), and Range#step without a block. *brandon*
+
+*   Correct BufferedLogger#level? checks.  #9806 *wildchild, Johan Sorensen*
+
+*   String#to_xs uses Eric Wong's fast_xs extension, if available, for Builder speedup.  http://bogomips.org/fast_xs/  *Jeremy Kemper*
+
+*   Introduce BasicObject as Builder::BlankSlate for Ruby 1.9 forward compatibility.  *Jeremy Kemper*
+
+*   Unbundle Builder in favor of a gem dependency.  *Jeremy Kemper*
+
+*   Disambiguate Time, Date, and DateTime#to_json formatting.  #9750 *Geoff Buesing, Cheah Chu Yeow*
+
+*   Hash#to_json takes :only or :except options to specific or omit certain hash keys. Enumerable#to_json passes through its options to each element.  #9751 *Cheah Chu Yeow*
+
+*   BufferedLogger#auto_flushing = N flushes the log every N messages. Buffers with an array instead of string. Disabling auto_flushing still flushes when the buffer hits a maximum size, as a failsafe against memory-gobbling.  *Jeremy Kemper*
+
+*   Fixed Date#xmlschema for dates outside the range of what can be created with Time #9744 *Geoff Buesing*
+
+*   Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 #9735 *bermi*
+
+*   Fixed JSON encoding to use quoted keys according to the JSON standard.  #8762 *choonkat, Cheah Chu Yeow*
+
+*   Alias Object#send to send! for Ruby 1.9 forward compatibility.  *Jeremy Kemper*
+
+*   Backport Object#instance_variable_defined? for Ruby < 1.8.6.  *Jeremy Kemper*
+
+*   BufferedLogger#add converts the message to a string.  #9702, #9724 *eigentone, DrMark, Tom Ward*
+
+*   Added ActiveSupport::BufferedLogger as a duck-typing alternative (albeit with no formatter) to the Ruby Logger, which provides a very nice speed bump (inspired by Ezra's buffered logger) *David Heinemeier Hansson*
+
+*   Object#instance_exec produces fewer garbage methods.  *Mauricio Fernandez*
+
+*   Decode json strings as Dates/Times if they're using a YAML-compatible format.  Closes #9614 *Rick Olson*
+
+*   Fixed cache_page to use the request url instead of the routing options when picking a save path.  #8614 *Josh Peek*
+
+*   Object.subclasses_of includes anonymous subclasses.  *Jeremy Kemper*
+
+*   Fixed that pluralizing an empty string should return the same empty string, not "s".  #7720 *Josh Peek*
+
+*   Added call to inspect on non-string classes for the logger #8533 *Coda Hale*
+
+*   Deprecation: remove deprecated :mday option from Time, Date, and DateTime#change.  *Jeremy Kemper*
+
+*   Fix JSON decoder with nested quotes and commas.  #9579 *Zach Dennis*
+
+*   Hash#to_xml doesn't double-unescape.  #8806 *Ezran*
+
+*   Added Array#rand #9170 [Norbert Crombach]. Examples:
+
+        [].rand       # => nil
+        ['a'].rand    # => 'a'
+        [1,2,3].rand  # => 1 or 2 or 3
+
+*   Deprecation: removed Reloadable.  *Jeremy Kemper*
+
+*   Make the utf-handler return the correct value for non-matching regular expressions. Closes #9049 *Manfred Stienstra*
+
+*   Add ljust, rjust and center to utf8-handler. Closes #9165 *Manfred Stienstra*
+
+*   Fix Time#advance bug when trying to advance a year from leap day.  Closes #8655 *Geoff Buesing*
+
+*   Add support for []= on ActiveSupport::Multibyte::Chars. Closes #9142. *ewan, Manfred Stienstra*
+
+*   Added Array#extract_options! to encapsulate the pattern of getting an options hash out of a variable number of parameters.  #8759 *Norbert Crombach*
+
+*   Let alias_attribute work with attributes with initial capital letters (legacy columns etc).  Closes #8596 *mpalmer*
+
+*   Added Hash#except which is the inverse of Hash#slice -- return the hash except the keys that are specified *David Heinemeier Hansson*
+
+*   Added support for pluralization with a different starting letter than the singular version (cow/kine) #4929 *norri_b/Josh Susser*
+
+*   Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin.  #8453 *candlerb, Jeremy Kemper*
+
+*   Backport clean_logger changes to support ruby 1.8.2 *Mislav Marohnić*
+
+*   Added proper handling of arrays #8537 *Josh Susser*
+
+    Before:
+        Hash.from_xml '<images></images>'
+        # => {:images => nil}
+
+        Hash.from_xml '<images><image>foo.jpg</image></images>'
+        # => {:images => {:image => "foo.jpg"}}
+
+        Hash.from_xml '<images><image>foo.jpg</image><image>bar.jpg</image></images>'
+        # => {:images => {:image => ["foo.jpg", "bar.jpg"]}}
+
+    After:
+        Hash.from_xml '<images type="array"></images>'
+        # => {:images => []}
+
+        Hash.from_xml '<images type="array"><image>foo.jpg</image></images>'
+        # => {:images => ["foo.jpg"]}
+
+        Hash.from_xml '<images type="array"><image>foo.jpg</image><image>bar.jpg</image></images>'
+        # => {:images => ["foo.jpg", "bar.jpg"]}
+
+*   Improve Time and Date test coverage.  #8646 *Josh Peek*
+
+*   Add Date#since, ago, beginning_of_day, and end_of_day. Date + seconds works now.  #8575 *Geoff Buesing*
+
+*   String#to_time overflows to DateTime. Add String#to_datetime.  #8572 *Geoff Buesing*
+
+*   Date.yesterday and .tomorrow.  #8571 *Geoff Buesing*
+
+*   Readable Date and DateTime#inspect.  #8570 *Geoff Buesing*
+
+*   Move common DateTime calculations to Date.  #8536 *Geoff Buesing*
+
+*   Added Date#change (like Time#change) *David Heinemeier Hansson*
+
+*   DateTime#to_time converts to Time unless out of range.  #8512 *Geoff Buesing*
+
+*   Date#to_datetime, #to_s(:rfc822).  #8512 *Geoff Buesing*
+
+*   Time durations use since instead of + for accuracy.  #8513 *Geoff Buesing*
+
+*   escape <'s and >'s in JSON strings. #8371 *Rick Olson*
+
+*   Inflections: MatrixTest -> MatrixTests instead of MatricesTest.  #8496 *jbwiv*
+
+*   Multibyte strings respond_to the String methods they proxy so they can be duck-typed.  #6549 *Tuxie*
+
+*   Array#to_xml yields the builder just like Hash and ActiveRecord::Base.  #8472 *seth*
+
+*   Date, Time, and DateTime support formatting blocks in addition to strftime strings. Introduce :long_ordinal format, e.g. "February 21st, 2005".  #8191 *Coda Hale*
+
+*   Document Object#blank?.  #6491 *Chris Mear*
+
+*   Date, Time, and DateTime#to_json.  #8399 *wycats*
+
+*   Simplify API of assert_difference by passing in an expression that is evaluated before and after the passed in block. See documenation for examples of new API. *Marcel Molina Jr.*
+
+*   Added assert_difference and assert_no_difference to test/unit assertions *Tobias Lütke*
+
+*   Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back *David Heinemeier Hansson*
+
+*   Added parsing of file type in Hash.xml_in so you can easily do file uploads with base64 from an API *David Heinemeier Hansson*
+
+        <person>
+          <name>David</name>
+          <avatar type="file" name="me.jpg" content_type="image/jpg">R0lGODlhkACZAPUAAM5lcfjrtMQCG=\n</avatar>
+        </person>
+
+    ...becomes:
+
+        attributes = { :person => { :name => "David", :avatar => #<StringIO> } }
+        attributes[:person][:avatar].content_type      # => "image/jpg"
+        attributes[:person][:avatar].original_filename # => "me.jpg"
+        attributes[:person][:avatar].read # => binary data of the file
+
+    Which is duck-type compatible with the files that you get when doing multipart uploads through HTML.
+
+*   Improved multibyte performance by relying less on exception raising #8159 *Blaine*
+
+*   Use XSD-compatible type names for Hash#to_xml and make the converters extendable #8047 *Tim Pope*
+
+*   Added yielding of builder in Hash#to_xml *David Heinemeier Hansson*
+
+*   Hash#with_indifferent_access now also converts hashes kept in arrays to indifferent access (makes it easier to treat HTML and XML parameters the same) *David Heinemeier Hansson*
+
+*   Hash#to_xml supports YAML attributes.  #7502 *jonathan*
+
+*   Refactor ActiveSupport::JSON to be less obtuse.  Add support for JSON decoding by way of Syck with ActiveSupport::JSON.decode(json_string).  Prevent hash keys that are JavaScript reserved words from being unquoted during encoding.  *Sam Stephenson*
+
+*   alias_method_chain preserves the original method's visibility.  #7854 *Jonathan Viney*
+
+*   Update Dependencies to ignore constants inherited from ancestors. Closes #6951. *Nicholas Seckar*
+
+*   Array#to_query preserves its ordering.  #7756 *Greg Spurrier*
+
+*   Out-of-range Time calculations transparently overflow to DateTime. Introduce Time#to_datetime.  #7706, #7715 *Geoff Buesing*
+
+*   DateTime calculations analogous to the Date and Time extensions.  #7693 *Geoff Buesing*
+
+*   Give DateTime correct .to_s implementations, lets it play nice with ActiveRecord quoting.  #7649 *Geoff Buesing*
+
+*   Add File.atomic_write,  allows you to write large files in an atomic manner, preventing users from seeing half written files.  *Michael Koziarski*
+
+*   Allow users to provide custom formatters to Logger. *Anthony Eden*
+
+*   Hash#to_query CGI-escapes its keys.  *Jeremy Kemper*
+
+*   Optimize Class Inheritable Attributes so that unnecessary hashes are not created.  Closes #7472 *Bruce Perens*
+
+*   :db format for Date#to_s *Jeremy Kemper*
+        Date.new(2007, 1, 27).to_s(:db) # => '2007-01-27'
+
+*   Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  *Rick Olson*
+
+*   Added Hash#to_query to turn a hash of values into a form-encoded query string *Nicholas Seckar*
+
+*   Increase test coverage for subclasses_of. Closes #7335. *Roman2K, Nicholas Seckar*
+
+*   Remove unused code from Duration#inspect.  Closes #7180.  *Rich Collins*
+
+*   Added test coverage for Inflector.inflections.clear.  Closes #7179. *Rich Collins*
+
+*   ActiveSupport::Multibyte::Handlers::UTF8Handler should raise when a range and an integer are passed in (just like the native implementation).  Closes #7176 *Rich Collins*
+
+*   A couple extra tests for #classify.  Closes #7273. *Josh Susser*
+
+*   Better docs for Object extensions *zackchandler, Jamis Buck*
+
+*   Fix that Dates couldn't be subtracted from Dates after [5940].  *Sam Stephenson*
+
+*   Add Object#acts_like? and Time#acts_like_time? and Date#acts_like_date? to facilitate duck-typing. *Jamis Buck*
+
+*   Make 1.months and friends accurate by introducing a Duration class.  #6835 *eventualbuddha*
+
+
+## 1.4.2 (March 12th, 2007) ##
+
+*   Ruby 1.8.6 and 1.9 define private Time#to_date and #to_datetime; make them
+    public for compatibility.  *Jeremy Kemper*
+
+*   Deprecation: warn on stderr if RAILS_DEFAULT_LOGGER isn't set yet.  *Jeremy Kemper*
+
+
+## 1.4.1 (February 5th, 2007) ##
+
+*   Optimize Class Inheritable Attributes so that unnecessary hashes are not created.  Closes #7472 *Bruce Perens*
+
+*   Added :instance_writer option to #mattr_writer/accessor, #cattr_writer/accessor, and #class_inheritable_writer to skip the creation of the instance writer.  *Rick Olson*
+
+*   Full test coverage for Inflector.  #7228 *Dan Kubb*
+
+
+## 1.4.0 (January 16th, 2007) ##
+
+*   Document Inflector.ordinalize and merge docs from String inflections.  #7023 *smeade*
+
+*   Unbundle flexmock.  *Jeremy Kemper*
+
+*   Fix Dependencies.autoloaded? to ignore anonymous modules. Closes #6561. *Nicholas Seckar*
+
+*   Update load once paths to prevent nested once constants from being detected and claimed by an external non-once load. *Nicholas Seckar*
+
+*   Deprecation: silence warnings when reporting test errors.  *Jeremy Kemper*
+
+*   Hash#slice(*keys) returns a new hash with only the given keys. #slice! replaces the hash with only the given keys. Works with HashWithIndifferentAccess also.  *Jeremy Kemper*
+
+*   HashWithIndifferentAccess#to_hash converts to a Hash with String keys and the same default value.  *Jeremy Kemper*
+
+*   Fix remove_constant to correctly handle constant names of the form "::A::...". References #6720. *Nicholas Seckar*
+
+*   Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) #6610 *thkarcher/cyu*
+
+*   Added Time#to_s(:time) which will just return H:M, like 17:44 *David Heinemeier Hansson*
+
+*   Add Module#attr_accessor_with_default to initialize value of attribute before setting it. Closes #6538. *Stuart Halloway, Marcel Molina Jr.*
+
+*   Hash#to_xml handles keys with the same name as Kernel methods.  #6613 *Jonathan del Strother*
+
+*   Added Time#end_of_day to get 23:59:59 of that day *David Heinemeier Hansson*
+
+*   Don't quote hash keys in Hash#to_json if they're valid JavaScript identifiers.  Disable this with ActiveSupport::JSON.unquote_hash_key_identifiers = false if you need strict JSON compliance. *Sam Stephenson*
+
+*   Lazily load the Unicode Database in the UTF-8 Handler *Rick Olson*
+
+*   Update dependencies to delete partially loaded constants. *Nicholas Seckar*
+
+*   Fix unicode JSON regexp for Onigurama compatibility.  #6494 *whitley*
+
+*   update XmlSimple to 1.0.10. Closes #6532. *Nick Sieger*
+
+*   Update dependencies to allow constants to be defined alongside their siblings. A common case for this is AR model classes with STI; user.rb might define User, Administrator and Guest for example. *Nicholas Seckar*
+
+*   next_week respects DST changes.  #6483, #5617, #2353, #2509, #4551 *marclove, Rob Biedenharn, rails@roetzel.de, jsolson@damogran.org, drbrain@segment7.net*
+
+*   Expose methods added to Enumerable in the documentation, such as group_by. Closes #6170. *sergeykojin@gmail.com, Marcel Molina Jr.*
+
+*   Ensure Chars#tidy_bytes only tidies broken bytes. Closes #6397 *Manfred Stienstra*
+
+*   Add 'unloadable', a method used to mark any constant as requiring an unload after each request. *Nicholas Seckar*
+
+*   Make core_ext/string/access.rb multibyte safe. Closes #6388 *Manfred Stienstra*
+
+*   Make String#chars slicing behaviour consistent with String. Closes #6387 *Manfred Stienstra*
+
+*   Pull in latest multibyte patch. Closes #6346 *Manfred Stienstra*
+
+*   Add ActiveSupport::Multibyte.  Provides String#chars which lets you deal with strings as a sequence of chars, not of bytes. Closes #6242 *Julian Tarkhanov, Manfred Stienstra, Thijs van der Vossen & Jan Behrens*
+
+*   Fix issue with #class_inheritable_accessor saving updates to the parent class when initialized with an Array or Hash *mojombo*
+
+*   Hash#to_xml supports Bignum and BigDecimal.  #6313 *edibiase*
+
+*   Don't undefine #class in OptionMerger *Rick Olson*
+
+*   Hash.create_from_xml has been renamed to Hash.from_xml, alias will exist until Rails 2.0 *David Heinemeier Hansson*
+
+*   alias_method_chain works with accessor= methods also.  #6153 *Caio Chassot*
+
+*   Fix loadable_constants_for_path to handle load paths that do not end with a slash. *Nicholas Seckar*
+
+*   Fix logic error in determining what was loaded by a given file. Closes #6039. *Nicholas Seckar*
+
+*   Equate Kernel.const_missing with Object.const_missing. Fixes #5988. *Nicholas Seckar*
+
+*   Add ApplicationController special case to Dependencies. *Nicholas Seckar*
+
+*   Don't pad remaining places with in_groups_of if specified padding value is false. *Marcel Molina Jr.*
+
+*   Fix cases where empty xml nodes weren't being translated to nil in Hash.create_from_xml *Rick Olso n*
+
+    <written-on type="date"></written-on> # => { :type => 'date' } # WRONG
+    <written-on type="date"></written-on> # => nil # RIGHT
+
+*   Tighten rescue clauses.  #5985 *james@grayproductions.net*
+
+*   Inflections: don't singularize -ies plurals.  *foamdino@gmail.com, Mark Van Holstyn*
+
+*   Update Initializer to use load_once_paths to avoid plugin reloading. References #5852. *Nicholas Seckar*
+
+*   Use Array#assoc in ActiveSupport::OrderedHash. *Mauricio Fernandez*
+
+*   Greatly increased performance of String.to_json, which speeds up RJS considerably on large pages, fixes #3473 *Shugo Maeda*
+
+*   Detect missing_constants calls from removed modules and fail accordingly. *Nicholas Seckar*
+
+*   Stop using defined? in Dependencies.qualified_const_defined? since defined? may invoke const_missing. *Nicholas Seckar*
+
+*   Dependencies can autoload directories of nested classes. *Jeremy Kemper*
+        Example:
+          invoice.rb            class Invoice
+          invoice/lineitem.rb   class Invoice::Lineitem
+
+*   Add Deprecation.silence so that Reloadable does not scold itself. *Nicholas Seckar*
+
+*   Add debugging logging to Dependencies. Currently can be enabled with Dependencies.log_activity = true; adding to Initializer and documenting is forthcoming. *Nicholas Seckar*
+
+*   Replace Reloadable with improvements to the Dependencies mechanism. *Nicholas Seckar*
+
+*   DateTime#to_time gives hour/minute/second resolution.  #5747 *jon.evans@pobox.com*
+
+*   attr_internal to support namespacing and deprecation. Like attr_* except backed by internally-named instance variable. Set attr_internal_naming_format to change the format from the default '@_%s'. *Jeremy Kemper*
+        # def foo()   @foo__rofl      end
+        # def foo=(v) @foo__rofl = v  end
+        self.attr_internal_naming_format = '@%s__rofl'
+        attr_internal :foo
+
+*   Raise fully qualified names upon name errors. #5533 *Lars Pind, Nicholas Seckar*
+
+*   Add extention to obtain the missing constant from NameError instances. *Nicholas Seckar*
+
+*   Thoroughly document inflections.  #5700 *petermichaux@gmail.com*
+
+*   Added Module#alias_attribute [Jamis/David Heinemeier Hansson]. Example:
+
+        class Content < ActiveRecord::Base
+          # has a title attribute
+        end
+
+        class Email < ActiveRecord::Base
+          alias_attribute :subject, :title
+        end
+
+        e = Email.find(1)
+        e.title    # => "Superstars"
+        e.subject  # => "Superstars"
+        e.subject? # => true
+        e.subject = "Megastars"
+        e.title    # => "Megastars"
+
+*   Deprecation: easier to work with warning behavior as procs; default behaviors for each environment so users needn't update env.rb; and testing pleasure with assert_deprecated, assert_not_deprecated. *Jeremy Kemper*
+    By default, test prints to $stderr, dev logs, production ignores.
+    Provide your own per-environment in e.g. config/environments/development.rb:
+        ActiveSupport::Deprecation.behavior = Proc.new { |message| raise message }
+
+*   First cut of the Rails Deprecation system.   *Michael Koziarski*
+
+*   Strip boolean XML content before checking for 'true' *Rick Olson*
+
+*   Customize default BigDecimal formatting. References #5672 *Dave Thomas*
+
+*   Correctly convert <foo nil="true"> to nil when using Hash.create_from_xml.  *Rick Olson*
+
+*   Optional identity for Enumerable#sum defaults to zero. #5657 *gensym@mac.com*
+
+*   HashWithIndifferentAccess shouldn't confuse false and nil. #5601 *Shugo Maeda*
+
+*   Fixed HashWithIndifferentAccess#default #5586 *chris@seagul.co.uk*
+
+*   More compatible Hash.create_from_xml. #5523 *nunemaker@gmail.com*
+
+*   Added Enumerable#sum for calculating a sum from the elements [David Heinemeier Hansson, jonathan@daikini.com]. Examples:
+
+        [1, 2, 3].sum
+        payments.sum { |p| p.price * p.tax_rate }
+        payments.sum(&:price)
+
+    This is instead of payments.inject(0) { |sum, p| sum + p.price }
+
+*   Correct and clarify Array#to_sentence docs.  #5458 *brad@madriska.com*
+
+*   alias_method_chain preserves method punctuation so foo, foo?, and foo! may be chained with the same feature. *Jeremy Kemper*
+        Example:
+          alias_method_chain :save!, :validation
+        is equivalent to
+          alias_method :save_without_validation!, :save!
+          alias_method :save!, :save_with_validation!
+
+*   Enhance Symbol#to_proc so it works with list objects, such as multi-dimensional arrays. Closes #5295 [nov@yo.rim.or.jp].  Example:
+
+        {1 => "one", 2 => "two", 3 => "three"}.sort_by(&:first).map(&:last)
+        # => ["one", "two", "three"]
+
+*   Added Hash.create_from_xml(string) which will create a hash from a XML string and even typecast if possible [David Heinemeier Hansson]. Example:
+
+        Hash.create_from_xml <<-EOT
+          <note>
+            <title>This is a note</title>
+            <created-at type="date">2004-10-10</created-at>
+          </note>
+        EOT
+
+    ...would return:
+
+        { :note => { :title => "This is a note", :created_at => Date.new(2004, 10, 10) } }
+
+*   Added Jim Weirich's excellent FlexMock class to vendor (Copyright 2003, 2004 by Jim Weirich (jim@weriichhouse.org)) -- it's not automatically required, though, so require 'flexmock' is still necessary *David Heinemeier Hansson*
+
+*   Fixed that Module#alias_method_chain should work with both foo? foo! and foo at the same time #4954 *anna@wota.jp*
+
+*   to_xml fixes, features, and speedup: introduce :dasherize option that converts updated_at to updated-at if true (the existing default); binary columns get encoding="base64" attribute; nil values get nil="true" attribute to distinguish empty values; add type information for float columns; allow arbitrarily deep :include; include SQL type information as the type attribute.  #4989 *Blair Zajac <blair@orcaware.com>*
+
+*   Add OrderedHash#values. *Sam Stephenson*
+
+*   Added Array#to_s(:db) that'll produce a comma-separated list of ids [David Heinemeier Hansson]. Example:
+
+        Purchase.find(:all, :conditions => "product_id IN (#{shops.products.to_s(:db)})"
+
+*   Normalize classify's argument to a String so that it plays nice with Symbols. *Marcel Molina Jr.*
+
+*   Strip out leading schema name in classify. References #5139. *Michael Schoen*
+
+*   Remove Enumerable#first_match since break(value) handles the use case well enough. *Nicholas Seckar*
+
+    Enumerable#first_match was like detect, but instead of returning the matching element, the yielded value returned. For example:
+
+        user_xml = adapters(:from => User, :to => Xml).first_match do |adapter|
+          adapter.adapt @user
+        end
+
+    But this is just as easily done with:
+
+        user_xml = adapters(:from => User, :to => Xml).each do
+          break adapter.adapt(@user)
+        end
+
+*   Make Array#in_groups_of just return the grouped collection if a block isn't given. *Marcel Molina Jr.*
+
+*   Don't destroy a HashWithIndifferentAccess if symbolize_keys! or  stringify_keys! is called on it. Closes #5076. *Marcel Molina Jr., guy.naor@famundo.com*
+
+*   Document Module::delegate. #5002 *pergesu@gmail.com*
+
+*   Replace alias method chaining with Module#alias_method_chain. *Marcel Molina Jr.*
+
+*   Strip out punctuation on predicates or bang methods being aliased with alias_method_chain since target?_without_feature is not a valid method name. Add tests for Module#alias_method_chain. *Marcel Molina Jr.*
+
+*   Replace Ruby's deprecated append_features in favor of included. *Marcel Molina Jr.*
+
+*   Allow default options in with_options to be overridden. Closes #4480. *murphy@cYcnus.de*
+
+*   Added Module#alias_method_chain *Jamis Buck*
+
+*   Updated to Builder 2.0 *David Heinemeier Hansson*
+
+*   Add Array#split for dividing arrays into one or more subarrays by value or block. *Sam Stephenson*
+
+## 1.3.1 (April 6th, 2006) ##
+
+*   Clean paths inside of exception messages and traces. *Nicholas Seckar*
+
+*   Add Pathname.clean_within for cleaning all the paths inside of a string. *Nicholas Seckar*
+
+*   provide an empty Dependencies::LoadingModule.load which prints deprecation warnings.  Lets 1.0 applications function with .13-style environment.rb.
+
+
+## 1.3.0 (March 27th, 2006) ##
+
+*   When possible, avoid incorrectly obtaining constants from parent modules. Fixes #4221. *Nicholas Seckar*
+
+*   Add more tests for dependencies; refactor existing cases. *Nicholas Seckar*
+
+*   Move Module#parent and Module#as_load_path into core_ext. Add Module#parent. *Nicholas Seckar*
+
+*   Add CachingTools::HashCaching to simplify the creation of nested, autofilling hashes. *Nicholas Seckar*
+
+*   Remove a hack intended to avoid unloading the same class twice, but which would not work anyways. *Nicholas Seckar*
+
+*   Update Object.subclasses_of to locate nested classes. This affects Object.remove_subclasses_of in that nested classes will now be unloaded. *Nicholas Seckar*
+
+*   Update Object.remove_subclasses_of to use Class.remove_class, reducing duplication. *Nicholas Seckar*
+
+*   Added Fixnum#seconds for consistency, so you can say 5.minutes + 30.seconds instead of 5.minutes + 30 #4389 *François Beausoleil*
+
+*   Added option to String#camelize to generate lower-cased camel case by passing in :lower, like "super_man".camelize(:lower) # => "superMan" *David Heinemeier Hansson*
+
+*   Added Hash#diff to show the difference between two hashes *Chris McGrath*
+
+*   Added Time#advance to do precise time time calculations for cases where a month being approximated to 30 days won't do #1860 *Rick Olson*
+
+*   Enhance Inflector.underscore to convert '-' into '_' (as the inverse of Inflector.dasherize) *Jamis Buck*
+
+*   Switched to_xml to use the xml schema format for datetimes.  This allows the encoding of time zones and should improve operability. *Michael Koziarski*
+
+*   Added a note to the documentation for the Date related Numeric extensions to indicate that they're
+    approximations and shouldn't be used for critical calculations. *Michael Koziarski*
+
+*   Added Hash#to_xml and Array#to_xml that makes it much easier to produce XML from basic structures [David Heinemeier Hansson]. Examples:
+
+        { :name => "David", :street_name => "Paulina", :age => 26, :moved_on => Date.new(2005, 11, 15) }.to_xml
+
+    ...returns:
+
+          <person>
+            <street-name>Paulina</street-name>
+            <name>David</name>
+            <age type="integer">26</age>
+            <moved-on type="date">2005-11-15</moved-on>
+          </person>
+
+*   Moved Jim Weirich's wonderful Builder from Action Pack to Active Support (it's simply too useful to be stuck in AP) *David Heinemeier Hansson*
+
+*   Fixed that Array#to_sentence will return "" on an empty array instead of ", and" #3842, #4031 *rubyonrails@beautifulpixel.com*
+
+*   Add Enumerable#group_by for grouping collections based on the result of some
+    block. Useful, for example, for grouping records by date.
+
+    ex.
+
+         latest_transcripts.group_by(&:day).each do |day, transcripts|
+           p "#{day} -> #{transcripts.map(&:class) * ', '}"
+         end
+         "2006-03-01 -> Transcript"
+         "2006-02-28 -> Transcript"
+         "2006-02-27 -> Transcript, Transcript"
+         "2006-02-26 -> Transcript, Transcript"
+
+    Add Array#in_groups_of, for iterating over an array in groups of a certain
+    size.
+
+    ex.
+
+         %w(1 2 3 4 5 6 7).in_groups_of(3) {|g| p g}
+         ["1", "2", "3"]
+         ["4", "5", "6"]
+         ["7", nil, nil]
+
+    *Marcel Molina Jr., Sam Stephenson*
+
+*   Added Kernel#daemonize to turn the current process into a daemon that can be killed with a TERM signal *David Heinemeier Hansson*
+
+*   Add 'around' methods to Logger,  to make it easy to log before and after messages for a given block as requested in #3809. [Michael Koziarski]  Example:
+
+    logger.around_info("Start rendering component (#{options.inspect}): ",
+                         "\n\nEnd of component rendering") { yield }
+
+*   Added Time#beginning_of_quarter #3607 *cohen.jeff@gmail.com*
+
+*   Fix Object.subclasses_of to only return currently defined objects *Jonathan Viney <jonathan@bluewire.net.nz>*
+
+*   Fix constantize to properly handle names beginning with '::'. *Nicholas Seckar*
+
+*   Make String#last return the string instead of nil when it is shorter than the limit [Scott Barron].
+
+*   Added delegation support to Module that allows multiple delegations at once (unlike Forwardable in the stdlib) [David Heinemeier Hansson]. Example:
+
+        class Account < ActiveRecord::Base
+          has_one :subscription
+          delegate :free?, :paying?, :to => :subscription
+          delegate :overdue?, :to => "subscription.last_payment"
+        end
+
+        account.free?    # => account.subscription.free?
+        account.overdue? # => account.subscription.last_payment.overdue?
+
+*   Fix Reloadable to handle the case where a class that has been 'removed' has not yet been garbage collected. *Nicholas Seckar*
+
+*   Don't allow Reloadable to be included into Modules.
+
+*   Remove LoadingModule. *Nicholas Seckar*
+
+*   Add documentation for Reloadable::Subclasses. *Nicholas Seckar*
+
+*   Add Reloadable::Subclasses which handles the common case where a base class should not be reloaded, but its subclasses should be. *Nicholas Seckar*
+
+*   Further improvements to reloading code *Nicholas Seckar, Trevor Squires*
+
+    - All classes/modules which include Reloadable can define reloadable? for fine grained control of reloading
+    - Class.remove_class uses Module#parent to access the parent module
+    - Class.remove_class expanded to handle multiple classes in a single call
+    - LoadingModule.clear! has been removed as it is no longer required
+    - Module#remove_classes_including has been removed in favor of Reloadable.reloadable_classes
+
+*   Added reusable reloading support through the inclusion of the Relodable module that all subclasses of ActiveRecord::Base, ActiveRecord::Observer, ActiveController::Base, and ActionMailer::Base automatically gets. This means that these classes will be reloaded by the dispatcher when Dependencies.mechanism = :load. You can make your own models reloadable easily:
+
+        class Setting
+          include Reloadable
+        end
+
+    Reloading a class is done by removing its constant which will cause it to be loaded again on the next reference. *David Heinemeier Hansson*
+
+*   Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb *Nicholas Seckar*
+
+*   Add Object#instance_exec, like instance_eval but passes its arguments to the block.  (Active Support will not override the Ruby 1.9 implementation of this method.) *Sam Stephenson*
+
+*   Add Proc#bind(object) for changing a proc or block's self by returning a Method bound to the given object. Based on why the lucky stiff's "cloaker" method. *Sam Stephenson*
+
+*   Fix merge and dup for hashes with indifferent access #3404 *Ken Miller*
+
+*   Fix the requires in option_merger_test to unbreak AS tests. *Sam Stephenson*
+
+*   Make HashWithIndifferentAccess#update behave like Hash#update by returning the hash. #3419, #3425 *asnem@student.ethz.ch, JanPrill@blauton.de, Marcel Molina Jr.*
+
+*   Add ActiveSupport::JSON and Object#to_json for converting Ruby objects to JSON strings. *Sam Stephenson*
+
+*   Add Object#with_options for DRYing up multiple calls to methods having shared options. [Sam Stephenson]  Example:
+
+    ActionController::Routing::Routes.draw do |map|
+        # Account routes
+        map.with_options(:controller => 'account') do |account|
+          account.home   '',       :action => 'dashboard'
+          account.signup 'signup', :action => 'new'
+          account.logout 'logout', :action => 'logout'
+        end
+    end
+
+*   Introduce Dependencies.warnings_on_first_load setting.  If true, enables warnings on first load of a require_dependency.  Otherwise, loads without warnings.  Disabled (set to false) by default.  *Jeremy Kemper*
+
+*   Active Support is warnings-safe.  #1792 *Eric Hodel*
+
+*   Introduce enable_warnings counterpart to silence_warnings.  Turn warnings on when loading a file for the first time if Dependencies.mechanism == :load.  Common mistakes such as redefined methods will print warnings to stderr.  *Jeremy Kemper*
+
+*   Add Symbol#to_proc, which allows for, e.g. [:foo, :bar].map(&:to_s). *Marcel Molina Jr.*
+
+*   Added the following methods [Marcel Molina Jr., Sam Stephenson]:
+    * Object#copy_instance_variables_from(object) to copy instance variables from one object to another
+    * Object#extended_by to get an instance's included/extended modules
+    * Object#extend_with_included_modules_from(object) to extend an instance with the modules from another instance
+
+## 1.2.5 (December 13th, 2005) ##
+
+*   Become part of Rails 1.0
+
+*   Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+## 1.2.3 (November 7th, 2005) ##
+
+*   Change Inflector#constantize to use eval instead of const_get. *Nicholas Seckar*
+
+*   Fix const_missing handler to ignore the trailing '.rb' on files when comparing paths. *Nicholas Seckar*
+
+*   Define kernel.rb methods in "class Object" instead of "module Kernel" to work around a Windows peculiarity *Sam Stephenson*
+
+*   Fix broken tests caused by incomplete loading of active support. *Nicholas Seckar*
+
+*   Fix status pluralization bug so status_codes doesn't get pluralized as statuses_code.  #2758 *keithm@infused.org*
+
+*   Added Kernel#silence_stderr to silence stderr for the duration of the given block *Sam Stephenson*
+
+*   Changed Kernel#` to print a message to stderr (like Unix) instead of raising Errno::ENOENT on Win32 *Sam Stephenson*
+
+*   Changed 0.blank? to false rather than true since it violates everyone's expectation of blankness.  #2518, #2705 *rails@jeffcole.net*
+
+*   When loading classes using const_missing, raise a NameError if and only if the file we tried to load was not present. *Nicholas Seckar*
+
+*   Added petabytes and exebytes to numeric extensions #2397 *timct@mac.com*
+
+*   Added Time#end_of_month to accompany Time#beginning_of_month #2514 *Jens-Christian Fischer*
+
+
+## 1.2.2 (October 26th, 2005) ##
+
+*   Set Logger.silencer = false to disable Logger#silence.  Useful for debugging fixtures.
+
+*   Add title case method to String to do, e.g., 'action_web_service'.titlecase #  => 'Action Web Service'. *Marcel Molina Jr.*
+
+
+## 1.2.1 (October 19th, 2005) ##
+
+*   Classify generated routing code as framework code to avoid appearing in application traces. *Nicholas Seckar*
+
+*   Show all framework frames in the framework trace. *Nicholas Seckar*
+
+
+## 1.2.0 (October 16th, 2005) ##
+
+*   Update Exception extension to show the first few framework frames in an application trace. *Nicholas Seckar*
+
+*   Added Exception extension to provide support for clean backtraces. *Nicholas Seckar*
+
+*   Updated whiny nil to be more concise and useful. *Nicholas Seckar*
+
+*   Added Enumerable#first_match *Nicholas Seckar*
+
+*   Fixed that Time#change should also reset usec when also resetting minutes #2459 *ikeda@dream.big.or.jp*
+
+*   Fix Logger compatibility for distributions that don't keep Ruby and its standard library in sync.
+
+*   Replace '%e' from long and short time formats as Windows does not support it. #2344. *Tom Ward <tom@popdog.net>*
+
+*   Added to_s(:db) to Range, so you can get "BETWEEN '2005-12-10' AND '2005-12-12'" from Date.new(2005, 12, 10)..Date.new(2005, 12, 12) (and likewise with Times)
+
+*   Moved require_library_or_gem into Kernel. #1992 *Michael Schuerig <michael@schuerig.de>*
+
+*   Add :rfc822 as an option for Time#to_s (to get rfc822-formatted times)
+
+*   Chain the const_missing hook to any previously existing hook so rails can play nicely with rake
+
+*   Clean logger is compatible with both 1.8.2 and 1.8.3 Logger.  #2263 *Michael Schuerig <michael@schuerig.de>*
+
+*   Added native, faster implementations of .blank? for the core types #2286 *skae*
+
+*   Fixed clean logger to work with Ruby 1.8.3 Logger class #2245
+
+*   Fixed memory leak with Active Record classes when Dependencies.mechanism = :load #1704 *Chris McGrath*
+
+*   Fixed Inflector.underscore for use with acronyms, so HTML becomes html instead of htm_l #2173 *k@v2studio.com*
+
+*   Fixed dependencies related infinite recursion bug when a controller file does not contain a controller class. Closes #1760. *rcolli2@tampabay.rr.com*
+
+*   Fixed inflections for status, quiz, move #2056 *deirdre@deirdre.net*
+
+*   Added Hash#reverse_merge, Hash#reverse_merge!, and Hash#reverse_update to ease the use of default options
+
+*   Added Array#to_sentence that'll turn ['one', 'two', 'three'] into "one, two, and three" #2157 *Manfred Stienstra*
+
+*   Added Kernel#silence_warnings to turn off warnings temporarily for the passed block
+
+*   Added String#starts_with? and String#ends_with? #2118 *Thijs van der Vossen*
+
+*   Added easy extendability to the inflector through Inflector.inflections (using the Inflector::Inflections singleton class). Examples:
+
+        Inflector.inflections do |inflect|
+          inflect.plural /^(ox)$/i, '\1\2en'
+          inflect.singular /^(ox)en/i, '\1'
+
+          inflect.irregular 'octopus', 'octopi'
+
+          inflect.uncountable "equipment"
+        end
+
+*   Added String#at, String#from, String#to, String#first, String#last in ActiveSupport::CoreExtensions::String::Access to ease access to individual characters and substrings in a string serving basically as human names for range access.
+
+*   Make Time#last_month work when invoked on the 31st of a month.
+
+*   Add Time.days_in_month, and make Time#next_month work when invoked on the 31st of a month
+
+*   Fixed that Time#midnight would have a non-zero usec on some platforms #1836
+
+*   Fixed inflections of "index/indices" #1766 *damn_pepe@gmail.com*
+
+*   Added stripping of _id to String#humanize, so "employee_id" becomes "Employee" #1574 *Justin French*
+
+*   Factor Fixnum and Bignum extensions into Integer extensions *Nicholas Seckar*
+
+*   Hooked #ordinalize into Fixnum and Bignum classes. *Nicholas Seckar, danp*
+
+*   Added Fixnum#ordinalize to turn 1.ordinalize to "1st", 3.ordinalize to "3rd", and 10.ordinalize to "10th" and so on #1724 *paul@cnt.org*
+
+
+## 1.1.1 (11 July, 2005) ##
+
+*   Added more efficient implementation of the development mode reset of classes #1638 *Chris McGrath*
+
+
+## 1.1.0 (6 July, 2005) ##
+
+*   Fixed conflict with Glue gem #1606 *Rick Olson*
+
+*   Added new rules to the Inflector to deal with more unusual plurals mouse/louse => mice/lice, information => information, ox => oxen, virus => viri, archive => archives #1571, #1583, #1490, #1599, #1608 *foamdino@gmail.com/others*
+
+*   Fixed memory leak with Object#remove_subclasses_of, which inflicted a Rails application running in development mode with a ~20KB leak per request #1289 *Chris McGrath*
+
+*   Made 1.year == 365.25.days to account for leap years.  This allows you to do User.find(:all, :conditions => ['birthday > ?', 50.years.ago]) without losing a lot of days.  #1488 *tuxie@dekadance.se*
+
+*   Added an exception if calling id on nil to WhinyNil #584 *kevin-temp@writesoon.com*
+
+*   Added Fix/Bignum#multiple_of? which returns true on 14.multiple_of?(7) and false on 16.multiple_of?(7) #1464 *Thomas Fuchs*
+
+*   Added even? and odd? to work with Bignums in addition to Fixnums #1464 *Thomas Fuchs*
+
+*   Fixed Time#at_beginning_of_week returned the next Monday instead of the previous one when called on a Sunday #1403 *jean.helou@gmail.com*
+
+*   Increased the speed of indifferent hash access by using Hash#default.  #1436 *Nicholas Seckar*
+
+*   Added that "   " is now also blank? (using strip if available)
+
+*   Fixed Dependencies so all modules are able to load missing constants #1173 *Nicholas Seckar*
+
+*   Fixed the Inflector to underscore strings containing numbers, so Area51Controller becomes area51_controller #1176 *Nicholas Seckar*
+
+*   Fixed that HashWithIndifferentAccess stringified all keys including symbols, ints, objects, and arrays #1162 *Nicholas Seckar*
+
+*   Fixed Time#last_year to go back in time, not forward #1278 *fabien@odilat.com*
+
+*   Fixed the pluralization of analysis to analyses #1295 *seattle@rootimage.msu.edu*
+
+*   Fixed that Time.local(2005,12).months_since(1) would raise "ArgumentError: argument out of range" #1311 *jhahn@niveon.com*
+
+*   Added silencing to the default Logger class
+
+
+## 1.0.4 (19th April, 2005) ##
+
+*   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*
+
+*   Fixed inflection of perspectives and similar words #1045 *Thijs van der Vossen*
+
+*   Added Fixnum#even? and Fixnum#odd?
+
+*   Fixed problem with classes being required twice. Object#const_missing now uses require_dependency to load files. It used to use require_or_load which would cause models to be loaded twice, which was not good for validations and other class methods #971 *Nicholas Seckar*
+
+
+## 1.0.3 (27th March, 2005) ##
+
+*   Fixed Inflector.pluralize to handle capitalized words #932 *Jeremy Kemper*
+
+*   Added Object#suppress which allows you to make a saner choice around with exceptions to swallow #980. Example:
+
+        suppress(ZeroDivisionError) { 1/0 }
+
+    ...instead of:
+
+        1/0 rescue nil # BAD, EVIL, DIRTY.
+
+
+## 1.0.2 (22th March, 2005) ##
+
+*   Added Kernel#returning -- a Ruby-ized realization of the K combinator, courtesy of Mikael Brockman.
+
+        def foo
+          returning values = [] do
+            values << 'bar'
+            values << 'baz'
+          end
+        end
+
+        foo # => ['bar', 'baz']
+
+
+## 1.0.1 (7th March, 2005) ##
+
+*   Fixed Hash#indifferent_access to also deal with include? and fetch and nested hashes #726 *Nicholas Seckar*
+
+*   Added Object#blank? -- see http://redhanded.hobix.com/inspect/objectBlank.html #783 *_why the lucky stiff*
+
+*   Added inflection rules for "sh" words, like "wish" and "fish" #755 *phillip@pjbsoftware.com*
+
+*   Fixed an exception when using Ajax based requests from Safari because Safari appends a \000 to the post body. Symbols can't have \000 in them so indifferent access would throw an exception in the constructor. Indifferent hashes now use strings internally instead. #746 *Tobias Lütke*
+
+*   Added String#to_time and String#to_date for wrapping ParseDate
+
+
+## 1.0.0 (24th February, 2005) ##
+
+*   Added TimeZone as the first of a number of value objects that among others Active Record can use rich value objects using composed_of #688 *Jamis Buck*
+
+*   Added Date::Conversions for getting dates in different convenient string representations and other objects
+
+*   Added Time::Conversions for getting times in different convenient string representations and other objects
+
+*   Added Time::Calculations to ask for things like Time.now.tomorrow, Time.now.yesterday, Time.now.months_ago(4) #580 [DP|Flurin]. Examples:
+
+        "Later today"         => now.in(3.hours),
+        "Tomorrow morning"    => now.tomorrow.change(:hour => 9),
+        "Tomorrow afternoon"  => now.tomorrow.change(:hour => 14),
+        "In a couple of days" => now.tomorrow.tomorrow.change(:hour => 9),
+        "Next monday"         => now.next_week.change(:hour => 9),
+        "In a month"          => now.next_month.change(:hour => 9),
+        "In 6 months"         => now.months_since(6).change(:hour => 9),
+        "In a year"           => now.in(1.year).change(:hour => 9)
+
+*   Upgraded to breakpoint 92 which fixes:
+
+        * overload IRB.parse_opts(), fixes #443
+          => breakpoints in tests work even when running them via rake
+        * untaint handlers, might fix an issue discussed on the Rails ML
+        * added verbose mode to breakpoint_client
+        * less noise caused by breakpoint_client by default
+        * ignored TerminateLineInput exception in signal handler
+          => quiet exit on Ctrl-C
+
+*   Fixed Inflector for words like "news" and "series" that are the same in plural and singular #603 [echion], #615 *marcenuc*
+
+*   Added Hash#stringify_keys and Hash#stringify_keys!
+
+*   Added IndifferentAccess as a way to wrap a hash by a symbol-based store that also can be accessed by string keys
+
+*   Added Inflector.constantize to turn "Admin::User" into a reference for the constant Admin::User
+
+*   Added that Inflector.camelize and Inflector.underscore can deal with modules like turning "Admin::User" into "admin/user" and back
+
+*   Added Inflector.humanize to turn attribute names like employee_salary into "Employee salary". Used by automated error reporting in AR.
+
+*   Added availability of class inheritable attributes to the masses #477 *Jeremy Kemper*
+
+        class Foo
+          class_inheritable_reader :read_me
+          class_inheritable_writer :write_me
+          class_inheritable_accessor :read_and_write_me
+          class_inheritable_array :read_and_concat_me
+          class_inheritable_hash :read_and_update_me
+        end
+
+        # Bar gets a clone of (not a reference to) Foo's attributes.
+        class Bar < Foo
+        end
+
+        Bar.read_and_write_me == Foo.read_and_write_me
+        Bar.read_and_write_me = 'bar'
+        Bar.read_and_write_me != Foo.read_and_write_me
+
+*   Added Inflections as an extension on String, so Inflector.pluralize(Inflector.classify(name)) becomes name.classify.pluralize #476 *Jeremy Kemper*
+
+*   Added Byte operations to Numeric, so 5.5.megabytes + 200.kilobytes #461 *Marcel Molina Jr.*
+
+*   Fixed that Dependencies.reload can't load the same file twice #420 *Kent Sibilev*
+
+*   Added Fixnum#ago/until, Fixnum#since/from_now #450 *Jeremy Kemper*
+
+*   Added that Inflector now accepts Symbols and Classes by calling .to_s on the word supplied
+
+*   Added time unit extensions to Fixnum that'll return the period in seconds, like 2.days + 4.hours.
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
deleted file mode 100644
index 404bc73b0b..0000000000
--- a/railties/CHANGELOG
+++ /dev/null
@@ -1,2390 +0,0 @@
-*Rails 3.2.0 (unreleased)*
-
-* Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box. [José Valim]
-
-* Updated Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications [DHH]
-
-* Default options to `rails new` can be set in ~/.railsrc [Guillermo Iguaran]
-
-* Added destroy alias to Rails engines. [Guillermo Iguaran]
-
-* Added destroy alias for Rails command line. This allows the following: `rails d model post`. [Andrey Ognevsky]
-
-* Attributes on scaffold and model generators default to string. This allows the following: "rails g scaffold Post title body:text author" [José Valim]
-
-* Removed old plugin generator (`rails generate plugin`) in favor of `rails plugin new` command. [Guillermo Iguaran]
-
-* Removed old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API. [Guillermo Iguaran]
-
-
-*Rails 3.1.1
-
-* Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. [Santiago Pastorino]
-
-* Add config.assets.initialize_on_precompile which, when set to false, forces
-  `rake assets:precompile` to load 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.
-
-
-*Rails 3.1.0 (August 30, 2011)*
-
-* The default database schema file is written as UTF-8. [Aaron Patterson]
-
-* Generated apps with --dev or --edge flags depend on git versions of
-sass-rails and coffee-rails. [Santiago Pastorino]
-
-* Rack::Sendfile middleware is used only if x_sendfile_header is present. [Santiago Pastorino]
-
-* Add JavaScript Runtime name to the Rails Info properties. [DHH]
-
-* Make pp enabled by default in Rails console. [Akira Matsuda]
-
-* Add alias `r` for rails runner. [Jordi Romero]
-
-* Make sprockets/railtie require explicit and add --skip-sprockets to app generator [José Valim]
-
-* Added Rails.groups that automatically handles Rails.env and ENV["RAILS_GROUPS"] [José Valim]
-
-* The new rake task assets:clean removes precompiled assets. [fxn]
-
-* Application and plugin generation run bundle install unless --skip-gemfile or --skip-bundle. [fxn]
-
-* Fixed database tasks for jdbc* adapters #jruby [Rashmi Yadav]
-
-* Template generation for jdbcpostgresql  #jruby [Vishnu Atrai]
-
-* Template generation for jdbcmysql and jdbcsqlite3 #jruby [Arun Agrawal]
-
-* The -j option of the application generator accepts an arbitrary string. If passed "foo",
-the gem "foo-rails" is added to the Gemfile, and the application JavaScript manifest
-requires "foo" and "foo_ujs". As of this writing "prototype-rails" and "jquery-rails"
-exist and provide those files via the asset pipeline. Default is "jquery". [fxn]
-
-* jQuery is no longer vendored, it is provided from now on by the jquery-rails gem. [fxn]
-
-* Prototype and Scriptaculous are no longer vendored, they are provided from now on
-by the prototype-rails gem. [fxn]
-
-* The scaffold controller will now produce SCSS file if Sass is available [Prem Sichanugrist]
-
-* The controller and resource generators will now automatically produce asset stubs (this can be turned off with --skip-assets). These stubs will use Coffee and Sass, if those libraries are available. [DHH]
-
-* jQuery is the new default JavaScript library. [fxn]
-
-* Changed scaffold, application, and mailer generator to create Ruby 1.9 style hash when running on Ruby 1.9 [Prem Sichanugrist]
-
-  So instead of creating something like:
-
-    redirect_to users_path, :notice => "User has been created"
-
-  it will now be like this:
-
-    redirect_to users_path, notice: "User has been created"
-
-  You can also passing `--old-style-hash` to make Rails generate old style hash even you're on Ruby 1.9
-
-* Changed scaffold_controller generator to create format block for JSON instead of XML [Prem Sichanugrist]
-
-* Add using Turn with natural language test case names for test_help.rb when running with minitest (Ruby 1.9.2+) [DHH]
-
-* Direct logging of Active Record to STDOUT so it's shown inline with the results in the console [DHH]
-
-* Added `config.force_ssl` configuration which loads Rack::SSL middleware and force all requests to be under HTTPS protocol [DHH, Prem Sichanugrist, and Josh Peek]
-
-* Added `rails plugin new` command which generates rails plugin with gemspec, tests and dummy application for testing [Piotr Sarnacki]
-
-* Added -j parameter with jquery/prototype as options. Now you can create your apps with jQuery using `rails new myapp -j jquery`. The default is still Prototype. [siong1987]
-
-* Added Rack::Etag and Rack::ConditionalGet to the default middleware stack [José Valim]
-
-* Added Rack::Cache to the default middleware stack [Yehuda Katz and Carl Lerche]
-
-* Engine is now rack application [Piotr Sarnacki]
-
-* Added middleware stack to Engine [Piotr Sarnacki]
-
-* Engine can now load plugins [Piotr Sarnacki]
-
-* Engine can load its own environment file [Piotr Sarnacki]
-
-* Added helpers to call engines' route helpers from application and vice versa [Piotr Sarnacki]
-
-* Task for copying plugins' and engines' migrations to application's db/migrate directory [Piotr Sarnacki]
-
-* Changed ActionDispatch::Static to allow handling multiple directories [Piotr Sarnacki]
-
-* Added isolate_namespace() method to Engine, which sets Engine as isolated [Piotr Sarnacki]
-
-* Include all helpers from plugins and shared engines in application [Piotr Sarnacki]
-
-
-*Rails 3.0.7 (April 18, 2011)*
-
-*No changes.
-
-
-*Rails 3.0.6 (April 5, 2011)
-
-* No changes.
-
-
-*Rails 3.0.5 (February 26, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.4 (February 8, 2011)*
-
-* No changes.
-
-
-*Rails 3.0.3 (November 16, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.2 (November 15, 2010)*
-
-* No changes.
-
-
-*Rails 3.0.1 (October 15, 2010)*
-
-* No Changes, just a version bump.
-
-
-*Rails 3.0.0 (August 29, 2010)*
-
-* Application generation: --skip-testunit and --skip-activerecord become --skip-test-unit and --skip-active-record respectively. [fxn]
-
-* Added console to Rails::Railtie as a hook called just after console starts. [José Valim]
-
-* Rails no longer autoload code in lib for application. You need to explicitly require it. [José Valim]
-
-* Rails::LogSubscriber was renamed to ActiveSupport::LogSubscriber [José Valim]
-
-* config.load_(once_)paths in config/application.rb got renamed to config.autoload_(once_)paths. [fxn]
-
-* Abort generation/booting on Ruby 1.9.1. [fxn]
-
-* Made the rails command work even when you're in a subdirectory [Chad Fowler]
-
-* Removed Rails Metal [Yehuda Katz, José Valim].
-
-* Renamed config.cookie_secret to config.secret_token and pass it as env key. [José Valim]
-
-* Session store configuration has changed [Yehuda Katz, Carl Lerche]
-
-    config.session_store :cookie_store, {:key => "..."}
-    config.cookie_secret = "fdsfhisdghfidugnfdlg"
-
-* railtie_name and engine_name are deprecated. You can now add any object to
-  the configuration object: config.your_plugin = {} [José Valim]
-
-* Added config.generators.templates to provide alternative paths for the generators
-  to look for templates [José Valim]
-
-* Added "rake about" as a replacement for script/about [DHH]
-
-* Removed all the default commands in script/* and replaced them with script/rails and a rails command that'll act the same when run from within the app [DHH]. Example:
-
-  ./script/generate scaffold post title:string  can now be called as  rails g scaffold post title:string
-
-  Run rails --help inside an app for more help.
-
-* Removed config/initializers/new_rails_defaults.rb as all frameworks now follow the settings from it [DHH]
-
-* Set config.time_zone to UTC by default [DHH]
-
-* Added default .gitignore (this is just recognizing Git market share, don't throw a hissy if you use another SCM) [DHH]
-
-* Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH]. Examples:
-
-    cookies.permanent[:prefers_open_id] = true
-    # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
-
-    cookies.signed[:discount] = 45
-    # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
-
-    cookies.signed[:discount]
-    # => 45 (if the cookie was changed, you'll get a InvalidSignature exception)
-
-    cookies.permanent.signed[:remember_me] = current_user.id
-    # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
-
-  ...to use the signed cookies, you need to set a secret to ActionController::Base.cookie_verifier_secret (automatically done in config/initializers/cookie_verification_secret.rb for new Rails applications).
-
-* Added config/initializers/cookie_verification_secret.rb with an auto-generated secret for using ActionController::Base#cookies.signed [DHH]
-
-* Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH]
-
-* I18n support for plugins.  #2325 [Antonio Tapiador, Sven Fuchs]
-
-* Ruby 1.9: use UTF-8 for default internal and external encodings.  [Jeremy Kemper]
-
-* Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) [DHH]
-
-
-*2.3.2 [Final] (March 15, 2009)*
-
-* Remove outdated script/plugin options [Pratik Naik]
-
-* Allow metal to live in plugins #2045 [Matthew Rudy]
-
-* Added metal [Josh Peek]
-
-* Remove script/performance/request in favour of the performance integration tests. [Pratik Naik]
-
-  To continue using script/performance/request, install the request_profiler plugin :
-
-    script/plugin install git://github.com/rails/request_profiler.git
-
-* Add a rake task to apply a template to an existing application : rake rails:template LOCATION=~/template.rb [Pratik Naik]
-
-* Add "-m/--template" option to Rails generator to apply a template to the generated application. [Jeremy McAnally]
-
-    This has been extracted from rg - http://github.com/jeremymcanally/rg
-
-    Example:
-
-        # template.rb
-
-        # Install plugins from git or svn
-        plugin "will-paginate", :git => "git://github.com/mislav/will_paginate.git"
-        plugin "old-restful-auth", :svn => "http://svn.techno-weenie.net/projects/plugins/restful_authentication/"
-
-        # Add gems to environment.rb
-        gem "jeremymcanally-context"
-        gem "bluecloth"
-
-        # Vendor file. Data in a string or...
-        vendor("borrowed.rb", <<CODE
-          def helpful_method
-            do_something_helpful_here
-          end
-        CODE
-
-        # ...file data from block return value.
-        # #initializer creates a new initializer file
-        initializer("crypto.rb") do
-          salt = "--#{Time.now}--#{rand}--#{srand(Time.now.to_i)}"
-
-          "SPECIAL_SALT = '#{salt}'"
-        end
-
-    Usage:
-
-      To use a template, provide a file path or URL:
-
-      1. Using a local file :
-
-        rails <application name> -m /path/to/my/template.rb
-
-      2. Or directly from a URL :
-
-        rails <application name> --template=http://gist.github.com/31208.txt
-
-* Extracted the process scripts (inspector, reaper, spawner) into the plugin irs_process_scripts [David Heinemeier Hansson]
-
-* Changed Rails.root to return a Pathname object (allows for Rails.root.join('app', 'controllers') => "#{RAILS_ROOT}/app/controllers") #1482 [Damian Janowski/?]
-
-* Added view path support for engines [David Heinemeier Hansson]
-
-* Added that config/routes.rb files in engine plugins are automatically loaded (and reloaded when they change in dev mode) [David Heinemeier Hansson]
-
-* Added app/[models|controllers|helpers] to the load path for plugins that has an app directory (go engines ;)) [David Heinemeier Hansson]
-
-* Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used. Turn this on for Passenger and JRuby. Also turned on by config.threadsafe!  [Jeremy Kemper]
-
-* Add a rake task to generate dispatchers : rake rails:generate_dispatchers [Pratik Naik]
-
-* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. [Yaroslav Markin, Pratik Naik]
-
-* Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner]
-
-* Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) [David Heinemeier Hansson]
-
-* Switch from Test::Unit::TestCase to ActiveSupport::TestCase.  [Jeremy Kemper]
-
-* Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [David Heinemeier Hansson]
-
-* BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [David Heinemeier Hansson]
-
-
-*2.2.1 [RC2] (November 14th, 2008)*
-
-* Fixed plugin generator so that generated unit tests would subclass ActiveSupport::TestCase, also introduced a helper script to reduce the needed require statements #1137 [Mathias Meyer]
-
-* Update Prototype to 1.6.0.3 [sam]
-
-
-*2.2.0 [RC1] (October 24th, 2008)*
-
-* Fixed that sqlite would report "db/development.sqlite3 already exists" whether true or not on db:create #614 [Antonio Cangiano]
-
-* Added config.threadsafe! to toggle allow concurrency settings and disable the dependency loader [Josh Peek]
-
-* Turn cache_classes on by default [Josh Peek]
-
-* Added configurable eager load paths. Defaults to app/models, app/controllers, and app/helpers [Josh Peek]
-
-* Introduce simple internationalization support.  [Ruby i18n team]
-
-* Make script/plugin install <plugin> -r <revision> option work with git based plugins. #257. [Tim Pope Jakub Kuźma]. Example:
-
-  script/plugin install git://github.com/mislav/will_paginate.git -r agnostic # Installs 'agnostic' branch
-  script/plugin install git://github.com/dchelimsky/rspec.git -r 'tag 1.1.4'
-
-* Added Rails.initialized? flag [Josh Peek]
-
-* Make rake test:uncommitted work with Git. [Tim Pope]
-
-* Added Thin support to script/server.  #488 [Bob Klosinski]
-
-* Fix script/about in production mode.  #370 [Cheah Chu Yeow, Xavier Noria, David Krmpotic]
-
-* Add the gem load paths before the framework is loaded, so certain gems like RedCloth and BlueCloth can be frozen.
-
-* Fix discrepancies with loading rails/init.rb from gems.
-
-* Plugins check for the gem init path (rails/init.rb) before the standard plugin init path (init.rb)  [Jacek Becela]
-
-* Changed all generated tests to use the test/do declaration style [David Heinemeier Hansson]
-
-* Wrapped Rails.env in StringInquirer so you can do Rails.env.development? [David Heinemeier Hansson]
-
-* Fixed that RailsInfoController wasn't considering all requests local in development mode (Edgard Castro) [#310 state:resolved]
-
-
-*2.1.0 (May 31st, 2008)*
-
-* script/dbconsole fires up the command-line database client.  #102 [Steve Purcell]
-
-* Fix bug where plugin init.rb files from frozen gem specs weren't being run.  (pjb3) [#122 state:resolved]
-
-* Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) [#88]
-
-* Rails Edge info returns the latest git commit hash [Francesc Esplugas]
-
-* Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [Nick Sieger]
-
-* rake time:zones:local finds correct base utc offset for zones in the Southern Hemisphere [Geoff Buesing]
-
-* Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [Rick Olson]
-
-* script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Jonathan del Strother]
-
-* Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. #11513 [ddollar]
-
-  rake gems:unpack             # unpacks all gems
-  rake gems:unpack GEM=mygem   # unpacks only the gem 'mygem'
-
-  rake gems:build              # builds all unpacked gems
-  rake gems:build GEM=mygem    # builds only the gem 'mygem'
-
-* Add config.active_support for future configuration options.  Also, add more new Rails 3 config settings to new_rails_defaults.rb [Rick Olson]
-
-* Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants [Pratik Naik]
-
-* Allow files in plugins to be reloaded like the rest of the application.  [Rick Olson]
-
-  Enables or disables plugin reloading.
-
-    config.reload_plugins = true
-
-  You can get around this setting per plugin.
-  If #reload_plugins? == false (DEFAULT), add this to your plugin's init.rb to make it reloadable:
-
-    Dependencies.load_once_paths.delete lib_path
-
-  If #reload_plugins? == true, add this to your plugin's init.rb to only load it once:
-
-    Dependencies.load_once_paths << lib_path
-
-* Small tweak to allow plugins to specify gem dependencies.  [Rick Olson]
-
-  # OLD open_id_authentication plugin init.rb
-  require 'yadis'
-  require 'openid'
-  ActionController::Base.send :include, OpenIdAuthentication
-
-  # NEW
-  config.gem "ruby-openid", :lib => "openid", :version => "1.1.4"
-  config.gem "ruby-yadis",  :lib => "yadis",  :version => "0.3.4"
-
-  config.after_initialize do
-    ActionController::Base.send :include, OpenIdAuthentication
-  end
-
-* Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [Rick Olson]
-
-  Rails::Initializer.run do |config|
-    config.gem "bj"
-    config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-    config.gem "aws-s3", :lib => "aws/s3"
-  end
-
-  # List required gems.
-  rake gems
-
-  # Install all required gems:
-  rake gems:install
-
-  # Unpack specified gem to vendor/gems/gem_name-x.x.x
-  rake gems:unpack GEM=bj
-
-* Removed the default .htaccess configuration as there are so many good deployment options now (kept it as an example in README) [David Heinemeier Hansson]
-
-* config.time_zone accepts TZInfo::Timezone identifiers as well as Rails TimeZone identifiers [Geoff Buesing]
-
-* Rails::Initializer#initialize_time_zone raises an error if value assigned to config.time_zone is not recognized. Rake time zone tasks only require ActiveSupport instead of entire environment [Geoff Buesing]
-
-* Stop adding the antiquated test/mocks/* directories and only add them to the path if they're still there for legacy reasons [David Heinemeier Hansson]
-
-* Added that gems can now be plugins if they include rails/init.rb #11444 [John Barnette]
-
-* Added Plugin#about method to programmatically access the about.yml in a plugin #10979 [James Adam]
-
-    plugin = Rails::Plugin.new(path_to_my_plugin)
-    plugin.about["author"] # => "James Adam"
-    plugin.about["url"] # => "http://interblah.net"
-
-* Improve documentation. [Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert]
-
-* Added config.time_zone = 'UTC' in the default environment.rb [Geoff Buesing]
-
-* Added rake tasks time:zones:all, time:zones:us and time:zones:local for finding time zone names for config.time_zone option [Geoff Buesing]
-
-* Add config.time_zone for configuring the default Time.zone value.  #10982 [Geoff Buesing]
-
-* Added support for installing plugins hosted at git repositories #11294 [Jack Danger Canty]
-
-* Fixed that script/generate would not look for plugin generators in plugin_paths #11000 [glv]
-
-* Fixed database rake tasks to work with charset/collation and show proper error messages on failure. Closes #11301 [matt]
-
-* Added a -e/--export to script/plugin install, uses svn export. #10847 [jon@blankpad.net)]
-
-* Reshuffle load order so that routes and observers are initialized after plugins and app initializers.  Closes #10980 [Rick Olson]
-
-* Git support for script/generate.  #10690 [ssoroka]
-
-* Update scaffold to use labels instead of bold tags.  Closes #10757 [zach-inglis-lt3]
-
-* Resurrect WordNet synonym lookups.  #10710 [tom./, matt]
-
-* Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [David Heinemeier Hansson]
-
-* Added that rails:update is run when you do rails:freeze:edge to ensure you also get the latest JS and config files #10565 [jeff]
-
-* SQLite: db:drop:all doesn't fail silently if the database is already open.  #10577 [Cheah Chu Yeow, mrichman]
-
-* Introduce native mongrel handler and push mutex into dispatcher.  [Jeremy Kemper]
-
-* Ruby 1.9 compatibility.  #1689, #10546 [Cheah Chu Yeow, frederico]
-
-
-*2.0.2* (December 16th, 2007)
-
-* Changed the default database from mysql to sqlite3, so now running "rails myapp" will have a config/database.yml that's setup for SQLite3 (which in OS X Leopard is installed by default, so is the gem, so everything Just Works with no database configuration at all). To get a Rails application preconfigured for MySQL, just run "rails -d mysql myapp" [David Heinemeier Hansson]
-
-* Turned on ActionView::Base.cache_template_loading by default in config/environments/production.rb to prevent file system stat calls for every template loading to see if it changed (this means that you have to restart the application to see template changes in production mode) [David Heinemeier Hansson]
-
-* Introduce `rake secret` to output a crytographically secure secret key for use with cookie sessions #10363 [revans]
-
-* Fixed that local database creation should consider 127.0.0.1 local #9026 [parcelbrat]
-
-* Fixed that functional tests generated for scaffolds should use fixture calls instead of hard-coded IDs #10435 [boone]
-
-* Added db:migrate:redo and db:migrate:reset for rerunning existing migrations #10431, #10432  [matt]
-
-* RAILS_GEM_VERSION may be double-quoted also.  #10443 [James Cox]
-
-* Update rails:freeze:gems to work with RubyGems 0.9.5.  [Jeremy Kemper]
-
-
-*2.0.1* (December 7th, 2007)
-
-* Fixed Active Record bug
-
-
-*2.0.0* (December 6th, 2007)
-
-* The test task stops with a warning if you have pending migrations.  #10377 [Josh Knowles]
-
-* Add warning to documentation about using transactional fixtures when the code under test uses transactions itself. Closes #7548 [Thijs van der Vossen]
-
-* Update Prototype to 1.6.0.1.  [sam]
-
-* Update script.aculo.us to 1.8.0.1.  [madrobby]
-
-* Added db:fixtures:identity as a way of locating what ID a foxy fixture was assigned #10332 [John Barnette]
-
-* Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 [John Barnette]
-
-* Update to Prototype -r8232.  [sam]
-
-* Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later.  #10286 [Hongli Lai (Phusion)]
-
-* RAILS_GEM_VERSION may be set to any valid gem version specifier.  #10057 [Chad Woolley, Cheah Chu Yeow]
-
-* Load config/preinitializer.rb, if present, before loading the environment.  #9943 [Chad Woolley]
-
-* FastCGI handler ignores unsupported signals like USR2 on Windows.  [Grzegorz Derebecki]
-
-* Only load ActionMailer::TestCase if ActionMailer is loaded.  Closes #10137 [defunkt]
-
-* Fixed that db:reset would use migrations instead of loading db/schema.rb [David Heinemeier Hansson]
-
-* Ensure the plugin loader only loads plugins once.  Closes #10102 [haruki_zaemon]
-
-* Refactor Plugin Loader.  Add plugin lib paths early, and add lots of tests.  Closes #9795 [James Adam]
-
-* Added --skip-timestamps to generators that produce models #10036 [Tim Pope]
-
-* Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.  [sam, madrobby]
-
-* Added db:rollback to rollback the schema one version (or multiple as specified by STEP) [Jeffrey Allan Hardy]
-
-* Fix typo in test_helper. Closes #9925 [viktor tron]
-
-* Request profiler.  [Jeremy Kemper]
-
-* config/boot.rb correctly detects RAILS_GEM_VERSION.  #9834 [alexch, thewoolleyman]
-
-* Fixed incorrect migration number if script/generate executed outside of Rails root #7080 [Jeremy McAnally]
-
-* Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0.  [sam, madrobby]
-
-* Generated fixtures use the actual primary key instead of id.  #4343 [Frederick Ros, Tarmo Tänav]
-
-* Extend the console +helper+ method to allow you to include custom helpers.  e.g:
-  >> helper :posts
-  >> helper.some_method_from_posts_helper(Post.find(1))
-
-* db:create works with remote databases whereas db:create:all only creates
-databases on localhost.  #9753 [Trevor Wennblom]
-
-* Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb [David Heinemeier Hansson]
-
-* Add --prefix option to script/server when using mongrel. [dacat]
-
-
-*2.0.0 [Preview Release]* (September 29th, 2007) [Includes duplicates of changes from 1.1.4 - 1.2.3]
-
-* Fixed that installing plugins from SVN repositories that use trunk/ will work #8188 [evan]
-
-* Moved the SourceAnnotationExtractor to a separate file in case libraries try to load the rails rake tasks twice. [Rick Olson]
-
-* Moved Dispatcher to ActionController::Dispatcher.  [Jeremy Kemper]
-
-* Changed the default logger from Ruby's own Logger with the clean_logger extensions to ActiveSupport::BufferedLogger for performance reasons [David Heinemeier Hansson]. (You can change it back with config.logger = Logger.new("/path/to/log", level).)
-
-* Added a default 422.html page to be rendered when ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, or ActionController::InvalidAuthenticityToken is raised [David Heinemeier Hansson]
-
-* Added --skip-fixture option to script/generate model #6862 [sandofsky]
-
-* Print Rails version when starting console #7440 [eyematz]
-
-* Fixed the placement of fixture files for nested models when generating through script/generate model #7547 [jkit]
-
-* Added TEMPLATE option to rake doc:app to set a custom output template #7737 [Jakob Skjerning]
-
-* Added VERBOSE option to rake db:migrate to turn off output #8204 [John Barnette]
-
-* Fixed that rake doc:app should use UTF-8 #8906 [farzy]
-
-* Fixes rake annotations to search erb and builder files as well #9150 [m.langenberg]
-
-* Removed web_service generator [Michael Koziarski]
-
-* Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [Frederick Cheung]. Example:
-
-    # Loads :classic_pagination before all the other plugins
-    config.plugins = [ :classic_pagination, :all ]
-
-* Added symbols as a legal way of specifying plugins in config.plugins #9629 [tom]
-
-* Removed deprecated task names, like clear_logs, in favor of the new namespaced style [David Heinemeier Hansson]
-
-* Support multiple config.after_initialize blocks so plugins and apps can more easily cooperate.  #9582 [Zach Dennis]
-
-* Added db:drop:all to drop all databases declared in config/database.yml [David Heinemeier Hansson]
-
-* Use attribute pairs instead of the migration name to create add and remove column migrations.  Closes #9166 [Pratik Naik]
-
-	For example:
-
-	ruby script/generation migration AddSomeStuffToCustomers first_name:string last_name:string
-
-	or
-
-	ruby script/generation migration RemoveSomeStuffFromCustomers first_name:string last_name:string
-
-* Add ActiveResource to Rails::Info.  Closes #8741 [Chris Kampmeier]
-
-* use Gem.find_name instead of search when freezing gems.  Prevent false positives for other gems with rails in the name. Closes #8729 [wselman]
-
-* Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent.  Closes #9006 [Ryan Davis]
-
-* Default to plural table name in Rails Generator if ActiveRecord is not present.  Closes #8963 [evan]
-
-* Added rake routes for listing all the defined routes in the system.  #8795 [Josh Peek]
-
-* db:create creates the database for the current environment if it's on localhost. db:create:all creates local databases for all environments.  #8783 [matt]
-
-* Generators: look for generators in all gems, not just those suffixed with _generator, in the gem's generators or rails_generators directory. Allow use of the rails_generators directory instead of the standard generators directory in plugins also.  #8730 [Dr Nic, topfunky]
-
-* MySQL, PostgreSQL: database.yml defaults to utf-8.  #8701 [matt]
-
-* Added db:version to get the current schema number [via Err The Blog]
-
-* Added --skip-migration option to scaffold and resource generators #8656 [Michael Glaesemann]
-
-* Fix that FCGIs would leave log files open when asked to shut down by USR2.  #3028 [Sebastian Kanthak, Josh Peek]
-
-* Fixed that dispatcher preparation callbacks only run once in production mode.  Mock Routes.reload so that dispatcher preparation callback tests run. [Rick Olson]
-
-* Fix syntax error in dispatcher than wrecked failsafe responses.  #8625 [mtitorenko]
-
-* Scaffolded validation errors set the appropriate HTTP status for XML responses.  #6946, #8622 [Manfred Stienstra, mmmultiworks]
-
-* Sexy migrations for the session_migration generator.  #8561 [Vladislav]
-
-* Console reload! runs to_prepare callbacks also.  #8393 [f.svehla]
-
-* Generated migrations include timestamps by default.  #8501 [Shane Vitarana]
-
-* Drop Action Web Service from rails:freeze:edge.  [Jeremy Kemper]
-
-* Add db:create, drop, reset, charset, and collation tasks.  #8448 [matt]
-
-* Scaffold generator depends on model generator instead of duplicating it.  #7222 [bscofield]
-
-* Scaffold generator tests.  #8443 [pelle]
-
-* Generated scaffold functional tests use assert_difference.  #8421 [Norbert Crombach]
-
-* Update to Prototype 1.5.1.  [Sam Stephenson]
-
-* Update to script.aculo.us 1.7.1_beta3.  [Thomas Fuchs]
-
-* Generators use *.html.erb view template naming.  #8278 [Tim Pope]
-
-* Updated resource_scaffold and model generators to use short-hand style migrations [David Heinemeier Hansson]
-
-* Updated initializer to only load #{RAILS_ENV}.rb once. Added deprecation warning for config.breakpoint_server. [Nicholas Seckar]
-
-* Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back [David Heinemeier Hansson]
-
-  To use the new debugger, start your server with script/server --debugger and insert a call to  'debugger'
-  (instead of 'breakpoint') where you want to jump into the debugger.
-
-  BACKWARDS INCOMPATIBILITY NOTE: You must remove the default line 12 from config/environments/development.rb:
-
-    config.breakpoint_server = true
-
-  This configuration option is no longer available. Rails will fail to start in development mode as long as
-  that's still present.
-
-* Resource scaffolding returns the created entity.to_xml.  [Jeremy Kemper]
-
-* Resource scaffolding responds to new.xml.  #8185 [Eric Mill]
-
-* Include Active Resource in rails:freeze:edge rake task.  [Thomas Fuchs]
-
-* Include Active Resource instead of Action Web Service [David Heinemeier Hansson] You can add AWS back with this in config/environment.rb:
-
-    config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib )
-
-  ...or just gem 'actionwebservice'
-
-* Give generate scaffold a more descriptive database message.  Closes #7316 [Jeremy McAnally]
-
-* Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows.  #6755 [Jeremy Kemper, trevor]
-
-* Deprecation: remove components from controller paths.  [Jeremy Kemper]
-
-* Add environment variable RAILS_DEFAULT_DATABASE, which allows the builtin default of 'mysql' to be overridden. [Nicholas Seckar]
-
-* Windows: include MinGW in RUBY_PLATFORM check.  #2982 [okkez000@gmail.com, Kaspar Schiess]
-
-* Split out the basic plugin locator functionality into an abstract super class. Add a FileSystemLocator to do the job of checking the plugin_paths for plugins. Add plugin_locators configuration option which will iterate over the set of plugin locators and load each of the plugin loaders they return. Rename locater everywhere to locator. [Marcel Molina Jr.]
-
-* Split plugin location and loading out of the initializer and into a new Plugin namespace, which includes Plugin::Locater and Plugin::Loader. The loader class that is used can be customized using the config.plugin_loader option.  Those monkey patching the plugin loading subsystem take note, the internals changing here will likely break your modifications. The good news is that it should be substantially easier to hook into the plugin locating and loading process now.  [Marcel Molina Jr.]
-
-* Added assumption that all plugin creators desire to be sharing individuals and release their work under the MIT license [David Heinemeier Hansson]
-
-* Added source-annotations extractor tasks to rake [Jamis Buck]. This allows you to add FIXME, OPTIMIZE, and TODO comments to your source code that can then be extracted in concert with rake notes (shows all), rake notes:fixme, rake notes:optimize and rake notes:todo.
-
-* Added fixtures :all to test_helper.rb to assume that most people just want all their fixtures loaded all the time [David Heinemeier Hansson]
-
-* Added config/initializers where all ruby files within it are automatically loaded after the Rails configuration is done, so you don't have to litter the environment.rb file with a ton of mixed stuff [David Heinemeier Hansson]
-
-* For new apps, generate a random secret for the cookie-based session store.  [Jeremy Kemper]
-
-* Stop swallowing errors during rake test [Michael Koziarski]
-
-* Update Rails Initializer to use ActionController::Base#view_paths [Rick Olson]
-
-* Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
-
-* Plugins may be symlinked in vendor/plugins.  #4245 [brandon, progrium@gmail.com]
-
-* Resource generator depends on the model generator rather than duplicating it.  #7269 [bscofield]
-
-* Add/Update usage documentation for script/destroy, resource generator and scaffold_resource generator.  Closes #7092, #7271, #7267.  [bscofield]
-
-* Update to script.aculo.us 1.7.0.  [Thomas Fuchs]
-
-* Update to Prototype 1.5.0. [Sam Stephenson]
-
-* Generator: use destination path for diff tempfiles.  #7015 [alfeld]
-
-* Fixed that webrick would strip leading newlines and hang connection #4156 [psross]
-
-* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick Olson]
-  If you really want your plugins to reload, add this to the very top of init.rb:
-
-    Dependencies.load_once_paths.delete(lib_path)
-
-* Allow config.to_prepare to work, make the dispatcher safe to 're require'. [Michael Koziarski, Nicholas Seckar]
-
-* Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 [fearoffish]
-
-* Fix Webrick Daemon dispatching bug regarding a bad current working directory.  Closes #4899 [Rick Olson]
-
-* Make config.plugins affect the load path and the dependencies system.  Allows you to control plugin loading order, and keep disabled plugins off the load path. [James Adam]
-
-* Don't generate a components directory in new Rails apps.  [Jeremy Kemper]
-
-* Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [David Heinemeier Hansson]
-
-* Added one-letter aliases for the three default environments to script/console, so script/console p will load the production environment (t for test, d for development) [David Heinemeier Hansson]
-
-* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [David Heinemeier Hansson]
-
-* Update initializer to load Rails::VERSION as soon as possible. Closes #6698. [Nicholas Seckar]
-
-* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [David Heinemeier Hansson]
-
-* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [David Heinemeier Hansson]
-
-* Update to Prototype and script.aculo.us [5579]. [Thomas Fuchs]
-
-* Made script/server work with -e and -d when using Mongrel [David Heinemeier Hansson]
-
-* Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again [Thomas Fuchs]
-
-* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Lütke]
-
-* Rails::VERSION::STRING should always be available without having to require 'rails/version'.  #6244 [fearoffish]
-
-* Update to Prototype 1.5.0_rc2. [Sam Stephenson]
-
-* Add grep-based fallback to reaper, to work in pidless setups [Jamis Buck]
-
-* Only wrap request processing with our USR1 signal handler so FastCGI can trap it and raise an exception while waiting for connections. Idle processes exit immediately rather than waiting for another request; active processes gracefully exit when the request is finished.  [Jeremy Kemper]
-
-* Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587. [Nicholas Seckar]
-
-* Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT.  #6584 [jchris]
-
-* Remove temporary crutch to help ApplicationController be unloaded. Closes #6496. [Nicholas Seckar]
-
-* scaffold_resource generator uses _path named routes and head instead of render :nothing => true.  #6545 [Josh Susser]
-
-* Generator can show diff on file collision to help you decide whether to skip or overwrite.  #6364 [jeffw, Jeremy Kemper]
-
-* Generated directories are recursively svn added, like mkdir -p.  #6416 [NeilW]
-
-* resource and scaffold_resource generators add a restful route to config/routes.rb  [Jeremy Kemper]
-
-* Revert environment changes for autoload_paths. [Michael Koziarski]
-
-* 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]
-
-* Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests [Michael Koziarski]
-
-* Added option to script/process/spawner of specifying the binding address #5133 [Dee Zsombor]
-
-* Update environment.rb comments to include config.autoload_paths. Closes #6478 [caio]
-
-* Update scaffold to use new form_tag block functionality.  Closes #6480. [Bob Silva]
-
-* Plugin generator: check for class collisions.  #4833 [vinbarnes@gmail.com]
-
-* Mailer generator: handle mailers in modules, set mime_version in unit test.  [Jeremy Kemper]
-
-* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Michael Koziarski]
-
-* Added config.plugins to control which plugins are loaded #6269 [Stefan Kaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
-
-    config.plugins = %w[ routing_navigator simply_helpful ]
-
-* Clean up html on included error pages. [Tim Lucas]
-
-* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [David Heinemeier Hansson]
-
-* Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
-
-* PostgreSQL: db:test:purge closes open database connections first.  #6236 [alex]
-
-* Fixed test:uncommitted on Windows (backslash issue) #4999 [paul@paulbutcher.com]
-
-* Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [Bob Silva]
-
-* Fixed rename_table on SQLite tables with indexes defined #5942 [brandon@opensoul.org]
-
-* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [David Heinemeier Hansson]
-
-* Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [David Heinemeier Hansson]. Examples:
-
-    ./script/generate model post title:string created_on:date body:text published:boolean
-
-* Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined [David Heinemeier Hansson]
-
-* script/runner can run files, pass on arguments, and be used as a shebang.  #6286 [Tuxie, dlpond]
-    #!/usr/bin/env /path/to/my/app/script/runner
-    # Example: just start using your models as if you are in script/console
-    Product.find(:all).each { |product| product.check_inventory }
-
-* Look for rake tasks in plugin subdirs.  #6259 [obrie]
-
-* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [David Heinemeier Hansson]
-
-* 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
-
-* session_migration generator adds an index on updated_at.  #6207 [grg]
-
-* script/server creates the tmp/pids directory.  #6204 [jonathan]
-
-* Fix script/console --sandbox for internal transactions changes.  #5738 [Chris McGrath, charles.gerungan@gmail.com]
-
-* Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
-documented in initializer.rb, the workaround is:
-
-  config.autoload_paths += Dir[RAILS_ROOT + '/app/models/*/']
-
-References #6031. [Nicholas Seckar]
-
-* Update to script.aculo.us 1.6.3 [Thomas Fuchs]
-
-* Update to Prototype 1.5.0_rc1 [sam]
-
-* Formally Deprecate the old rake tasks. [Michael Koziarski]
-
-* Thoroughly test the FCGI dispatcher.  #5970 [Kevin Clark]
-
-* Remove Dir.chdir in the Webrick DispatchServlet#initialize method.  Fix bad path errors when trying to load config/routes.rb.  [Rick Olson]
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]
-
-* Cleaning up tests. [Kevin Clark, Jeremy Kemper]
-
-* Add Dependencies.load_once_paths. [Nicholas Seckar]
-
-* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
-
-* Assign Routing.controller_paths; fix script/about and rails info controller. [Nicholas Seckar]
-
-* Don't warn dispatcher of Reloadable deprecations. [Nicholas Seckar]
-
-* Rearrange application resetting and preparation, fix bug with leaking subclasses hash in ActiveRecord::Base [Rick Olson]
-
-  ActiveRecord::Base.reset_subclasses is called before Dependencies are cleared and classes removed.
-  ActiveRecord::Base.instantiate_observers is called during a Dispatcher preparation callback.
-
-* Add missing mock directories from the autoload_paths configuration.  [Rick Olson]
-
-* Nested controller scaffolding also nests the generated layout. [iain d broadfoot]
-
-* Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. [Nicholas Seckar]
-
-* Add autoload_paths support to Initializer. [Nicholas Seckar]
-
-* Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  [Rick Olson]
-
-* Clarify usage of script/plugin source. Closes #5344. [James Adam]
-
-* Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
-
-* Tweak the Rails load order so observers are loaded after plugins, and reloaded in development mode. Closed #5279.  [Rick Olson]
-
-* Added that you can change the web server port in config/lighttpd.conf from script/server --port/-p #5465 [mats@imediatec.co.uk]
-
-* script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 [Shugo Maeda]
-
-* Fixed the failsafe response so it uses either the current recognized controller or ApplicationController.  [Rick Olson]
-
-* Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid. [Jamis Buck]
-
-* Fix script/plugin about so it uses about.yml and not meta.yml.  [James Adam]
-
-* Dispatcher processes rescued actions with the same controller that processed the request. #4625 [sd@notso.net]
-
-* rails -d frontbase to create a new project with a frontbase database.yml. #4945 [mlaster@metavillage.com]
-
-* Ensure the logger is initialized. #5629 [mike@clarkware.com]
-
-* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [David Heinemeier Hansson]. Examples:
-
-    spawner               # starts instances on 8000, 8001, and 8002 using Mongrel if available
-    spawner fcgi          # starts instances on 8000, 8001, and 8002 using FCGI
-    spawner mongrel -i 5  # starts instances on 8000, 8001, 8002, 8003, and 8004 using Mongrel
-    spawner -p 9100 -i 10 # starts 10 instances counting from 9100 to 9109 using Mongrel if available
-    spawner -p 9100 -r 5  # starts 3 instances counting from 9100 to 9102 and attempts start them every 5 seconds
-
-  Also note that script/process/reaper is Mongrel capable. So the combination of spawner and reaper is a built-in alternative to something like mongrel_cluster.
-
-* Update scaffolding functional tests to use :id => people(:first) instead of :id => 1. #5612 [evan@protest.net]
-
-* db:test:clone should remove existing tables before reloading the schema. #5607 [sveit@tradeharbor.com]
-
-* Fixed migration generation for class names like ACLController #5197 [brad@madriska.com]
-
-* Added show_source_list and show_call_stack to breakpoints to make it easier to get context #5476 [takiuchi@drecom.co.jp]. Examples:
-
-    irb(#<TopController:0x40822a68>):002:0> show_source_list
-    0001  class TopController < ApplicationController
-    0002    def show
-    0003->    breakpoint
-    0004    end
-    0005
-    0006    def index
-    0007    end
-    0008
-    => "/path/to/rails/root/app/controllers/top_controller.rb"
-
-    irb(#<TopController:0x40822a68>):004:0> show_call_stack 3
-    vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
-    vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
-    app/controllers/top_controller.rb:3:in `show'
-    => "/path/to/rails/root/app/controllers/top_controller.rb:3"
-
-* Generate scaffold layout in subdirectory appropriate to its module nesting. #5511 [nils@alumni.rice.edu]
-
-* Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 [mike@clarkware.com]
-
-* Don't assume Active Record is available. #5497 [bob@sporkmonger.com]
-
-* Mongrel: script/server works on Win32. #5499 [jeremydurham@gmail.com]
-
-* Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [Nick Sieger]
-
-* Mongrel support for script/server.  #5475 [jeremydurham@gmail.com]
-
-* Fix script/plugin so it doesn't barf on invalid URLs [Rick Olson]
-
-* Fix plugin install bug at dir with space. (closes #5359) [Yoshimasa NIWA]
-
-* Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  [Rick Olson]
-
-* Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal #5003 [takiuchi@drecom.co.jp]
-
-* Create temporary dirs relative to RAILS_ROOT when running script/server #5014 [elliot@townx.org]
-
-* Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. [Jamis Buck]
-
-* Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]
-
-* Added lib/ to the directories that will get application docs generated [David Heinemeier Hansson]
-
-* Add observer generator. Closes #5167. [François Beausoleil]
-
-* Session migration generator obeys pluralize_table_names. #5145 [James Adam]
-
-* rake test:recent understands subdirectories. #2925 [jerrett@bravenet.com]
-
-* The app generator detects the XAMPP package's MySQL socket location. #3832 [elliot@townx.org]
-
-* The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk]
-
-* Distinguish the spawners for different processes [David Heinemeier Hansson]
-
-* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [David Heinemeier Hansson]
-
-* Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) [Julian Tarkhanov]
-
-* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
-
-* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [David Heinemeier Hansson]
-
-* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [David Heinemeier Hansson]
-
-
-*1.2.3* (March 12th, 2007)
-
-* Ruby 1.8.6 compatibility
-
-* Windows: include MinGW in RUBY_PLATFORM check.  #2982 [okkez000@gmail.com, Kaspar Schiess]
-
-* Stop swallowing errors during rake test [Michael Koziarski]
-
-
-*1.2.2* (February 5th, 2007)
-
-* Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
-
-* Require the dispatcher for Rails::Configuration#to_prepare.  [Rick Olson]
-
-
-*1.2.1* (January 16th, 2007)
-
-* Updated to Active Record 1.15.1, Action Pack 1.13.1, Action Mailer 1.3.1, Action Web Service 1.2.1
-
-
-*1.2.0* (January 16th, 2007)
-
-* Update to Prototype 1.5.0. [Sam Stephenson]
-
-* Generator: use destination path for diff tempfiles.  #7015 [alfeld]
-
-* Fixed that webrick would strip leading newlines and hang connection #4156 [psross]
-
-* Ensure plugins are in the Dependencies.load_once_paths collection by default.  [Rick Olson]
-  If you really want your plugins to reload, add this to the very top of init.rb:
-
-    Dependencies.load_once_paths.delete(lib_path)
-
-* Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 [fearoffish]
-
-* Fix Webrick Daemon dispatching bug regarding a bad current working directory.  Closes #4899 [Rick Olson]
-
-* Make config.plugins affect the load path and the dependencies system.  Allows you to control plugin loading order, and keep disabled plugins off the load path. [James Adam]
-
-* Don't generate a components directory in new Rails apps.  [Jeremy Kemper]
-
-* Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [David Heinemeier Hansson]
-
-* Deprecated the name route "root" as it'll be used as a shortcut for map.connect '' in Rails 2.0 [David Heinemeier Hansson]
-
-* Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [David Heinemeier Hansson]
-
-* Update initializer to load Rails::VERSION as soon as possible. Closes #6698. [Nicholas Seckar]
-
-* Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [David Heinemeier Hansson]
-
-* Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [David Heinemeier Hansson]
-
-* Update to Prototype and script.aculo.us [5579]. [Sam Stephenson, Thomas Fuchs]
-
-* Made script/server work with -e and -d when using Mongrel [David Heinemeier Hansson]
-
-* Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action [Tobias Lütke]
-
-* Rails::VERSION::STRING should always be available without having to require 'rails/version'.  #6244 [fearoffish]
-
-* Add grep-based fallback to reaper, to work in pidless setups [Jamis Buck]
-
-* Only wrap request processing with our USR1 signal handler so FastCGI can trap it and raise an exception while waiting for connections. Idle processes exit immediately rather than waiting for another request; active processes gracefully exit when the request is finished.  [Jeremy Kemper]
-
-* Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587. [Nicholas Seckar]
-
-* Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT.  #6584 [jchris]
-
-* scaffold_resource generator uses _path named routes and head instead of render :nothing => true.  #6545 [Josh Susser]
-
-* Generator can show diff on file collision to help you decide whether to skip or overwrite.  #6364 [jeffw, Jeremy Kemper]
-
-* Generated directories are recursively svn added, like mkdir -p.  #6416 [NeilW]
-
-* resource and scaffold_resource generators add a restful route to config/routes.rb  [Jeremy Kemper]
-
-* Revert environment changes for autoload_paths. [Michael Koziarski]
-
-* Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests [Michael Koziarski]
-
-* Added option to script/process/spawner of specifying the binding address #5133 [Dee Zsombor]
-
-* Update environment.rb comments to include config.autoload_paths. Closes #6478 [caio]
-
-* Update scaffold to use new form_tag block functionality.  Closes #6480. [Bob Silva]
-
-* Plugin generator: check for class collisions.  #4833 [vinbarnes@gmail.com]
-
-* Mailer generator: handle mailers in modules, set mime_version in unit test.  [Jeremy Kemper]
-
-* Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Michael Koziarski]
-
-* Added config.plugins to control which plugins are loaded #6269 [Stefan Kaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
-
-    config.plugins = %w[ routing_navigator simply_helpful ]
-
-* Clean up html on included error pages. [Tim Lucas]
-
-* Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language [David Heinemeier Hansson]
-
-* Update to latest Prototype and script.aculo.us trunk versions [Thomas Fuchs]
-
-* PostgreSQL: db:test:purge closes open database connections first.  #6236 [alex]
-
-* Fixed test:uncommitted on Windows (backslash issue) #4999 [paul@paulbutcher.com]
-
-* Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 [Bob Silva]
-
-* Fixed rename_table on SQLite tables with indexes defined #5942 [brandon@opensoul.org]
-
-* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [David Heinemeier Hansson]
-
-* Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [David Heinemeier Hansson]. Examples:
-
-    ./script/generate model post title:string created_on:date body:text published:boolean
-
-* Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined [David Heinemeier Hansson]
-
-* script/runner can run files, pass on arguments, and be used as a shebang.  #6286 [Tuxie, dlpond]
-    #!/usr/bin/env /path/to/my/app/script/runner
-    # Example: just start using your models as if you are in script/console
-    Product.find(:all).each { |product| product.check_inventory }
-
-* Look for rake tasks in plugin subdirs.  #6259 [obrie]
-
-* Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb [David Heinemeier Hansson]
-
-* session_migration generator adds an index on updated_at.  #6207 [grg]
-
-* script/server creates the tmp/pids directory.  #6204 [jonathan]
-
-* Fix script/console --sandbox for internal transactions changes.  #5738 [Chris McGrath, charles.gerungan@gmail.com]
-
-* Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
-documented in initializer.rb, the workaround is:
-
-  config.autoload_paths += Dir[RAILS_ROOT + '/app/models/*/']
-
-References #6031. [Nicholas Seckar]
-
-* Update to script.aculo.us 1.6.3 [Thomas Fuchs]
-
-* Formally Deprecate the old rake tasks. [Michael Koziarski]
-
-* Thoroughly test the FCGI dispatcher.  #5970 [Kevin Clark]
-
-* Remove Dir.chdir in the Webrick DispatchServlet#initialize method.  Fix bad path errors when trying to load config/routes.rb.  [Rick Olson]
-
-* Tighten rescue clauses.  #5985 [james@grayproductions.net]
-
-* Cleaning up tests. [Kevin Clark, Jeremy Kemper]
-
-* Add Dependencies.load_once_paths. [Nicholas Seckar]
-
-* Assign Routing.controller_paths; fix script/about and rails info controller. [Nicholas Seckar]
-
-* Don't warn dispatcher of Reloadable deprecations. [Nicholas Seckar]
-
-* Rearrange application resetting and preparation, fix bug with leaking subclasses hash in ActiveRecord::Base [Rick Olson]
-
-  ActiveRecord::Base.reset_subclasses is called before Dependencies are cleared and classes removed.
-  ActiveRecord::Base.instantiate_observers is called during a Dispatcher preparation callback.
-
-* Add missing mock directories from the autoload_paths configuration.  [Rick Olson]
-
-* Nested controller scaffolding also nests the generated layout. [iain d broadfoot]
-
-* Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. [Nicholas Seckar]
-
-* Add autoload_paths support to Initializer. [Nicholas Seckar]
-
-* Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  [Rick Olson]
-
-* Clarify usage of script/plugin source. Closes #5344. [James Adam]
-
-* Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
-
-* Tweak the Rails load order so observers are loaded after plugins, and reloaded in development mode. Closed #5279.  [Rick Olson]
-
-* Added that you can change the web server port in config/lighttpd.conf from script/server --port/-p #5465 [mats@imediatec.co.uk]
-
-* script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 [Shugo Maeda]
-
-* Fixed the failsafe response so it uses either the current recognized controller or ApplicationController.  [Rick Olson]
-
-* Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid. [Jamis Buck]
-
-* Fix script/plugin about so it uses about.yml and not meta.yml.  [James Adam]
-
-* Dispatcher processes rescued actions with the same controller that processed the request. #4625 [sd@notso.net]
-
-* rails -d frontbase to create a new project with a frontbase database.yml. #4945 [mlaster@metavillage.com]
-
-* Ensure the logger is initialized. #5629 [mike@clarkware.com]
-
-* Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [David Heinemeier Hansson]. Examples:
-
-    spawner               # starts instances on 8000, 8001, and 8002 using Mongrel if available
-    spawner fcgi          # starts instances on 8000, 8001, and 8002 using FCGI
-    spawner mongrel -i 5  # starts instances on 8000, 8001, 8002, 8003, and 8004 using Mongrel
-    spawner -p 9100 -i 10 # starts 10 instances counting from 9100 to 9109 using Mongrel if available
-    spawner -p 9100 -r 5  # starts 3 instances counting from 9100 to 9102 and attempts start them every 5 seconds
-
-  Also note that script/process/reaper is Mongrel capable. So the combination of spawner and reaper is a built-in alternative to something like mongrel_cluster.
-
-* Update scaffolding functional tests to use :id => people(:first) instead of :id => 1. #5612 [evan@protest.net]
-
-* db:test:clone should remove existing tables before reloading the schema. #5607 [sveit@tradeharbor.com]
-
-* Fixed migration generation for class names like ACLController #5197 [brad@madriska.com]
-
-* Added show_source_list and show_call_stack to breakpoints to make it easier to get context #5476 [takiuchi@drecom.co.jp]. Examples:
-
-    irb(#<TopController:0x40822a68>):002:0> show_source_list
-    0001  class TopController < ApplicationController
-    0002    def show
-    0003->    breakpoint
-    0004    end
-    0005
-    0006    def index
-    0007    end
-    0008
-    => "/path/to/rails/root/app/controllers/top_controller.rb"
-
-    irb(#<TopController:0x40822a68>):004:0> show_call_stack 3
-    vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
-    vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
-    app/controllers/top_controller.rb:3:in `show'
-    => "/path/to/rails/root/app/controllers/top_controller.rb:3"
-
-* Generate scaffold layout in subdirectory appropriate to its module nesting. #5511 [nils@alumni.rice.edu]
-
-* Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 [mike@clarkware.com]
-
-* Don't assume Active Record is available. #5497 [bob@sporkmonger.com]
-
-* Mongrel: script/server works on Win32. #5499 [jeremydurham@gmail.com]
-
-* Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. [Nick Sieger]
-
-* Mongrel support for script/server.  #5475 [jeremydurham@gmail.com]
-
-* Fix script/plugin so it doesn't barf on invalid URLs [Rick Olson]
-
-* Fix plugin install bug at dir with space. (closes #5359) [Yoshimasa NIWA]
-
-* Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  [Rick Olson]
-
-* Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal #5003 [takiuchi@drecom.co.jp]
-
-* Create temporary dirs relative to RAILS_ROOT when running script/server #5014 [elliot@townx.org]
-
-* Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. [Jamis Buck]
-
-* Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson]
-
-* Added lib/ to the directories that will get application docs generated [David Heinemeier Hansson]
-
-* Add observer generator. Closes #5167. [François Beausoleil]
-
-* Session migration generator obeys pluralize_table_names. #5145 [James Adam]
-
-* rake test:recent understands subdirectories. #2925 [jerrett@bravenet.com]
-
-* The app generator detects the XAMPP package's MySQL socket location. #3832 [elliot@townx.org]
-
-* The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk]
-
-* Distinguish the spawners for different processes [David Heinemeier Hansson]
-
-* Added -n/--process to script/process/spawner name the process pid (default is dispatch) [David Heinemeier Hansson]
-
-* Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) [Julian Tarkhanov]
-
-* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
-
-* Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids [David Heinemeier Hansson]
-
-* Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids [David Heinemeier Hansson]
-
-
-*1.1.6* (August 10th, 2006)
-
-* Additional security patch
-
-
-*1.1.5* (August 8th, 2006)
-
-* Mention in docs that config.frameworks doesn't work when getting Rails via Gems.  #4857 [Alisdair McDiarmid]
-
-* Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.]
-
-* Includes critical security patch
-
-
-*1.1.4* (June 29th, 2006)
-
-* Remove use of opts.on { |options[:name] } style hash assignment. References #4440. [headius@headius.com]
-
-* Updated to Action Pack 1.12.3, ActionWebService 1.1.4, ActionMailer 1.2.3
-
-
-*1.1.3* (June 27th, 2006)
-
-* Updated to Active Record 1.14.3, Action Pack 1.12.2, ActionWebService 1.1.3, ActionMailer 1.2.2
-
-
-*1.1.2* (April 9th, 2006)
-
-* Mention in docs that config.frameworks doesn't work when getting Rails via Gems. Closes #4857. [Alisdair McDiarmid]
-
-* Change the scaffolding layout to use yield rather than @content_for_layout. [Marcel Molina Jr.]
-
-* Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) [David Heinemeier Hansson]
-
-* Fixed that boot.rb would set RAILS_GEM_VERSION twice, not respect an uncommented RAILS_GEM_VERSION line, and not use require_gem [David Heinemeier Hansson]
-
-
-*1.1.1* (April 6th, 2006)
-
-* Enhances plugin#discover allowing it to discover svn:// like URIs (closes #4565) [ruben.nine@gmail.com]
-
-* Update to Prototype 1.5.0_rc0 [Sam Stephenson]
-
-* Fixed that the -r/--ruby path option of the rails command was not being respected #4549 [ryan.raaum@gmail.com]
-
-* Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html [David Heinemeier Hansson]
-
-* Fixed that rake clone_structure_to_test should quit on pgsql if the dump is unsuccesful #4585 [augustz@augustz.com]
-
-* Fixed that rails --version should have the return code of 0 (success) #4560 [blair@orcaware.com]
-
-* Install alias so Rails::InfoController is accessible at /rails_info. Closes #4546. [Nicholas Seckar]
-
-* Fixed that spawner should daemonize if running in repeat mode [David Heinemeier Hansson]
-
-* Added TAG option for rake rails:freeze:edge, so you can say rake rails:freeze:edge TAG=rel_1-1-0 to lock to the 1.1.0 release [David Heinemeier Hansson]
-
-* Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us [Sam Stephenson, Thomas Fuchs]
-
-* Use --simple-prompt instead of --prompt-mode simple for console compatibility with Windows/Ruby 1.8.2 #4532 [starr@starrnhorne.com]
-
-* Make Rails::VERSION implicitly loadable #4491. [Nicholas Seckar]
-
-* Fixed rake rails:freeze:gems #4518 [benji@silverinsanity.com]
-
-* Added -f/--freeze option to rails command for freezing the application to the Rails version it was generated with [David Heinemeier Hansson]
-
-* Added gem binding of apps generated through the rails command to the gems of they were generated with [Nicholas Seckar]
-
-* Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf [David Heinemeier Hansson]
-
-* Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf [David Heinemeier Hansson]
-
-* Avoid passing escapeHTML non-string in Rails' info controller [Nicholas Seckar]
-
-
-*1.1.0* (March 27th, 2006)
-
-* Allow db:fixtures:load to load a subset of the applications fixtures. [Chad Fowler]
-
-  ex.
-
-   rake db:fixtures:load FIXTURES=customers,plans
-
-* Update to Prototype 1.5.0_pre1 [Sam Stephenson]
-
-* Update to script.aculo.us 1.6 [Thomas Fuchs]
-
-* Add an integration_test generator [Jamis Buck]
-
-* Make all ActionView helpers available in the console from the helper method for debugging purposes. n.b.: Only an 80% solution. Some stuff won't work, most will. [Marcel Molina Jr.]
-
-  ex.
-
-    >> puts helper.options_for_select([%w(a 1), %w(b 2), %w(c 3)])
-    <option value="1">a</option>
-    <option value="2">b</option>
-    <option value="3">c</option>
-    => nil
-
-* Replaced old session rake tasks with db:sessions:create to generate a migration, and db:sessions:clear to remove sessions. [Rick Olson]
-
-* Reject Ruby 1.8.3 when loading Rails; extract version checking code. [Chad Fowler]
-
-* Remove explicit loading of RailsInfo and RailsInfoController. [Nicholas Seckar]
-
-* Move RailsInfo and RailsInfoController to Rails::Info and Rails::InfoController. [Nicholas Seckar]
-
-* Extend load path with Railties' builtin directory to make adding support code easy. [Nicholas Seckar]
-
-* Fix the rails_info controller by explicitly loading it, and marking it as not reloadable. [Nicholas Seckar]
-
-* Fixed rails:freeze:gems for Windows #3274 [paul@paulbutcher.com]
-
-* Added 'port open?' check to the spawner when running in repeat mode so we don't needlessly boot the dispatcher if the port is already in use anyway #4089 [guy.naor@famundo.com]
-
-* Add verification to generated scaffolds,  don't allow get for unsafe actions [Michael Koziarski]
-
-* Don't replace application.js in public/javascripts if it already exists [Cody Fauser]
-
-* Change test:uncommitted to delay execution of `svn status` by using internal Rake API's. [Nicholas Seckar]
-
-* Use require_library_or_gem to load rake in commands/server.rb.  Closes #4205.  [rob.rasmussen@gmail.com]
-
-* Use the Rake API instead of shelling out to create the tmp directory in commands/server.rb. [Chad Fowler]
-
-* Added a backtrace to the evil WSOD (White Screen of Death).  Closes #4073. TODO: Clearer exceptions [Rick Olson]
-
-* Added tracking of database and framework versions in script/about #4088 [charles.gerungan@gmail.com/Rick Olson]
-
-* Added public/javascripts/application.js as a sample since it'll automatically be included in javascript_include_tag :defaults [David Heinemeier Hansson]
-
-* Added socket cleanup for lighttpd, both before and after [David Heinemeier Hansson]
-
-* Added automatic creation of tmp/ when running script/server [David Heinemeier Hansson]
-
-* Added silence_stream that'll work on both STDERR or STDOUT or any other stream and deprecated silence_stderr in the process [David Heinemeier Hansson]
-
-* Added reload! method to script/console to reload all models and others that include Reloadable without quitting the console #4056 [esad@esse.at]
-
-* Added that rake rails:freeze:edge will now just export all the contents of the frameworks instead of just lib, so stuff like rails:update:scripts, rails:update:javascripts, and script/server on lighttpd still just works #4047 [David Heinemeier Hansson]
-
-* Added fix for upload problems with lighttpd from Safari/IE to config/lighttpd.conf #3999 [Thijs van der Vossen]
-
-* Added test:uncommitted to test changes since last checkin to Subversion #4035 [technomancy@gmail.com]
-
-* Help script/about print the correct svn revision when in a non-English locale.  #4026 [babie7a0@ybb.ne.jp]
-
-* Add 'app' accessor to script/console as an instance of Integration::Session [Jamis Buck]
-
-* Generator::Base#usage takes an optional message argument which defaults to Generator::Base#usage_message. [Jeremy Kemper]
-
-* Remove the extraneous AR::Base.threaded_connections setting from the webrick server. [Jeremy Kemper]
-
-* Add integration test support to app generation and testing [Jamis Buck]
-
-* Added namespaces to all tasks, so for example load_fixtures is now db:fixtures:load. All the old task names are still valid, they just point to the new namespaced names. "rake -T" will only show the namespaced ones, though [David Heinemeier Hansson]
-
-* CHANGED DEFAULT: ActiveRecord::Base.schema_format is now :ruby by default instead of :sql. This means that we'll assume you want to live in the world of db/schema.rb where the grass is green and the girls are pretty. If your schema contains un-dumpable elements, such as constraints or database-specific column types, you just got an invitation to either 1) patch the dumper to include foreign key support, 2) stop being db specific, or 3) just change the default in config/environment.rb to config.active_record.schema_format = :sql -- we even include an example for that on new Rails skeletons now. Brought to you by the federation of opinionated framework builders! [David Heinemeier Hansson]
-
-* Added -r/--repeat option to script/process/spawner that offers the same loop protection as the spinner did. This deprecates the script/process/spinner, so it's no longer included in the default Rails skeleton, but still available for backwards compatibility #3461 [ror@andreas-s.net]
-
-* Added collision option to template generation in generators #3329 [anna@wota.jp]. Examples:
-
-    m.template "stuff.config" , "config/stuff.config" , :collision => :skip
-    m.template "auto-stamping", "config/generator.log", :collision => :force
-
-* Added more information to script/plugin's doings to ease debugging #3755 [Rick Olson]
-
-* Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets [David Heinemeier Hansson]
-
-* Added a default configuration of the FileStore for fragment caching if tmp/cache is available, which makes action/fragment caching ready to use out of the box with no additional configuration [David Heinemeier Hansson]
-
-* Changed the default session configuration to place sessions in tmp/sessions, if that directory is available, instead of /tmp (this essentially means a goodbye to 9/10 White Screen of Death errors and should have web hosting firms around the world cheering) [David Heinemeier Hansson]
-
-* Added tmp/sessions, tmp/cache, and tmp/sockets as default directories in the Rails skeleton [David Heinemeier Hansson]
-
-* Added that script/generate model will now automatically create a migration file for the model created. This can be turned off by calling the generator with --skip-migration [David Heinemeier Hansson]
-
-* Added -d/--database option to the rails command, so you can do "rails --database=sqlite2 myapp" to start a new application preconfigured to use SQLite2 as the database. Removed the configuration examples from SQLite and PostgreSQL from the default MySQL configuration [David Heinemeier Hansson]
-
-* Allow script/server -c /path/to/lighttpd.conf [Jeremy Kemper]
-
-* Remove hardcoded path to reaper script in script/server [Jeremy Kemper]
-
-* Update script.aculo.us to V1.5.3 [Thomas Fuchs]
-
-* Added SIGTRAP signal handler to RailsFCGIHandler that'll force the process into a breakpoint after the next request. This breakpoint can then be caught with script/breakpointer and give you access to the Ruby image inside that process. Useful for debugging memory leaks among other things [David Heinemeier Hansson]
-
-* Changed default lighttpd.conf to use CWD from lighttpd 1.4.10 that allows the same configuration to be used for both detach and not. Also ensured that auto-repeaping of FCGIs only happens when lighttpd is not detached. [David Heinemeier Hansson]
-
-* Added Configuration#after_initialize for registering a block which gets called after the framework is fully initialized.  Useful for things like per-environment configuration of plugins. [Michael Koziarski]
-
-* Added check for RAILS_FRAMEWORK_ROOT constant that allows the Rails framework to be found in a different place than vendor/rails. Should be set in boot.rb. [David Heinemeier Hansson]
-
-* Fixed that static requests could unlock the mutex guarding dynamic requests in the WEBrick servlet #3433 [tom@craz8.com]
-
-* Fixed documentation tasks to work with Rake 0.7.0 #3563 [kazuhiko@fdiary.net]
-
-* Update to Prototype 1.5.0_pre0 [Sam Stephenson]
-
-* Sort the list of plugins so we load in a consistent order [Rick Olson]
-
-* Show usage when script/plugin is called without arguments [tom@craz8.com]
-
-* Corrected problems with plugin loader where plugins set 'name' incorrectly #3297 [anna@wota.jp]
-
-* Make migration generator only report on exact duplicate names, not partial dupliate names. #3442 [jeremy@planetargon.com Marcel Molina Jr.]
-
-* Fix typo in mailer generator USAGE. #3458 [chriztian.steinmeier@gmail.com]
-
-* Ignore version mismatch between pg_dump and the database server. #3457 [Simon Stapleton]
-
-* Reap FCGI processes after lighttpd exits. [Sam Stephenson]
-
-* Honor ActiveRecord::Base.pluralize_table_names when creating and destroying session store table. #3204. [rails@bencurtis.com, Marcel Molina Jr.]
-
-*1.0.0* (December 13th, 2005)
-
-* Update instructions on how to find and install generators. #3172. [Chad Fowler]
-
-* Generator looks in vendor/generators also.  [Chad Fowler]
-
-* Generator copies files in binary mode.  #3156 [minimudboy@gmail.com]
-
-* Add builtin/ to the gemspec. Closes #3047. [Nicholas Seckar, Sam Stephenson]
-
-* Add install.rb file to plugin generation which is loaded, if it exists, when you install a plugin. [Marcel Molina Jr.]
-
-* Run initialize_logger in script/lighttpd to ensure the log file exists before tailing it. [Sam Stephenson]
-
-* Make load_fixtures include csv fixtures. #3053. [me@mdaines.com]
-
-* Fix freeze_gems so that the latest rails version is dumped by default. [Nicholas Seckar]
-
-* script/plugin: handle root paths and plugin names which contain spaces.  #2995 [justin@aspect.net]
-
-* Model generator: correct relative path to test_helper in unit test.  [Jeremy Kemper]
-
-* Make the db_schema_dump task honor the SCHEMA environment variable if present the way db_schema_import does. #2931. [Blair Zajac]
-
-* Have the lighttpd server script report the actual ip to which the server is bound. #2903. [Adam]
-
-* Add plugin library directories to the load path after the lib directory so that libraries in the lib directory get precedence. #2910. [James Adam]
-
-* Make help for the console command more explicit about how to specify the desired environment in which to run the console. #2911. [anonymous]
-
-* PostgreSQL: the purge_test_database Rake task shouldn't explicitly specify the template0 template when creating a fresh test database.  #2964 [Dreamer3]
-
-* Introducing the session_migration generator.  Creates an add_session_table migration.  Allows generator to specify migrations directory.  #2958, #2960 [Rick Olson]
-
-* script/console uses RAILS_ENV environment variable if present.  #2932 [Blair Zajac <blair@orcaware.com>
-
-* Windows: eliminate the socket option in database.yml.  #2924 [Wayne Vucenic <waynev@gmail.com>]
-
-* Eliminate nil from newly generated logfiles.  #2927 [Blair Zajac <blair@orcaware.com>]
-
-* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
-
-* Eliminate Subversion dependencies in scripts/plugin.  Correct install options.  Introduce --force option to reinstall a plugin.  Remove useless --long option for list.  Use --quiet to quiet the download output and --revision to update to a specific svn revision.  #2842 [Chad Fowler, Rick Olson]
-
-* SQLite: the clone_structure_to_test and purge_test_database Rake tasks should always use the test environment.  #2846 [Rick Olson]
-
-* Make sure that legacy db tasks also reference :database for SQLite #2830 [kazuhiko@fdiary.net]
-
-* Pass __FILE__ when evaluating plugins' init.rb.  #2817 [James Adam]
-
-* Better svn status matching for generators.  #2814 [François Beausoleil <francois.beausoleil@gmail.com>, Blair Zajac <blair@orcaware.com>]
-
-* Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities [David Heinemeier Hansson]
-
-* Don't detach or fork for script/server tailing [Nicholas Seckar]
-
-* Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path  for compatibility with web servers that don't have Ruby in path [David Heinemeier Hansson]
-
-* Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [David Heinemeier Hansson] #2660
-
-* Correct versioning in :freeze_gems Rake task.  #2778 [Jakob Skjerning, Jeremy Kemper]
-
-* Added an omnipresent RailsInfoController with a properties action that delivers an HTML rendering of Rails::Info (but only when local_request? is true). Added a new default index.html which fetches this with Ajax. [Sam Stephenson]
-
-
-*0.14.3 (RC4)* (November 7th, 2005)
-
-* Add 'add_new_scripts' rake task for adding new rails scripts to script/* [Jamis Buck]
-
-* Remove bogus hyphen from script/process/reaper calls to 'ps'.  #2767 [anonymous]
-
-* Copy lighttpd.conf when it is first needed, instead of on app creation [Jamis Buck]
-
-* Use require_library_or_gem 'fcgi' in script/server [Sam Stephenson]
-
-* Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/server (works like script/server, but using lighttpd and FastCGI). It will use lighttpd if available, otherwise WEBrick. You can force either or using 'script/server lighttpd' or 'script/server webrick' [David Heinemeier Hansson]
-
-* New configuration option config.plugin_paths which may be a single path like the default 'vendor/plugins' or an array of paths: ['vendor/plugins', 'lib/plugins'].  [Jeremy Kemper]
-
-* Plugins are discovered in nested paths, so you can organize your plugins directory as you like.  [Jeremy Kemper]
-
-* Refactor load_plugin from load_plugins.  #2757 [alex.r.moon@gmail.com]
-
-* Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info [Sam Stephenson]
-
-* Enable HTTP installation of plugins when svn isn't avaialable. Closes #2661. [Chad Fowler]
-
-* Added script/about to display formatted Rails::Info output [Sam Stephenson]
-
-* Added Rails::Info to catalog assorted information about a Rails application's environment [Sam Stephenson]
-
-* Tail the logfile when running script/server lighttpd in the foreground [Sam Stephenson]
-
-* Try to guess the port number from config/lighttpd.conf in script/server lighttpd [Sam Stephenson]
-
-* Don't reap spawn-fcgi.  #2727 [matthew@walker.wattle.id.au]
-
-* Reaper knows how to find processes even if the dispatch path is very long.  #2711 [matthew@walker.wattle.id.au]
-
-* Make fcgi handler respond to TERM signals with an explicit exit [Jamis Buck]
-
-* Added demonstration of fixture use to the test case generated by the model generator [David Heinemeier Hansson]
-
-* If specified, pass PostgreSQL client character encoding to createdb.  #2703 [Kazuhiko <kazuhiko@fdiary.net>]
-
-* Catch CGI multipart parse errors.  Wrap dispatcher internals in a failsafe response handler.  [Jeremy Kemper]
-
-* The freeze_gems Rake task accepts the VERSION environment variable to decide which version of Rails to pull into vendor/rails.  [Chad Fowler, Jeremy Kemper]
-
-* Removed script.aculo.us.js, builder.js and slider.js (preperation for move of scriptaculous extensions to plugins, core scriptaculous will remain in Railties) [Thomas Fuchs]
-
-* The freeze_edge Rake task does smarter svn detection and can export a specific revision by passing the REVISION environment variable.  For example: rake freeze_edge REVISION=1234.  #2663 [Rick Olson]
-
-* Comment database.yml and include PostgreSQL and SQLite examples.  [Jeremy Kemper]
-
-* Improve script/plugin on Windows.  #2646 [Chad Fowler]
-
-* The *_plugindoc Rake tasks look deeper into the plugins' lib directories.  #2652 [bellis@deepthought.org]
-
-* The PostgreSQL :db_structure_dump Rake task limits its dump to the schema search path in database.yml.  [Anatol Pomozov <anatol.pomozov@gmail.com>]
-
-* Add task to generate rdoc for all installed plugins. [Marcel Molina Jr.]
-
-* Update script.aculo.us to V1.5_rc4 [Thomas Fuchs]
-
-* Add default Mac + DarwinPorts MySQL socket locations to the app generator.  [Jeremy Kemper]
-
-* Migrations may be destroyed: script/destroy migration foo.  #2635 [Charles M. Gerungan <charles.gerungan@gmail.com>, Jamis Buck, Jeremy Kemper]
-
-* Added that plugins can carry generators and that generator stub files can be created along with new plugins using script/generate plugin <name> --with-generator [David Heinemeier Hansson]
-
-* Removed app/apis as a default empty dir since its automatically created when using script/generate web_service [David Heinemeier Hansson]
-
-* Added script/plugin to manage plugins (install, remove, list, etc) [Ryan Tomayko]
-
-* Added test_plugins task: Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name) [David Heinemeier Hansson]
-
-* Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [David Heinemeier Hansson]
-
-* Fixed scaffold generator when started with only 1 parameter #2609 [self@mattmower.com]
-
-* rake should run functional tests even if the unit tests have failures [Jim Weirich]
-
-* Back off cleanpath to be symlink friendly. Closes #2533 [Nicholas Seckar]
-
-* Load rake task files in alphabetical order so you can build dependencies and count on them #2554 [Blair Zajac]
-
-
-*0.14.2 (RC3)* (October 26th, 2005)
-
-* Constants set in the development/test/production environment file are set in Object
-
-* Scaffold generator pays attention to the controller name.  #2562 [self@mattmower.com]
-
-* Include tasks from vendor/plugins/*/tasks in the Rakefile #2545 [Rick Olson]
-
-
-*0.14.1 (RC2)* (October 19th, 2005)
-
-* Don't clean RAILS_ROOT on windows
-
-* Remove trailing '/' from RAILS_ROOT [Nicholas Seckar]
-
-* Upgraded to Active Record 1.12.1 and Action Pack 1.10.1
-
-
-*0.14.0 (RC1)* (October 16th, 2005)
-
-* Moved generator folder from RAILS_ROOT/generators to RAILS_ROOT/lib/generators [Tobias Lütke]
-
-* Fix rake dev and related commands [Nicholas Seckar]
-
-* The rails command tries to deduce your MySQL socket by running `mysql_config
---socket`.  If it fails, default to /path/to/your/mysql.sock
-
-* Made the rails command use the application name for database names in the tailored database.yml file. Example: "rails ~/projects/blog" will use "blog_development" instead of "rails_development". [Florian Weber]
-
-* Added Rails framework freezing tasks: freeze_gems (freeze to current gems), freeze_edge (freeze to Rails SVN trunk), unfreeze_rails (float with newest gems on system)
-
-* Added update_javascripts task which will fetch all the latest js files from your current rails install. Use after updating rails. [Tobias Lütke]
-
-* Added cleaning of RAILS_ROOT to useless elements such as '../non-dot-dot/'. Provides cleaner backtraces and error messages. [Nicholas Seckar]
-
-* Made the instantiated/transactional fixtures settings be controlled through Rails::Initializer. Transactional and non-instantiated fixtures are default from now on. [Florian Weber]
-
-* Support using different database adapters for development and test with ActiveRecord::Base.schema_format = :ruby [Sam Stephenson]
-
-* Make webrick work with session(:off)
-
-* Add --version, -v option to the Rails command. Closes #1840. [stancell]
-
-* Update Prototype to V1.4.0_pre11, script.aculo.us to V1.5_rc3 [2504] and fix the rails generator to include the new .js files [Thomas Fuchs]
-
-* Make the generator skip a file if it already exists and is identical to the new file.
-
-* Add experimental plugin support #2335
-
-* Made Rakefile aware of new .js files in script.aculo.us [Thomas Fuchs]
-
-* Make table_name and controller_name in generators honor AR::Base.pluralize_table_names. #1216 #2213 [kazuhiko@fdiary.net]
-
-* Clearly label functional and unit tests in rake stats output.  #2297 [lasse.koskela@gmail.com]
-
-* Make the migration generator only check files ending in *.rb when calculating the next file name #2317 [Chad Fowler]
-
-* Added prevention of duplicate migrations from the generator #2240 [François Beausoleil]
-
-* Add db_schema_dump and db_schema_import rake tasks to work with the new ActiveRecord::SchemaDumper (for dumping a schema to and reading a schema from a ruby file).
-
-* Reformed all the config/environments/* files to conform to the new Rails::Configuration approach. Fully backwards compatible.
-
-* Added create_sessions_table, drop_sessions_table, and purge_sessions_table as rake tasks for databases that supports migrations (MySQL, PostgreSQL, SQLite) to get a table for use with CGI::Session::ActiveRecordStore
-
-* Added dump of schema version to the db_structure_dump task for databases that support migrations #1835 [Rick Olson]
-
-* Fixed script/profiler for Ruby 1.8.2 #1863 [Rick Olson]
-
-* Fixed clone_structure_to_test task for SQLite #1864 [jon@burningbush.us]
-
-* Added -m/--mime-types option to the WEBrick server, so you can specify a Apache-style mime.types file to load #2059 [ask@develooper.com]
-
-* Added -c/--svn option to the generator that'll add new files and remove destroyed files using svn add/revert/remove as appropriate #2064 [Kevin Clark]
-
-* Added -c/--charset option to WEBrick server, so you can specify a default charset (which without changes is UTF-8) #2084 [wejn@box.cz]
-
-* Make the default stats task extendable by modifying the STATS_DIRECTORIES constant
-
-* Allow the selected environment to define RAILS_DEFAULT_LOGGER, and have Rails::Initializer use it if it exists.
-
-* Moved all the shared tasks from Rakefile into Rails, so that the Rakefile is empty and doesn't require updating.
-
-* Added Rails::Initializer and Rails::Configuration to abstract all of the common setup out of config/environment.rb (uses config/boot.rb to bootstrap the initializer and paths)
-
-* Fixed the scaffold generator to fail right away if the database isn't accessible instead of in mid-air #1169 [Chad Fowler]
-
-* Corrected project-local generator location in scripts.rb #2010 [Michael Schuerig]
-
-* Don't require the environment just to clear the logs #2093 [Scott Barron]
-
-* Make the default rakefile read *.rake files from config/tasks (for easy extension of the rakefile by e.g. generators)
-
-* Only load breakpoint in development mode and when BREAKPOINT_SERVER_PORT is defined.
-
-* Allow the --toggle-spin switch on process/reaper to be negated
-
-* Replace render_partial with render :partial in scaffold generator [Nicholas Seckar]
-
-* Added -w flag to ps in process/reaper #1934 [Scott Barron]
-
-* Allow ERb in the database.yml file (just like with fixtures), so you can pull out the database configuration in environment variables #1822 [Duane Johnson]
-
-* Added convenience controls for FCGI processes (especially when managed remotely): spinner, spawner, and reaper. They reside in script/process. More details can be had by calling them with -h/--help.
-
-* Added load_fixtures task to the Rakefile, which will load all the fixtures into the database for the current environment #1791 [Marcel Molina Jr.]
-
-* Added an empty robots.txt to public/, so that web servers asking for it won't trigger a dynamic call, like favicon.ico #1738 [Michael Schubert]
-
-* Dropped the 'immediate close-down' of FCGI processes since it didn't work consistently and produced bad responses when it didn't. So now a TERM ensures exit after the next request (just as if the process is handling a request when it receives the signal). This means that you'll have to 'nudge' all FCGI processes with a request in order to ensure that they have all reloaded. This can be done by something like ./script/process/repear --nudge 'http://www.myapp.com' --instances 10, which will load the myapp site 10 times (and thus hit all of the 10 FCGI processes once, enough to shut down).
-
-
-*0.13.1* (11 July, 2005)
-
-* Look for app-specific generators in RAILS_ROOT/generators rather than the clunky old RAILS_ROOT/script/generators.  Nobody really uses this feature except for the unit tests, so it's a negligible-impact change.  If you want to work with third-party generators, drop them in ~/.rails/generators or simply install gems.
-
-* Fixed that each request with the WEBrick adapter would open a new database connection #1685 [Sam Stephenson]
-
-* Added support for SQL Server in the database rake tasks #1652 [Ken Barker] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set.
-
-* Added a VERSION parameter to the migrate task that allows you to do "rake migrate VERSION=34" to migrate to the 34th version traveling up or down depending on the current version
-
-* Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release #1674 [court3nay]
-
-* Improved documentation for environment config files #1625 [court3nay]
-
-
-*0.13.0* (6 July, 2005)
-
-* Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
-
-* Added migration generator: ./script/generate migration add_system_settings
-
-* Added "migrate" as rake task to execute all the pending migrations from db/migrate
-
-* Fixed that model generator would make fixtures plural, even if ActiveRecord::Base.pluralize_table_names was false #1185 [Marcel Molina Jr.]
-
-* Added a DOCTYPE of HTML transitional to the HTML files generated by Rails #1124 [Michael Koziarski]
-
-* SIGTERM also gracefully exits dispatch.fcgi.  Ignore SIGUSR1 on Windows.
-
-* Add the option to manually manage garbage collection in the FastCGI dispatcher.  Set the number of requests between GC runs in your public/dispatch.fcgi [Stefan Kaes]
-
-* Allow dynamic application reloading for dispatch.fcgi processes by sending a SIGHUP. If the process is currently handling a request, the request will be allowed to complete first. This allows production fcgi's to be reloaded without having to restart them.
-
-* RailsFCGIHandler (dispatch.fcgi) no longer tries to explicitly flush $stdout (CgiProcess#out always calls flush)
-
-* Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [Michael Schubert]
-
-* ActionMailer::Base subclasses are reloaded with the other rails components #1262
-
-* Made the WEBrick adapter not use a mutex around action performance if ActionController::Base.allow_concurrency is true (default is false)
-
-* Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 [Scott Barron]
-
-* Added a 'whiny nil' that's aim to ensure that when users pass nil to methods where that isn't appropriate, instead of NoMethodError? and the name of some method used by the framework users will see a message explaining what type of object was expected. Only active in test and development environments by default #1209 [Michael Koziarski]
-
-* Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar]
-
-* Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar]
-
-* Added -e/--environment option to script/runner #1408 [François Beausoleil]
-
-* Modernize the scaffold generator to use the simplified render and test methods and to change style from @params["id"] to params[:id].  #1367
-
-* Added graceful exit from pressing CTRL-C during the run of the rails command #1150 [Caleb Tennis]
-
-* Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck]
-
-* Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. [Jamis Buck]
-
-* Added console --profile for profiling an IRB session #1154 [Jeremy Kemper]
-
-* Changed console_sandbox into console --sandbox #1154 [Jeremy Kemper]
-
-
-*0.12.1* (20th April, 2005)
-
-* Upgraded to Active Record 1.10.1, Action Pack 1.8.1, Action Mailer 0.9.1, Action Web Service 0.7.1
-
-
-*0.12.0* (19th April, 2005)
-
-* Fixed that purge_test_database would use database settings from the development environment when recreating the test database #1122 [rails@cogentdude.com]
-
-* Added script/benchmarker to easily benchmark one or more statement a number of times from within the environment. Examples:
-
-    # runs the one statement 10 times
-    script/benchmarker 10 'Person.expensive_method(10)'
-
-    # pits the two statements against each other with 50 runs each
-    script/benchmarker 50 'Person.expensive_method(10)' 'Person.cheap_method(10)'
-
-* Added script/profiler to easily profile a single statement from within the environment. Examples:
-
-    script/profiler 'Person.expensive_method(10)'
-    script/profiler 'Person.expensive_method(10)' 10 # runs the statement 10 times
-
-* Added Rake target clear_logs that'll truncate all the *.log files in log/ to zero #1079 [Lucas Carlson]
-
-* Added lazy typing for generate, such that ./script/generate cn == ./script/generate controller and the likes #1051 [k@v2studio.com]
-
-* Fixed that ownership is brought over in pg_dump during tests for PostgreSQL #1060 [pburleson]
-
-* Upgraded to Active Record 1.10.0, Action Pack 1.8.0, Action Mailer 0.9.0, Action Web Service 0.7.0, Active Support 1.0.4
-
-
-*0.11.1* (27th March, 2005)
-
-* Fixed the dispatch.fcgi use of a logger
-
-* Upgraded to Active Record 1.9.1, Action Pack 1.7.0, Action Mailer 0.8.1, Action Web Service 0.6.2, Active Support 1.0.3
-
-
-*0.11.0* (22th March, 2005)
-
-* Removed SCRIPT_NAME from the WEBrick environment to prevent conflicts with PATH_INFO #896 [Nicholas Seckar]
-
-* Removed ?$1 from the dispatch.f/cgi redirect line to get rid of 'complete/path/from/request.html' => nil being in the @params now that the ENV["REQUEST_URI"] is used to determine the path #895 [dblack/Nicholas Seckar]
-
-* Added additional error handling to the FastCGI dispatcher to catch even errors taking down the entire process
-
-* Improved the generated scaffold code a lot to take advantage of recent Rails developments #882 [Tobias Lütke]
-
-* Combined the script/environment.rb used for gems and regular files version. If vendor/rails/* has all the frameworks, then files version is used, otherwise gems #878 [Nicholas Seckar]
-
-* Changed .htaccess to allow dispatch.* to be called from a sub-directory as part of the push with Action Pack to make Rails work on non-vhost setups #826 [Nicholas Seckar/Tobias Lütke]
-
-* Added script/runner which can be used to run code inside the environment by eval'ing the first parameter. Examples:
-
-    ./script/runner 'ReminderService.deliver'
-    ./script/runner 'Mailer.receive(STDIN.read)'
-
-  This makes it easier to do CRON and postfix scripts without actually making a script just to trigger 1 line of code.
-
-* Fixed webrick_server cookie handling to allow multiple cookes to be set at once #800, #813 [dave@cherryville.org]
-
-* Fixed the Rakefile's interaction with postgresql to:
-
-    1. Use PGPASSWORD and PGHOST in the environment to fix prompting for
-       passwords when connecting to a remote db and local socket connections.
-    2. Add a '-x' flag to pg_dump which stops it dumping privileges #807 [rasputnik]
-    3. Quote the user name and use template0 when dumping so the functions doesn't get dumped too #855 [pburleson]
-    4. Use the port if available #875 [madrobby]
-
-* Upgraded to Active Record 1.9.0, Action Pack 1.6.0, Action Mailer 0.8.0, Action Web Service 0.6.1, Active Support 1.0.2
-
-
-*0.10.1* (7th March, 2005)
-
-* Fixed rake stats to ignore editor backup files like model.rb~ #791 [Sebastian Kanthak]
-
-* Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Lütke]
-
-* Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence)
-
-* Fixed that scaffold generator new template should use local variable instead of instance variable #778 [Dan Peterson]
-
-* Allow unit tests to run on a remote server for PostgreSQL #781 [adamm@galacticasoftware.com]
-
-* Added web_service generator (run ./script/generate web_service for help) #776 [Leon Bredt]
-
-* Added app/apis and components to code statistics report #729 [Scott Barron]
-
-* Fixed WEBrick server to use ABSOLUTE_RAILS_ROOT instead of working_directory #687 [Nicholas Seckar]
-
-* Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]
-
-* Fixed -h/--help for generate and destroy generators #331
-
-* Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log)
-
-* Fixed that association#count would produce invalid sql when called sequentialy #659 [kanis@comcard.de]
-
-* Fixed test/mocks/testing to the correct test/mocks/test #740
-
-* Added early failure if the Ruby version isn't 1.8.2 or above #735
-
-* Removed the obsolete -i/--index option from the WEBrick servlet #743
-
-* Upgraded to Active Record 1.8.0, Action Pack 1.5.1, Action Mailer 0.7.1, Action Web Service 0.6.0, Active Support 1.0.1
-
-
-*0.10.0* (24th February, 2005)
-
-* Changed default IP binding for WEBrick from 127.0.0.1 to 0.0.0.0 so that the server is accessible both locally and remotely #696 [Marcel Molina Jr.]
-
-* Fixed that script/server -d was broken so daemon mode couldn't be used #687 [Nicholas Seckar]
-
-* Upgraded to breakpoint 92 which fixes:
-
-    * overload IRB.parse_opts(), fixes #443
-      => breakpoints in tests work even when running them via rake
-    * untaint handlers, might fix an issue discussed on the Rails ML
-    * added verbose mode to breakpoint_client
-    * less noise caused by breakpoint_client by default
-    * ignored TerminateLineInput exception in signal handler
-      => quiet exit on Ctrl-C
-
-* Added support for independent components residing in /components. Example:
-
-    Controller: components/list/items_controller.rb
-    (holds a List::ItemsController class with uses_component_template_root called)
-
-    Model     : components/list/item.rb
-    (namespace is still shared, so an Item model in app/models will take precedence)
-
-    Views     : components/list/items/show.rhtml
-
-
-* Added --sandbox option to script/console that'll roll back all changes made to the database when you quit #672 [Jeremy Kemper]
-
-* Added 'recent' as a rake target that'll run tests for files that changed in the last 10 minutes #612 [Jeremy Kemper]
-
-* Changed script/console to default to development environment and drop --no-inspect #650 [Jeremy Kemper]
-
-* Added that the 'fixture :posts' syntax can be used for has_and_belongs_to_many fixtures where a model doesn't exist #572 [Jeremy Kemper]
-
-* Added that running test_units and test_functional now performs the clone_structure_to_test as well #566 [rasputnik]
-
-* Added new generator framework that informs about its doings on generation and enables updating and destruction of generated artifacts. See the new script/destroy and script/update for more details #487 [Jeremy Kemper]
-
-* Added Action Web Service as a new add-on framework for Action Pack [Leon Bredt]
-
-* Added Active Support as an independent utility and standard library extension bundle
-
-* Upgraded to Active Record 1.7.0, Action Pack 1.5.0, Action Mailer 0.7.0
-
-
-*0.9.5* (January 25th, 2005)
-
-* Fixed dependency reloading by switching to a remove_const approach where all Active Records, Active Record Observers, and Action Controllers are reloading by undefining their classes. This enables you to remove methods in all three types and see the change reflected immediately and it fixes #539. This also means that only those three types of classes will benefit from the const_missing and reloading approach. If you want other classes (like some in lib/) to reload, you must use require_dependency to do it.
-
-* Added Florian Gross' latest version of Breakpointer and friends that fixes a variaty of bugs #441 [Florian Gross]
-
-* Fixed skeleton Rakefile to work with sqlite3 out of the box #521 [rasputnik]
-
-* Fixed that script/breakpointer didn't get the Ruby path rewritten as the other scripts #523 [brandt@kurowski.net]
-
-* Fixed handling of syntax errors in models that had already been succesfully required once in the current interpreter
-
-* Fixed that models that weren't referenced in associations weren't being reloaded in the development mode by reinstating the reload
-
-* Fixed that generate scaffold would produce bad functional tests
-
-* Fixed that FCGI can also display SyntaxErrors
-
-* Upgraded to Active Record 1.6.0, Action Pack 1.4.0
-
-
-*0.9.4.1* (January 18th, 2005)
-
-* Added 5-second timeout to WordNet alternatives on creating reserved-word models #501 [Marcel Molina Jr.]
-
-* Fixed binding of caller #496 [Alexey]
-
-* Upgraded to Active Record 1.5.1, Action Pack 1.3.1, Action Mailer 0.6.1
-
-
-*0.9.4* (January 17th, 2005)
-
-* Added that ApplicationController will catch a ControllerNotFound exception if someone attempts to access a url pointing to an unexisting controller [Tobias Lütke]
-
-* Flipped code-to-test ratio around to be more readable #468 [Scott Baron]
-
-* Fixed log file permissions to be 666 instead of 777 (so they're not executable) #471 [Lucas Carlson]
-
-* Fixed that auto reloading would some times not work or would reload the models twice #475 [Tobias Lütke]
-
-* Added rewrite rules to deal with caching to public/.htaccess
-
-* Added the option to specify a controller name to "generate scaffold" and made the default controller name the plural form of the model.
-
-* Added that rake clone_structure_to_test, db_structure_dump, and purge_test_database tasks now pick up the source database to use from
-  RAILS_ENV instead of just forcing development #424 [Tobias Lütke]
-
-* Fixed script/console to work with Windows (that requires the use of irb.bat) #418 [Chris McGrath]
-
-* Fixed WEBrick servlet slowdown over time by restricting the load path reloading to mod_ruby
-
-* Removed Fancy Indexing as a default option on the WEBrick servlet as it made it harder to use various caching schemes
-
-* Upgraded to Active Record 1.5, Action Pack 1.3, Action Mailer 0.6
-
-
-*0.9.3* (January 4th, 2005)
-
-* Added support for SQLite in the auto-dumping/importing of schemas for development -> test #416
-
-* Added automated rewriting of the shebang lines on installs through the gem rails command #379 [Manfred Stienstra]
-
-* Added ActionMailer::Base.deliver_method = :test to the test environment so that mail objects are available in ActionMailer::Base.deliveries
-  for functional testing.
-
-* Added protection for creating a model through the generators with a name of an existing class, like Thread or Date.
-  It'll even offer you a synonym using wordnet.princeton.edu as a look-up. No, I'm not kidding :) [Florian Gross]
-
-* Fixed dependency management to happen in a unified fashion for Active Record and Action Pack using the new Dependencies module. This means that
-  the environment options needs to change from:
-
-    Before in development.rb:
-      ActionController::Base.reload_dependencies = true  
-      ActiveRecord::Base.reload_associations     = true
-
-    Now in development.rb:
-      Dependencies.mechanism = :load
-
-    Before in production.rb and test.rb:
-      ActionController::Base.reload_dependencies = false
-      ActiveRecord::Base.reload_associations     = false
-
-    Now in production.rb and test.rb:
-      Dependencies.mechanism = :require
-
-* Fixed problems with dependency caching and controller hierarchies on Ruby 1.8.2 in development mode #351
-
-* Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 [Lucas Carlson]
-
-* Upgraded to Action Pack 1.2.0 and Active Record 1.4.0
-
-
-*0.9.2*
-
-* Fixed CTRL-C exists from the Breakpointer to be a clean affair without error dumping [Kent Sibilev]
-
-* Fixed "rake stats" to work with sub-directories in models and controllers and to report the code to test ration [Scott Baron]
-
-* Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record.
-
-* Added graceful handling of an inaccessible log file by redirecting output to STDERR with a warning #330 [rainmkr]
-
-* Added support for a -h/--help parameter in the generator #331 [Ulysses]
-
-* Fixed that File.expand_path in config/environment.rb would fail when dealing with symlinked public directories [mjobin]
-
-* Upgraded to Action Pack 1.1.0 and Active Record 1.3.0
-
-
-*0.9.1*
-
-* Upgraded to Action Pack 1.0.1 for important bug fix
-
-* Updated gem dependencies
-
-
-*0.9.0*
-
-* Renamed public/dispatch.servlet to script/server -- it wasn't really dispatching anyway as its delegating calls to public/dispatch.rb
-
-* Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible
-  for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb
-
-* Added script/console that makes it even easier to start an IRB session for interacting with the domain model. Run with no-args to
-  see help.
-
-* Added breakpoint support through the script/breakpointer client. This means that you can break out of execution at any point in
-  the code, investigate and change the model, AND then resume execution! Example:
-
-    class WeblogController < ActionController::Base
-      def index
-        @posts = Post.find_all
-        breakpoint "Breaking out from the list"
-      end
-    end
-
-  So the controller will accept the action, run the first line, then present you with a IRB prompt in the breakpointer window.
-  Here you can do things like:
-
-  Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
-
-    >> @posts.inspect
-    => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
-         #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
-    >> @posts.first.title = "hello from a breakpoint"
-    => "hello from a breakpoint"
-
-  ...and even better is that you can examine how your runtime objects actually work:
-
-    >> f = @posts.first
-    => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-    >> f.
-    Display all 152 possibilities? (y or n)
-
-  Finally, when you're ready to resume execution, you press CTRL-D
-
-* Changed environments to be configurable through an environment variable. By default, the environment is "development", but you
-  can change that and set your own by configuring the Apache vhost with a string like (mod_env must be available on the server):
-
-    SetEnv RAILS_ENV production
-
-  ...if you're using WEBrick, you can pick the environment to use with the command-line parameters -e/--environment, like this:
-
-    ruby public/dispatcher.servlet -e production
-
-* Added a new default environment called "development", which leaves the production environment to be tuned exclusively for that.
-
-* Added a start_server in the root of the Rails application to make it even easier to get started
-
-* Fixed public/.htaccess to use RewriteBase and share the same rewrite rules for all the dispatch methods
-
-* Fixed webrick_server to handle requests in a serialized manner (the Rails reloading infrastructure is not thread-safe)
-
-* Added support for controllers in directories. So you can have:
-
-    app/controllers/account_controller.rb        # URL: /account/
-    app/controllers/admin/account_controller.rb  # URL: /admin/account/
-
-  NOTE: You need to update your public/.htaccess with the new rules to pick it up
-
-* Added reloading for associations and 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
-  ActiveRecord::Base.reload_associations = false and ActionController::Base.reload_dependencies = false in production environments.
-
-* Added support for sub-directories in app/models. So now you can have something like Basecamp with:
-
-    app/models/accounting
-    app/models/project
-    app/models/participants
-    app/models/settings
-
-  It's poor man's namespacing, but only for file-system organization. You still require files just like before.
-  Nothing changes inside the files themselves.
-
-
-* Fixed a few references in the tests generated by new_mailer [Jeremy Kemper]
-
-* Added support for mocks in testing with test/mocks
-
-* Cleaned up the environments a bit and added global constant RAILS_ROOT
-
-
-*0.8.5* (9)
-
-* Made dev-util available to all tests, so you can insert breakpoints in any test case to get an IRB prompt at that point [Jeremy Kemper]:
-
-    def test_complex_stuff
-      @david.projects << @new_project
-      breakpoint "Let's have a closer look at @david"
-    end
-
-  You need to install dev-utils yourself for this to work ("gem install dev-util").
-
-* Added shared generator behavior so future upgrades should be possible without manually copying over files [Jeremy Kemper]
-
-* Added the new helper style to both controller and helper templates [Jeremy Kemper]
-
-* Added new_crud generator for creating a model and controller at the same time with explicit scaffolding [Jeremy Kemper]
-
-* Added configuration of Test::Unit::TestCase.fixture_path to test_helper to concide with the new AR fixtures style
-
-* Fixed that new_model was generating singular table/fixture names
-
-* Upgraded to Action Mailer 0.4.0
-
-* Upgraded to Action Pack 0.9.5
-
-* Upgraded to Active Record 1.1.0
-
-
-*0.8.0 (15)*
-
-* Removed custom_table_name option for new_model now that the Inflector is as powerful as it is
-
-* Changed the default rake action to just do testing and separate API generation and coding statistics into a "doc" task.
-
-* Fixed WEBrick dispatcher to handle missing slashes in the URLs gracefully [alexey]
-
-* Added user option for all postgresql tool calls in the rakefile [elvstone]
-
-* Fixed problem with running "ruby public/dispatch.servlet" instead of "cd public; ruby dispatch.servlet" [alexey]
-
-* Fixed WEBrick server so that it no longer hardcodes the ruby interpreter used to "ruby" but will get the one used based
-  on the Ruby runtime configuration. [Marcel Molina Jr.]
-
-* Fixed Dispatcher so it'll route requests to magic_beans to MagicBeansController/magic_beans_controller.rb [Caio Chassot]
-
-* "new_controller MagicBeans" and "new_model SubscriptionPayments" will now both behave properly as they use the new Inflector.
-
-* Fixed problem with MySQL foreign key constraint checks in Rake :clone_production_structure_to_test target [Andreas Schwarz]
-
-* Changed WEBrick server to by default be auto-reloading, which is slower but makes source changes instant.
-  Class compilation cache can be turned on with "-c" or "--cache-classes".
-
-* Added "-b/--binding" option to WEBrick dispatcher to bind the server to a specific IP address (default: 127.0.0.1) [Kevin Temp]
-
-* dispatch.fcgi now DOESN'T set FCGI_PURE_RUBY as it was slowing things down for now reason [Andreas Schwarz]
-
-* Added new_mailer generator to work with Action Mailer
-
-* Included new framework: Action Mailer 0.3
-
-* Upgraded to Action Pack 0.9.0
-
-* Upgraded to Active Record 1.0.0
-
-
-*0.7.0*
-
-* Added an optional second argument to the new_model script that allows the programmer to specify the table name,
-  which will used to generate a custom table_name method in the model and will also be used in the creation of fixtures.
-  [Kevin Radloff]
-
-* script/new_model now turns AccountHolder into account_holder instead of accountholder [Kevin Radloff]
-
-* Fixed the faulty handleing of static files with WEBrick [Andreas Schwarz]
-
-* Unified function_test_helper and unit_test_helper into test_helper
-
-* Fixed bug with the automated production => test database dropping on PostgreSQL [dhawkins]
-
-* create_fixtures in both the functional and unit test helper now turns off the log during fixture generation
-  and can generate more than one fixture at a time. Which makes it possible for assignments like:
-
-    @people, @projects, @project_access, @companies, @accounts =
-      create_fixtures "people", "projects", "project_access", "companies", "accounts"
-
-* Upgraded to Action Pack 0.8.5 (locally-scoped variables, partials, advanced send_file)
-
-* Upgraded to Active Record 0.9.5 (better table_name guessing, cloning, find_all_in_collection)
-
-
-*0.6.5*
-
-* No longer specifies a template for rdoc, so it'll use whatever is default (you can change it in the rakefile)
-
-* The new_model generator will now use the same rules for plural wordings as Active Record
-  (so Category will give categories, not categorys) [Kevin Radloff]
-
-* dispatch.fcgi now sets FCGI_PURE_RUBY to true to ensure that it's the Ruby version that's loaded [danp]
-
-* Made the GEM work with Windows
-
-* Fixed bug where mod_ruby would "forget" the load paths added when switching between controllers
-
-* PostgreSQL are now supported for the automated production => test database dropping [Kevin Radloff]
-
-* Errors thrown by the dispatcher are now properly handled in FCGI.
-
-* Upgraded to Action Pack 0.8.0 (lots and lots and lots of fixes)
-
-* Upgraded to Active Record 0.9.4 (a bunch of fixes)
-
-
-*0.6.0*
-
-* Added AbstractionApplicationController as a superclass for all controllers generated. This class can be used
-  to carry filters and methods that are to be shared by all. It has an accompanying ApplicationHelper that all
-  controllers will also automatically have available.
-
-* Added environments that can be included from any script to get the full Active Record and Action Controller
-  context running. This can be used by maintenance scripts or to interact with the model through IRB. Example:
-
-    require 'config/environments/production'
-
-    for account in Account.find_all
-      account.recalculate_interests
-    end
-
-  A short migration script for an account model that had it's interest calculation strategy changed.
-
-* Accessing the index of a controller with "/weblog" will now redirect to "/weblog/" (only on Apache, not WEBrick)
-
-* Simplified the default Apache config so even remote requests are served off CGI as a default.
-  You'll now have to do something specific to activate mod_ruby and FCGI (like using the force urls).
-  This should make it easier for new comers that start on an external server.
-
-* Added more of the necessary Apache options to .htaccess to make it easier to setup
-
-* Upgraded to Action Pack 0.7.9 (lots of fixes)
-
-* Upgraded to Active Record 0.9.3 (lots of fixes)
-
-
-*0.5.7*
-
-* Fixed bug in the WEBrick dispatcher that prevented it from getting parameters from the URL
-  (through GET requests or otherwise)
-
-* Added lib in root as a place to store app specific libraries
-
-* Added lib and vendor to load_path, so anything store within can be loaded directly.
-  Hence lib/redcloth.rb can be loaded with require "redcloth"
-
-* Upgraded to Action Pack 0.7.8 (lots of fixes)
-
-* Upgraded to Active Record 0.9.2 (minor upgrade)
-
-
-*0.5.6*
-
-* Upgraded to Action Pack 0.7.7 (multipart form fix)
-
-* Updated the generated template stubs to valid XHTML files
-
-* Ensure that controllers generated are capitalized, so "new_controller TodoLists"
-  gives the same as "new_controller Todolists" and "new_controller todolists".
-
-
-*0.5.5*
-
-* Works on Windows out of the box! (Dropped symlinks)
-
-* Added webrick dispatcher: Try "ruby public/dispatch.servlet --help" [Florian Gross]
-
-* Report errors about initialization to browser (instead of attempting to use uninitialized logger)
-
-* Upgraded to Action Pack 0.7.6
-
-* Upgraded to Active Record 0.9.1
-
-* Added distinct 500.html instead of reusing 404.html
-
-* Added MIT license
-
-
-*0.5.0*
-
-* First public release
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
new file mode 100644
index 0000000000..0c59f59917
--- /dev/null
+++ b/railties/CHANGELOG.md
@@ -0,0 +1,2390 @@
+## Rails 3.2.0 (unreleased) ##
+
+*   Scaffold returns 204 No Content for API requests without content. This makes scaffold work with jQuery out of the box. *José Valim*
+
+*   Updated Rails::Rack::Logger middleware to apply any tags set in config.log_tags to the newly ActiveSupport::TaggedLogging Rails.logger. This makes it easy to tag log lines with debug information like subdomain and request id -- both very helpful in debugging multi-user production applications *DHH*
+
+*   Default options to `rails new` can be set in ~/.railsrc *Guillermo Iguaran*
+
+*   Added destroy alias to Rails engines. *Guillermo Iguaran*
+
+*   Added destroy alias for Rails command line. This allows the following: `rails d model post`. *Andrey Ognevsky*
+
+*   Attributes on scaffold and model generators default to string. This allows the following: "rails g scaffold Post title body:text author" *José Valim*
+
+*   Removed old plugin generator (`rails generate plugin`) in favor of `rails plugin new` command. *Guillermo Iguaran*
+
+*   Removed old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API. *Guillermo Iguaran*
+
+
+*   Rails 3.1.1
+
+*   Add jquery-rails to Gemfile of plugins, test/dummy app needs it. Closes #3091. *Santiago Pastorino*
+
+*   Add config.assets.initialize_on_precompile which, when set to false, forces
+    `rake assets:precompile` to load 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.
+
+
+## Rails 3.1.0 (August 30, 2011) ##
+
+*   The default database schema file is written as UTF-8. *Aaron Patterson*
+
+*   Generated apps with --dev or --edge flags depend on git versions of
+    sass-rails and coffee-rails. *Santiago Pastorino*
+
+*   Rack::Sendfile middleware is used only if x_sendfile_header is present. *Santiago Pastorino*
+
+*   Add JavaScript Runtime name to the Rails Info properties. *DHH*
+
+*   Make pp enabled by default in Rails console. *Akira Matsuda*
+
+*   Add alias `r` for rails runner. *Jordi Romero*
+
+*   Make sprockets/railtie require explicit and add --skip-sprockets to app generator *José Valim*
+
+*   Added Rails.groups that automatically handles Rails.env and ENV["RAILS_GROUPS"] *José Valim*
+
+*   The new rake task assets:clean removes precompiled assets. *fxn*
+
+*   Application and plugin generation run bundle install unless --skip-gemfile or --skip-bundle. *fxn*
+
+*   Fixed database tasks for jdbc* adapters #jruby *Rashmi Yadav*
+
+*   Template generation for jdbcpostgresql  #jruby *Vishnu Atrai*
+
+*   Template generation for jdbcmysql and jdbcsqlite3 #jruby *Arun Agrawal*
+
+*   The -j option of the application generator accepts an arbitrary string. If passed "foo",
+    the gem "foo-rails" is added to the Gemfile, and the application JavaScript manifest
+    requires "foo" and "foo_ujs". As of this writing "prototype-rails" and "jquery-rails"
+    exist and provide those files via the asset pipeline. Default is "jquery". *fxn*
+
+*   jQuery is no longer vendored, it is provided from now on by the jquery-rails gem. *fxn*
+
+*   Prototype and Scriptaculous are no longer vendored, they are provided from now on
+    by the prototype-rails gem. *fxn*
+
+*   The scaffold controller will now produce SCSS file if Sass is available *Prem Sichanugrist*
+
+*   The controller and resource generators will now automatically produce asset stubs (this can be turned off with --skip-assets). These stubs will use Coffee and Sass, if those libraries are available. *DHH*
+
+*   jQuery is the new default JavaScript library. *fxn*
+
+*   Changed scaffold, application, and mailer generator to create Ruby 1.9 style hash when running on Ruby 1.9 *Prem Sichanugrist*
+
+    So instead of creating something like:
+
+        redirect_to users_path, :notice => "User has been created"
+
+    it will now be like this:
+
+        redirect_to users_path, notice: "User has been created"
+
+    You can also passing `--old-style-hash` to make Rails generate old style hash even you're on Ruby 1.9
+
+*   Changed scaffold_controller generator to create format block for JSON instead of XML *Prem Sichanugrist*
+
+*   Add using Turn with natural language test case names for test_help.rb when running with minitest (Ruby 1.9.2+) *DHH*
+
+*   Direct logging of Active Record to STDOUT so it's shown inline with the results in the console *DHH*
+
+*   Added `config.force_ssl` configuration which loads Rack::SSL middleware and force all requests to be under HTTPS protocol *DHH, Prem Sichanugrist, and Josh Peek*
+
+*   Added `rails plugin new` command which generates rails plugin with gemspec, tests and dummy application for testing *Piotr Sarnacki*
+
+*   Added -j parameter with jquery/prototype as options. Now you can create your apps with jQuery using `rails new myapp -j jquery`. The default is still Prototype. *siong1987*
+
+*   Added Rack::Etag and Rack::ConditionalGet to the default middleware stack *José Valim*
+
+*   Added Rack::Cache to the default middleware stack *Yehuda Katz and Carl Lerche*
+
+*   Engine is now rack application *Piotr Sarnacki*
+
+*   Added middleware stack to Engine *Piotr Sarnacki*
+
+*   Engine can now load plugins *Piotr Sarnacki*
+
+*   Engine can load its own environment file *Piotr Sarnacki*
+
+*   Added helpers to call engines' route helpers from application and vice versa *Piotr Sarnacki*
+
+*   Task for copying plugins' and engines' migrations to application's db/migrate directory *Piotr Sarnacki*
+
+*   Changed ActionDispatch::Static to allow handling multiple directories *Piotr Sarnacki*
+
+*   Added isolate_namespace() method to Engine, which sets Engine as isolated *Piotr Sarnacki*
+
+*   Include all helpers from plugins and shared engines in application *Piotr Sarnacki*
+
+
+## Rails 3.0.7 (April 18, 2011) ##
+
+*   No changes.
+
+
+*   Rails 3.0.6 (April 5, 2011)
+
+*   No changes.
+
+
+## Rails 3.0.5 (February 26, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.4 (February 8, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.3 (November 16, 2010) ##
+
+*   No changes.
+
+
+## Rails 3.0.2 (November 15, 2010) ##
+
+*   No changes.
+
+
+## Rails 3.0.1 (October 15, 2010) ##
+
+*   No Changes, just a version bump.
+
+
+## Rails 3.0.0 (August 29, 2010) ##
+
+*   Application generation: --skip-testunit and --skip-activerecord become --skip-test-unit and --skip-active-record respectively. *fxn*
+
+*   Added console to Rails::Railtie as a hook called just after console starts. *José Valim*
+
+*   Rails no longer autoload code in lib for application. You need to explicitly require it. *José Valim*
+
+*   Rails::LogSubscriber was renamed to ActiveSupport::LogSubscriber *José Valim*
+
+*   config.load_(once_)paths in config/application.rb got renamed to config.autoload_(once_)paths. *fxn*
+
+*   Abort generation/booting on Ruby 1.9.1. *fxn*
+
+*   Made the rails command work even when you're in a subdirectory *Chad Fowler*
+
+*   Removed Rails Metal [Yehuda Katz, José Valim].
+
+*   Renamed config.cookie_secret to config.secret_token and pass it as env key. *José Valim*
+
+*   Session store configuration has changed *Yehuda Katz, Carl Lerche*
+
+        config.session_store :cookie_store, {:key => "..."}
+        config.cookie_secret = "fdsfhisdghfidugnfdlg"
+
+*   railtie_name and engine_name are deprecated. You can now add any object to
+    the configuration object: config.your_plugin = {} *José Valim*
+
+*   Added config.generators.templates to provide alternative paths for the generators
+    to look for templates *José Valim*
+
+*   Added "rake about" as a replacement for script/about *DHH*
+
+*   Removed all the default commands in script/* and replaced them with script/rails and a rails command that'll act the same when run from within the app [DHH]. Example:
+
+    ./script/generate scaffold post title:string  can now be called as  rails g scaffold post title:string
+
+    Run rails --help inside an app for more help.
+
+*   Removed config/initializers/new_rails_defaults.rb as all frameworks now follow the settings from it *DHH*
+
+*   Set config.time_zone to UTC by default *DHH*
+
+*   Added default .gitignore (this is just recognizing Git market share, don't throw a hissy if you use another SCM) *DHH*
+
+*   Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH]. Examples:
+
+        cookies.permanent[:prefers_open_id] = true
+        # => Set-Cookie: prefers_open_id=true; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+
+        cookies.signed[:discount] = 45
+        # => Set-Cookie: discount=BAhpMg==--2c1c6906c90a3bc4fd54a51ffb41dffa4bf6b5f7; path=/
+
+        cookies.signed[:discount]
+        # => 45 (if the cookie was changed, you'll get a InvalidSignature exception)
+
+        cookies.permanent.signed[:remember_me] = current_user.id
+        # => Set-Cookie: discount=BAhU--848956038e692d7046deab32b7131856ab20e14e; path=/; expires=Sun, 16-Dec-2029 03:24:16 GMT
+
+    ...to use the signed cookies, you need to set a secret to ActionController::Base.cookie_verifier_secret (automatically done in config/initializers/cookie_verification_secret.rb for new Rails applications).
+
+*   Added config/initializers/cookie_verification_secret.rb with an auto-generated secret for using ActionController::Base#cookies.signed *DHH*
+
+*   Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs *DHH*
+
+*   I18n support for plugins.  #2325 *Antonio Tapiador, Sven Fuchs*
+
+*   Ruby 1.9: use UTF-8 for default internal and external encodings.  *Jeremy Kemper*
+
+*   Added db/seeds.rb as a default file for storing seed data for the database. Can be loaded with rake db:seed (or created alongside the db with db:setup). (This is also known as the "Stop Putting Gawd Damn Seed Data In Your Migrations" feature) *DHH*
+
+
+## 2.3.2 Final (March 15, 2009) ##
+
+*   Remove outdated script/plugin options *Pratik Naik*
+
+*   Allow metal to live in plugins #2045 *Matthew Rudy*
+
+*   Added metal *Josh Peek*
+
+*   Remove script/performance/request in favour of the performance integration tests. *Pratik Naik*
+
+    To continue using script/performance/request, install the request_profiler plugin :
+
+        script/plugin install git://github.com/rails/request_profiler.git
+
+*   Add a rake task to apply a template to an existing application : rake rails:template LOCATION=~/template.rb *Pratik Naik*
+
+*   Add "-m/--template" option to Rails generator to apply a template to the generated application. *Jeremy McAnally*
+
+        This has been extracted from rg - http://github.com/jeremymcanally/rg
+
+        Example:
+
+            # template.rb
+
+            # Install plugins from git or svn
+            plugin "will-paginate", :git => "git://github.com/mislav/will_paginate.git"
+            plugin "old-restful-auth", :svn => "http://svn.techno-weenie.net/projects/plugins/restful_authentication/"
+
+            # Add gems to environment.rb
+            gem "jeremymcanally-context"
+            gem "bluecloth"
+
+            # Vendor file. Data in a string or...
+            vendor("borrowed.rb", <<CODE
+              def helpful_method
+                do_something_helpful_here
+              end
+            CODE
+
+            # ...file data from block return value.
+            # #initializer creates a new initializer file
+            initializer("crypto.rb") do
+              salt = "--#{Time.now}--#{rand}--#{srand(Time.now.to_i)}"
+
+              "SPECIAL_SALT = '#{salt}'"
+            end
+
+        Usage:
+
+          To use a template, provide a file path or URL:
+
+          1. Using a local file :
+
+            rails <application name> -m /path/to/my/template.rb
+
+          2. Or directly from a URL :
+
+            rails <application name> --template=http://gist.github.com/31208.txt
+
+*   Extracted the process scripts (inspector, reaper, spawner) into the plugin irs_process_scripts *David Heinemeier Hansson*
+
+*   Changed Rails.root to return a Pathname object (allows for Rails.root.join('app', 'controllers') => "#{RAILS_ROOT}/app/controllers") #1482 *Damian Janowski/?*
+
+*   Added view path support for engines *David Heinemeier Hansson*
+
+*   Added that config/routes.rb files in engine plugins are automatically loaded (and reloaded when they change in dev mode) *David Heinemeier Hansson*
+
+*   Added app/[models|controllers|helpers] to the load path for plugins that has an app directory (go engines ;)) *David Heinemeier Hansson*
+
+*   Add config.preload_frameworks to load all frameworks at startup. Default to false so Rails autoloads itself as it's used. Turn this on for Passenger and JRuby. Also turned on by config.threadsafe!  *Jeremy Kemper*
+
+*   Add a rake task to generate dispatchers : rake rails:generate_dispatchers *Pratik Naik*
+
+*   "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. *Yaroslav Markin, Pratik Naik*
+
+*   Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 *kastner*
+
+*   Added Rails.backtrace_cleaner as an accessor for the Rails::BacktraceCleaner instance used by the framework to cut down on backtrace noise and config/initializers/backtrace_silencers.rb to add your own (or turn them all off) *David Heinemeier Hansson*
+
+*   Switch from Test::Unit::TestCase to ActiveSupport::TestCase.  *Jeremy Kemper*
+
+*   Added config.i18n settings gatherer to config/environment, auto-loading of all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale *David Heinemeier Hansson*
+
+*   BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version *David Heinemeier Hansson*
+
+
+## 2.2.1 RC2 (November 14th, 2008) ##
+
+*   Fixed plugin generator so that generated unit tests would subclass ActiveSupport::TestCase, also introduced a helper script to reduce the needed require statements #1137 *Mathias Meyer*
+
+*   Update Prototype to 1.6.0.3 *sam*
+
+
+## 2.2.0 RC1 (October 24th, 2008) ##
+
+*   Fixed that sqlite would report "db/development.sqlite3 already exists" whether true or not on db:create #614 *Antonio Cangiano*
+
+*   Added config.threadsafe! to toggle allow concurrency settings and disable the dependency loader *Josh Peek*
+
+*   Turn cache_classes on by default *Josh Peek*
+
+*   Added configurable eager load paths. Defaults to app/models, app/controllers, and app/helpers *Josh Peek*
+
+*   Introduce simple internationalization support.  *Ruby i18n team*
+
+*   Make script/plugin install <plugin> -r <revision> option work with git based plugins. #257. [Tim Pope Jakub Kuźma]. Example:
+
+    script/plugin install git://github.com/mislav/will_paginate.git -r agnostic # Installs 'agnostic' branch
+    script/plugin install git://github.com/dchelimsky/rspec.git -r 'tag 1.1.4'
+
+*   Added Rails.initialized? flag *Josh Peek*
+
+*   Make rake test:uncommitted work with Git. *Tim Pope*
+
+*   Added Thin support to script/server.  #488 *Bob Klosinski*
+
+*   Fix script/about in production mode.  #370 *Cheah Chu Yeow, Xavier Noria, David Krmpotic*
+
+*   Add the gem load paths before the framework is loaded, so certain gems like RedCloth and BlueCloth can be frozen.
+
+*   Fix discrepancies with loading rails/init.rb from gems.
+
+*   Plugins check for the gem init path (rails/init.rb) before the standard plugin init path (init.rb)  *Jacek Becela*
+
+*   Changed all generated tests to use the test/do declaration style *David Heinemeier Hansson*
+
+*   Wrapped Rails.env in StringInquirer so you can do Rails.env.development? *David Heinemeier Hansson*
+
+*   Fixed that RailsInfoController wasn't considering all requests local in development mode (Edgard Castro) *#310 state:resolved*
+
+
+## 2.1.0 (May 31st, 2008) ##
+
+*   script/dbconsole fires up the command-line database client.  #102 *Steve Purcell*
+
+*   Fix bug where plugin init.rb files from frozen gem specs weren't being run.  (pjb3) *#122 state:resolved*
+
+*   Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) *#88*
+
+*   Rails Edge info returns the latest git commit hash *Francesc Esplugas*
+
+*   Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 *Nick Sieger*
+
+*   rake time:zones:local finds correct base utc offset for zones in the Southern Hemisphere *Geoff Buesing*
+
+*   Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. *Rick Olson*
+
+*   script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. *Jonathan del Strother*
+
+*   Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. #11513 *ddollar*
+
+    rake gems:unpack             # unpacks all gems
+    rake gems:unpack GEM=mygem   # unpacks only the gem 'mygem'
+
+    rake gems:build              # builds all unpacked gems
+    rake gems:build GEM=mygem    # builds only the gem 'mygem'
+
+*   Add config.active_support for future configuration options.  Also, add more new Rails 3 config settings to new_rails_defaults.rb *Rick Olson*
+
+*   Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants *Pratik Naik*
+
+*   Allow files in plugins to be reloaded like the rest of the application.  *Rick Olson*
+
+    Enables or disables plugin reloading.
+
+        config.reload_plugins = true
+
+    You can get around this setting per plugin.
+    If #reload_plugins? == false (DEFAULT), add this to your plugin's init.rb to make it reloadable:
+
+        Dependencies.load_once_paths.delete lib_path
+
+    If #reload_plugins? == true, add this to your plugin's init.rb to only load it once:
+
+        Dependencies.load_once_paths << lib_path
+
+*   Small tweak to allow plugins to specify gem dependencies.  *Rick Olson*
+
+    \# OLD open_id_authentication plugin init.rb
+    require 'yadis'
+    require 'openid'
+    ActionController::Base.send :include, OpenIdAuthentication
+
+    \# NEW
+    config.gem "ruby-openid", :lib => "openid", :version => "1.1.4"
+    config.gem "ruby-yadis",  :lib => "yadis",  :version => "0.3.4"
+
+    config.after_initialize do
+        ActionController::Base.send :include, OpenIdAuthentication
+    end
+
+*   Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. *Rick Olson*
+
+    Rails::Initializer.run do |config|
+        config.gem "bj"
+        config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+        config.gem "aws-s3", :lib => "aws/s3"
+    end
+
+    \# List required gems.
+    rake gems
+
+    \# Install all required gems:
+    rake gems:install
+
+    \# Unpack specified gem to vendor/gems/gem_name-x.x.x
+    rake gems:unpack GEM=bj
+
+*   Removed the default .htaccess configuration as there are so many good deployment options now (kept it as an example in README) *David Heinemeier Hansson*
+
+*   config.time_zone accepts TZInfo::Timezone identifiers as well as Rails TimeZone identifiers *Geoff Buesing*
+
+*   Rails::Initializer#initialize_time_zone raises an error if value assigned to config.time_zone is not recognized. Rake time zone tasks only require ActiveSupport instead of entire environment *Geoff Buesing*
+
+*   Stop adding the antiquated test/mocks/* directories and only add them to the path if they're still there for legacy reasons *David Heinemeier Hansson*
+
+*   Added that gems can now be plugins if they include rails/init.rb #11444 *John Barnette*
+
+*   Added Plugin#about method to programmatically access the about.yml in a plugin #10979 *James Adam*
+
+        plugin = Rails::Plugin.new(path_to_my_plugin)
+        plugin.about["author"] # => "James Adam"
+        plugin.about["url"] # => "http://interblah.net"
+
+*   Improve documentation. *Ryan Bigg, Jan De Poorter, Cheah Chu Yeow, Xavier Shay, Jack Danger Canty, Emilio Tagua, Xavier Noria,  Sunny Ripert*
+
+*   Added config.time_zone = 'UTC' in the default environment.rb *Geoff Buesing*
+
+*   Added rake tasks time:zones:all, time:zones:us and time:zones:local for finding time zone names for config.time_zone option *Geoff Buesing*
+
+*   Add config.time_zone for configuring the default Time.zone value.  #10982 *Geoff Buesing*
+
+*   Added support for installing plugins hosted at git repositories #11294 *Jack Danger Canty*
+
+*   Fixed that script/generate would not look for plugin generators in plugin_paths #11000 *glv*
+
+*   Fixed database rake tasks to work with charset/collation and show proper error messages on failure. Closes #11301 *matt*
+
+*   Added a -e/--export to script/plugin install, uses svn export. #10847 *jon@blankpad.net)*
+
+*   Reshuffle load order so that routes and observers are initialized after plugins and app initializers.  Closes #10980 *Rick Olson*
+
+*   Git support for script/generate.  #10690 *ssoroka*
+
+*   Update scaffold to use labels instead of bold tags.  Closes #10757 *zach-inglis-lt3*
+
+*   Resurrect WordNet synonym lookups.  #10710 *tom./, matt*
+
+*   Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) *David Heinemeier Hansson*
+
+*   Added that rails:update is run when you do rails:freeze:edge to ensure you also get the latest JS and config files #10565 *jeff*
+
+*   SQLite: db:drop:all doesn't fail silently if the database is already open.  #10577 *Cheah Chu Yeow, mrichman*
+
+*   Introduce native mongrel handler and push mutex into dispatcher.  *Jeremy Kemper*
+
+*   Ruby 1.9 compatibility.  #1689, #10546 *Cheah Chu Yeow, frederico*
+
+
+## 2.0.2 (December 16th, 2007) ##
+
+*   Changed the default database from mysql to sqlite3, so now running "rails myapp" will have a config/database.yml that's setup for SQLite3 (which in OS X Leopard is installed by default, so is the gem, so everything Just Works with no database configuration at all). To get a Rails application preconfigured for MySQL, just run "rails -d mysql myapp" *David Heinemeier Hansson*
+
+*   Turned on ActionView::Base.cache_template_loading by default in config/environments/production.rb to prevent file system stat calls for every template loading to see if it changed (this means that you have to restart the application to see template changes in production mode) *David Heinemeier Hansson*
+
+*   Introduce `rake secret` to output a crytographically secure secret key for use with cookie sessions #10363 *revans*
+
+*   Fixed that local database creation should consider 127.0.0.1 local #9026 *parcelbrat*
+
+*   Fixed that functional tests generated for scaffolds should use fixture calls instead of hard-coded IDs #10435 *boone*
+
+*   Added db:migrate:redo and db:migrate:reset for rerunning existing migrations #10431, #10432  *matt*
+
+*   RAILS_GEM_VERSION may be double-quoted also.  #10443 *James Cox*
+
+*   Update rails:freeze:gems to work with RubyGems 0.9.5.  *Jeremy Kemper*
+
+
+## 2.0.1 (December 7th, 2007) ##
+
+*   Fixed Active Record bug
+
+
+## 2.0.0 (December 6th, 2007) ##
+
+*   The test task stops with a warning if you have pending migrations.  #10377 *Josh Knowles*
+
+*   Add warning to documentation about using transactional fixtures when the code under test uses transactions itself. Closes #7548 *Thijs van der Vossen*
+
+*   Update Prototype to 1.6.0.1.  *sam*
+
+*   Update script.aculo.us to 1.8.0.1.  *madrobby*
+
+*   Added db:fixtures:identity as a way of locating what ID a foxy fixture was assigned #10332 *John Barnette*
+
+*   Generated fixtures should not specify ids since theyre expected to be foxy fixtures #10330 *John Barnette*
+
+*   Update to Prototype -r8232.  *sam*
+
+*   Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later.  #10286 *Hongli Lai (Phusion)*
+
+*   RAILS_GEM_VERSION may be set to any valid gem version specifier.  #10057 *Chad Woolley, Cheah Chu Yeow*
+
+*   Load config/preinitializer.rb, if present, before loading the environment.  #9943 *Chad Woolley*
+
+*   FastCGI handler ignores unsupported signals like USR2 on Windows.  *Grzegorz Derebecki*
+
+*   Only load ActionMailer::TestCase if ActionMailer is loaded.  Closes #10137 *defunkt*
+
+*   Fixed that db:reset would use migrations instead of loading db/schema.rb *David Heinemeier Hansson*
+
+*   Ensure the plugin loader only loads plugins once.  Closes #10102 *haruki_zaemon*
+
+*   Refactor Plugin Loader.  Add plugin lib paths early, and add lots of tests.  Closes #9795 *James Adam*
+
+*   Added --skip-timestamps to generators that produce models #10036 *Tim Pope*
+
+*   Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.  *sam, madrobby*
+
+*   Added db:rollback to rollback the schema one version (or multiple as specified by STEP) *Jeffrey Allan Hardy*
+
+*   Fix typo in test_helper. Closes #9925 *viktor tron*
+
+*   Request profiler.  *Jeremy Kemper*
+
+*   config/boot.rb correctly detects RAILS_GEM_VERSION.  #9834 *alexch, thewoolleyman*
+
+*   Fixed incorrect migration number if script/generate executed outside of Rails root #7080 *Jeremy McAnally*
+
+*   Update Prototype to 1.6.0_rc1 and script.aculo.us to 1.8.0 preview 0.  *sam, madrobby*
+
+*   Generated fixtures use the actual primary key instead of id.  #4343 *Frederick Ros, Tarmo Tänav*
+
+*   Extend the console +helper+ method to allow you to include custom helpers.  e.g:
+    >> helper :posts
+    >> helper.some_method_from_posts_helper(Post.find(1))
+
+*   db:create works with remote databases whereas db:create:all only creates
+    databases on localhost.  #9753 *Trevor Wennblom*
+
+*   Removed calls to fixtures in generated tests as fixtures :all is now present by default in test_helper.rb *David Heinemeier Hansson*
+
+*   Add --prefix option to script/server when using mongrel. *dacat*
+
+
+## 2.0.0 Preview Release (September 29th, 2007) Includes duplicates of changes from 1.1.4 - 1.2.3 ##
+
+*   Fixed that installing plugins from SVN repositories that use trunk/ will work #8188 *evan*
+
+*   Moved the SourceAnnotationExtractor to a separate file in case libraries try to load the rails rake tasks twice. *Rick Olson*
+
+*   Moved Dispatcher to ActionController::Dispatcher.  *Jeremy Kemper*
+
+*   Changed the default logger from Ruby's own Logger with the clean_logger extensions to ActiveSupport::BufferedLogger for performance reasons [David Heinemeier Hansson]. (You can change it back with config.logger = Logger.new("/path/to/log", level).)
+
+*   Added a default 422.html page to be rendered when ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, or ActionController::InvalidAuthenticityToken is raised *David Heinemeier Hansson*
+
+*   Added --skip-fixture option to script/generate model #6862 *sandofsky*
+
+*   Print Rails version when starting console #7440 *eyematz*
+
+*   Fixed the placement of fixture files for nested models when generating through script/generate model #7547 *jkit*
+
+*   Added TEMPLATE option to rake doc:app to set a custom output template #7737 *Jakob Skjerning*
+
+*   Added VERBOSE option to rake db:migrate to turn off output #8204 *John Barnette*
+
+*   Fixed that rake doc:app should use UTF-8 #8906 *farzy*
+
+*   Fixes rake annotations to search erb and builder files as well #9150 *m.langenberg*
+
+*   Removed web_service generator *Michael Koziarski*
+
+*   Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [Frederick Cheung]. Example:
+
+        # Loads :classic_pagination before all the other plugins
+        config.plugins = [ :classic_pagination, :all ]
+
+*   Added symbols as a legal way of specifying plugins in config.plugins #9629 *tom*
+
+*   Removed deprecated task names, like clear_logs, in favor of the new namespaced style *David Heinemeier Hansson*
+
+*   Support multiple config.after_initialize blocks so plugins and apps can more easily cooperate.  #9582 *Zach Dennis*
+
+*   Added db:drop:all to drop all databases declared in config/database.yml *David Heinemeier Hansson*
+
+*   Use attribute pairs instead of the migration name to create add and remove column migrations.  Closes #9166 *Pratik Naik*
+
+    For example:
+
+    ruby script/generation migration AddSomeStuffToCustomers first_name:string last_name:string
+
+    or
+
+    ruby script/generation migration RemoveSomeStuffFromCustomers first_name:string last_name:string
+
+*   Add ActiveResource to Rails::Info.  Closes #8741 *Chris Kampmeier*
+
+*   use Gem.find_name instead of search when freezing gems.  Prevent false positives for other gems with rails in the name. Closes #8729 *wselman*
+
+*   Automatically generate add/remove column commands in specially named migrations like AddLocationToEvent.  Closes #9006 *Ryan Davis*
+
+*   Default to plural table name in Rails Generator if ActiveRecord is not present.  Closes #8963 *evan*
+
+*   Added rake routes for listing all the defined routes in the system.  #8795 *Josh Peek*
+
+*   db:create creates the database for the current environment if it's on localhost. db:create:all creates local databases for all environments.  #8783 *matt*
+
+*   Generators: look for generators in all gems, not just those suffixed with _generator, in the gem's generators or rails_generators directory. Allow use of the rails_generators directory instead of the standard generators directory in plugins also.  #8730 *Dr Nic, topfunky*
+
+*   MySQL, PostgreSQL: database.yml defaults to utf-8.  #8701 *matt*
+
+*   Added db:version to get the current schema number *via Err The Blog*
+
+*   Added --skip-migration option to scaffold and resource generators #8656 *Michael Glaesemann*
+
+*   Fix that FCGIs would leave log files open when asked to shut down by USR2.  #3028 *Sebastian Kanthak, Josh Peek*
+
+*   Fixed that dispatcher preparation callbacks only run once in production mode.  Mock Routes.reload so that dispatcher preparation callback tests run. *Rick Olson*
+
+*   Fix syntax error in dispatcher than wrecked failsafe responses.  #8625 *mtitorenko*
+
+*   Scaffolded validation errors set the appropriate HTTP status for XML responses.  #6946, #8622 *Manfred Stienstra, mmmultiworks*
+
+*   Sexy migrations for the session_migration generator.  #8561 *Vladislav*
+
+*   Console reload! runs to_prepare callbacks also.  #8393 *f.svehla*
+
+*   Generated migrations include timestamps by default.  #8501 *Shane Vitarana*
+
+*   Drop Action Web Service from rails:freeze:edge.  *Jeremy Kemper*
+
+*   Add db:create, drop, reset, charset, and collation tasks.  #8448 *matt*
+
+*   Scaffold generator depends on model generator instead of duplicating it.  #7222 *bscofield*
+
+*   Scaffold generator tests.  #8443 *pelle*
+
+*   Generated scaffold functional tests use assert_difference.  #8421 *Norbert Crombach*
+
+*   Update to Prototype 1.5.1.  *Sam Stephenson*
+
+*   Update to script.aculo.us 1.7.1_beta3.  *Thomas Fuchs*
+
+*   Generators use *.html.erb view template naming.  #8278 *Tim Pope*
+
+*   Updated resource_scaffold and model generators to use short-hand style migrations *David Heinemeier Hansson*
+
+*   Updated initializer to only load #{RAILS_ENV}.rb once. Added deprecation warning for config.breakpoint_server. *Nicholas Seckar*
+
+*   Removed breakpointer and Binding.of_caller in favor of relying on ruby-debug by Kent Sibilev since the breakpointer has been broken since Ruby 1.8.4 and will not be coming back *David Heinemeier Hansson*
+
+    To use the new debugger, start your server with script/server --debugger and insert a call to  'debugger'
+    (instead of 'breakpoint') where you want to jump into the debugger.
+
+    BACKWARDS INCOMPATIBILITY NOTE: You must remove the default line 12 from config/environments/development.rb:
+
+        config.breakpoint_server = true
+
+    This configuration option is no longer available. Rails will fail to start in development mode as long as
+    that's still present.
+
+*   Resource scaffolding returns the created entity.to_xml.  *Jeremy Kemper*
+
+*   Resource scaffolding responds to new.xml.  #8185 *Eric Mill*
+
+*   Include Active Resource in rails:freeze:edge rake task.  *Thomas Fuchs*
+
+*   Include Active Resource instead of Action Web Service [David Heinemeier Hansson] You can add AWS back with this in config/environment.rb:
+
+        config.load_paths += %W( #{RAILS_ROOT}/vendor/rails/actionwebservice/lib )
+
+    ...or just gem 'actionwebservice'
+
+*   Give generate scaffold a more descriptive database message.  Closes #7316 *Jeremy McAnally*
+
+*   Canonicalize RAILS_ROOT by using File.expand_path on Windows, which doesn't have to worry about symlinks, and Pathname#realpath elsewhere, which respects symlinks in relative paths but is incompatible with Windows.  #6755 *Jeremy Kemper, trevor*
+
+*   Deprecation: remove components from controller paths.  *Jeremy Kemper*
+
+*   Add environment variable RAILS_DEFAULT_DATABASE, which allows the builtin default of 'mysql' to be overridden. *Nicholas Seckar*
+
+*   Windows: include MinGW in RUBY_PLATFORM check.  #2982 *okkez000@gmail.com, Kaspar Schiess*
+
+*   Split out the basic plugin locator functionality into an abstract super class. Add a FileSystemLocator to do the job of checking the plugin_paths for plugins. Add plugin_locators configuration option which will iterate over the set of plugin locators and load each of the plugin loaders they return. Rename locater everywhere to locator. *Marcel Molina Jr.*
+
+*   Split plugin location and loading out of the initializer and into a new Plugin namespace, which includes Plugin::Locater and Plugin::Loader. The loader class that is used can be customized using the config.plugin_loader option.  Those monkey patching the plugin loading subsystem take note, the internals changing here will likely break your modifications. The good news is that it should be substantially easier to hook into the plugin locating and loading process now.  *Marcel Molina Jr.*
+
+*   Added assumption that all plugin creators desire to be sharing individuals and release their work under the MIT license *David Heinemeier Hansson*
+
+*   Added source-annotations extractor tasks to rake [Jamis Buck]. This allows you to add FIXME, OPTIMIZE, and TODO comments to your source code that can then be extracted in concert with rake notes (shows all), rake notes:fixme, rake notes:optimize and rake notes:todo.
+
+*   Added fixtures :all to test_helper.rb to assume that most people just want all their fixtures loaded all the time *David Heinemeier Hansson*
+
+*   Added config/initializers where all ruby files within it are automatically loaded after the Rails configuration is done, so you don't have to litter the environment.rb file with a ton of mixed stuff *David Heinemeier Hansson*
+
+*   For new apps, generate a random secret for the cookie-based session store.  *Jeremy Kemper*
+
+*   Stop swallowing errors during rake test *Michael Koziarski*
+
+*   Update Rails Initializer to use ActionController::Base#view_paths *Rick Olson*
+
+*   Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ *Chad Fowler*
+
+*   Plugins may be symlinked in vendor/plugins.  #4245 *brandon, progrium@gmail.com*
+
+*   Resource generator depends on the model generator rather than duplicating it.  #7269 *bscofield*
+
+*   Add/Update usage documentation for script/destroy, resource generator and scaffold_resource generator.  Closes #7092, #7271, #7267.  *bscofield*
+
+*   Update to script.aculo.us 1.7.0.  *Thomas Fuchs*
+
+*   Update to Prototype 1.5.0. *Sam Stephenson*
+
+*   Generator: use destination path for diff tempfiles.  #7015 *alfeld*
+
+*   Fixed that webrick would strip leading newlines and hang connection #4156 *psross*
+
+*   Ensure plugins are in the Dependencies.load_once_paths collection by default.  *Rick Olson*
+    If you really want your plugins to reload, add this to the very top of init.rb:
+
+        Dependencies.load_once_paths.delete(lib_path)
+
+*   Allow config.to_prepare to work, make the dispatcher safe to 're require'. *Michael Koziarski, Nicholas Seckar*
+
+*   Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 *fearoffish*
+
+*   Fix Webrick Daemon dispatching bug regarding a bad current working directory.  Closes #4899 *Rick Olson*
+
+*   Make config.plugins affect the load path and the dependencies system.  Allows you to control plugin loading order, and keep disabled plugins off the load path. *James Adam*
+
+*   Don't generate a components directory in new Rails apps.  *Jeremy Kemper*
+
+*   Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) *David Heinemeier Hansson*
+
+*   Added one-letter aliases for the three default environments to script/console, so script/console p will load the production environment (t for test, d for development) *David Heinemeier Hansson*
+
+*   Fixed that script/server running against Mongrel should tail the proper log regardless of the environment *David Heinemeier Hansson*
+
+*   Update initializer to load Rails::VERSION as soon as possible. Closes #6698. *Nicholas Seckar*
+
+*   Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) *David Heinemeier Hansson*
+
+*   Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available *David Heinemeier Hansson*
+
+*   Update to Prototype and script.aculo.us [5579]. *Thomas Fuchs*
+
+*   Made script/server work with -e and -d when using Mongrel *David Heinemeier Hansson*
+
+*   Update to Prototype 1.5.0_rc2 [5550] which makes it work in Opera again *Thomas Fuchs*
+
+*   Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action *Tobias Lütke*
+
+*   Rails::VERSION::STRING should always be available without having to require 'rails/version'.  #6244 *fearoffish*
+
+*   Update to Prototype 1.5.0_rc2. *Sam Stephenson*
+
+*   Add grep-based fallback to reaper, to work in pidless setups *Jamis Buck*
+
+*   Only wrap request processing with our USR1 signal handler so FastCGI can trap it and raise an exception while waiting for connections. Idle processes exit immediately rather than waiting for another request; active processes gracefully exit when the request is finished.  *Jeremy Kemper*
+
+*   Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587. *Nicholas Seckar*
+
+*   Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT.  #6584 *jchris*
+
+*   Remove temporary crutch to help ApplicationController be unloaded. Closes #6496. *Nicholas Seckar*
+
+*   scaffold_resource generator uses _path named routes and head instead of render :nothing => true.  #6545 *Josh Susser*
+
+*   Generator can show diff on file collision to help you decide whether to skip or overwrite.  #6364 *jeffw, Jeremy Kemper*
+
+*   Generated directories are recursively svn added, like mkdir -p.  #6416 *NeilW*
+
+*   resource and scaffold_resource generators add a restful route to config/routes.rb  *Jeremy Kemper*
+
+*   Revert environment changes for autoload_paths. *Michael Koziarski*
+
+*   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*
+
+*   Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests *Michael Koziarski*
+
+*   Added option to script/process/spawner of specifying the binding address #5133 *Dee Zsombor*
+
+*   Update environment.rb comments to include config.autoload_paths. Closes #6478 *caio*
+
+*   Update scaffold to use new form_tag block functionality.  Closes #6480. *Bob Silva*
+
+*   Plugin generator: check for class collisions.  #4833 *vinbarnes@gmail.com*
+
+*   Mailer generator: handle mailers in modules, set mime_version in unit test.  *Jeremy Kemper*
+
+*   Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. *Michael Koziarski*
+
+*   Added config.plugins to control which plugins are loaded #6269 [Stefan Kaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
+
+        config.plugins = %w[ routing_navigator simply_helpful ]
+
+*   Clean up html on included error pages. *Tim Lucas*
+
+*   Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language *David Heinemeier Hansson*
+
+*   Update to latest Prototype and script.aculo.us trunk versions *Thomas Fuchs*
+
+*   PostgreSQL: db:test:purge closes open database connections first.  #6236 *alex*
+
+*   Fixed test:uncommitted on Windows (backslash issue) #4999 *paul@paulbutcher.com*
+
+*   Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 *Bob Silva*
+
+*   Fixed rename_table on SQLite tables with indexes defined #5942 *brandon@opensoul.org*
+
+*   Added default timeout setting of 5 seconds to SQLite3 database.yml configurations *David Heinemeier Hansson*
+
+*   Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [David Heinemeier Hansson]. Examples:
+
+        ./script/generate model post title:string created_on:date body:text published:boolean
+
+*   Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined *David Heinemeier Hansson*
+
+*   script/runner can run files, pass on arguments, and be used as a shebang.  #6286 *Tuxie, dlpond*
+        #!/usr/bin/env /path/to/my/app/script/runner
+        # Example: just start using your models as if you are in script/console
+        Product.find(:all).each { |product| product.check_inventory }
+
+*   Look for rake tasks in plugin subdirs.  #6259 *obrie*
+
+*   Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb *David Heinemeier Hansson*
+
+*   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
+
+*   session_migration generator adds an index on updated_at.  #6207 *grg*
+
+*   script/server creates the tmp/pids directory.  #6204 *jonathan*
+
+*   Fix script/console --sandbox for internal transactions changes.  #5738 *Chris McGrath, charles.gerungan@gmail.com*
+
+*   Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
+    documented in initializer.rb, the workaround is:
+
+    config.autoload_paths += Dir*RAILS_ROOT + '/app/models/*/'*
+
+    References #6031. *Nicholas Seckar*
+
+*   Update to script.aculo.us 1.6.3 *Thomas Fuchs*
+
+*   Update to Prototype 1.5.0_rc1 *sam*
+
+*   Formally Deprecate the old rake tasks. *Michael Koziarski*
+
+*   Thoroughly test the FCGI dispatcher.  #5970 *Kevin Clark*
+
+*   Remove Dir.chdir in the Webrick DispatchServlet#initialize method.  Fix bad path errors when trying to load config/routes.rb.  *Rick Olson*
+
+*   Tighten rescue clauses.  #5985 *james@grayproductions.net*
+
+*   Cleaning up tests. *Kevin Clark, Jeremy Kemper*
+
+*   Add Dependencies.load_once_paths. *Nicholas Seckar*
+
+*   Updated to script.aculo.us 1.6.2 *Thomas Fuchs*
+
+*   Assign Routing.controller_paths; fix script/about and rails info controller. *Nicholas Seckar*
+
+*   Don't warn dispatcher of Reloadable deprecations. *Nicholas Seckar*
+
+*   Rearrange application resetting and preparation, fix bug with leaking subclasses hash in ActiveRecord::Base *Rick Olson*
+
+    ActiveRecord::Base.reset_subclasses is called before Dependencies are cleared and classes removed.
+    ActiveRecord::Base.instantiate_observers is called during a Dispatcher preparation callback.
+
+*   Add missing mock directories from the autoload_paths configuration.  *Rick Olson*
+
+*   Nested controller scaffolding also nests the generated layout. *iain d broadfoot*
+
+*   Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. *Nicholas Seckar*
+
+*   Add autoload_paths support to Initializer. *Nicholas Seckar*
+
+*   Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  *Rick Olson*
+
+*   Clarify usage of script/plugin source. Closes #5344. *James Adam*
+
+*   Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. *Nicholas Seckar*
+
+*   Tweak the Rails load order so observers are loaded after plugins, and reloaded in development mode. Closed #5279.  *Rick Olson*
+
+*   Added that you can change the web server port in config/lighttpd.conf from script/server --port/-p #5465 *mats@imediatec.co.uk*
+
+*   script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 *Shugo Maeda*
+
+*   Fixed the failsafe response so it uses either the current recognized controller or ApplicationController.  *Rick Olson*
+
+*   Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid. *Jamis Buck*
+
+*   Fix script/plugin about so it uses about.yml and not meta.yml.  *James Adam*
+
+*   Dispatcher processes rescued actions with the same controller that processed the request. #4625 *sd@notso.net*
+
+*   rails -d frontbase to create a new project with a frontbase database.yml. #4945 *mlaster@metavillage.com*
+
+*   Ensure the logger is initialized. #5629 *mike@clarkware.com*
+
+*   Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [David Heinemeier Hansson]. Examples:
+
+        spawner               # starts instances on 8000, 8001, and 8002 using Mongrel if available
+        spawner fcgi          # starts instances on 8000, 8001, and 8002 using FCGI
+        spawner mongrel -i 5  # starts instances on 8000, 8001, 8002, 8003, and 8004 using Mongrel
+        spawner -p 9100 -i 10 # starts 10 instances counting from 9100 to 9109 using Mongrel if available
+        spawner -p 9100 -r 5  # starts 3 instances counting from 9100 to 9102 and attempts start them every 5 seconds
+
+    Also note that script/process/reaper is Mongrel capable. So the combination of spawner and reaper is a built-in alternative to something like mongrel_cluster.
+
+*   Update scaffolding functional tests to use :id => people(:first) instead of :id => 1. #5612 *evan@protest.net*
+
+*   db:test:clone should remove existing tables before reloading the schema. #5607 *sveit@tradeharbor.com*
+
+*   Fixed migration generation for class names like ACLController #5197 *brad@madriska.com*
+
+*   Added show_source_list and show_call_stack to breakpoints to make it easier to get context #5476 [takiuchi@drecom.co.jp]. Examples:
+
+        irb(#<TopController:0x40822a68>):002:0> show_source_list
+        0001  class TopController < ApplicationController
+        0002    def show
+        0003->    breakpoint
+        0004    end
+        0005
+        0006    def index
+        0007    end
+        0008
+        => "/path/to/rails/root/app/controllers/top_controller.rb"
+
+        irb(#<TopController:0x40822a68>):004:0> show_call_stack 3
+        vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
+        vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
+        app/controllers/top_controller.rb:3:in `show'
+        => "/path/to/rails/root/app/controllers/top_controller.rb:3"
+
+*   Generate scaffold layout in subdirectory appropriate to its module nesting. #5511 *nils@alumni.rice.edu*
+
+*   Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 *mike@clarkware.com*
+
+*   Don't assume Active Record is available. #5497 *bob@sporkmonger.com*
+
+*   Mongrel: script/server works on Win32. #5499 *jeremydurham@gmail.com*
+
+*   Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. *Nick Sieger*
+
+*   Mongrel support for script/server.  #5475 *jeremydurham@gmail.com*
+
+*   Fix script/plugin so it doesn't barf on invalid URLs *Rick Olson*
+
+*   Fix plugin install bug at dir with space. (closes #5359) *Yoshimasa NIWA*
+
+*   Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  *Rick Olson*
+
+*   Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal #5003 *takiuchi@drecom.co.jp*
+
+*   Create temporary dirs relative to RAILS_ROOT when running script/server #5014 *elliot@townx.org*
+
+*   Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. *Jamis Buck*
+
+*   Make "script/plugin install" work with svn+ssh URLs. *Sam Stephenson*
+
+*   Added lib/ to the directories that will get application docs generated *David Heinemeier Hansson*
+
+*   Add observer generator. Closes #5167. *François Beausoleil*
+
+*   Session migration generator obeys pluralize_table_names. #5145 *James Adam*
+
+*   rake test:recent understands subdirectories. #2925 *jerrett@bravenet.com*
+
+*   The app generator detects the XAMPP package's MySQL socket location. #3832 *elliot@townx.org*
+
+*   The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 *rcoder, rails-bug@owl.me.uk*
+
+*   Distinguish the spawners for different processes *David Heinemeier Hansson*
+
+*   Added -n/--process to script/process/spawner name the process pid (default is dispatch) *David Heinemeier Hansson*
+
+*   Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) *Julian Tarkhanov*
+
+*   Replace Ruby's deprecated append_features in favor of included. *Marcel Molina Jr.*
+
+*   Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids *David Heinemeier Hansson*
+
+*   Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids *David Heinemeier Hansson*
+
+
+## 1.2.3 (March 12th, 2007) ##
+
+*   Ruby 1.8.6 compatibility
+
+*   Windows: include MinGW in RUBY_PLATFORM check.  #2982 *okkez000@gmail.com, Kaspar Schiess*
+
+*   Stop swallowing errors during rake test *Michael Koziarski*
+
+
+## 1.2.2 (February 5th, 2007) ##
+
+*   Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ *Chad Fowler*
+
+*   Require the dispatcher for Rails::Configuration#to_prepare.  *Rick Olson*
+
+
+## 1.2.1 (January 16th, 2007) ##
+
+*   Updated to Active Record 1.15.1, Action Pack 1.13.1, Action Mailer 1.3.1, Action Web Service 1.2.1
+
+
+## 1.2.0 (January 16th, 2007) ##
+
+*   Update to Prototype 1.5.0. *Sam Stephenson*
+
+*   Generator: use destination path for diff tempfiles.  #7015 *alfeld*
+
+*   Fixed that webrick would strip leading newlines and hang connection #4156 *psross*
+
+*   Ensure plugins are in the Dependencies.load_once_paths collection by default.  *Rick Olson*
+    If you really want your plugins to reload, add this to the very top of init.rb:
+
+        Dependencies.load_once_paths.delete(lib_path)
+
+*   Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file.  Closes #6852 *fearoffish*
+
+*   Fix Webrick Daemon dispatching bug regarding a bad current working directory.  Closes #4899 *Rick Olson*
+
+*   Make config.plugins affect the load path and the dependencies system.  Allows you to control plugin loading order, and keep disabled plugins off the load path. *James Adam*
+
+*   Don't generate a components directory in new Rails apps.  *Jeremy Kemper*
+
+*   Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) *David Heinemeier Hansson*
+
+*   Deprecated the name route "root" as it'll be used as a shortcut for map.connect '' in Rails 2.0 *David Heinemeier Hansson*
+
+*   Fixed that script/server running against Mongrel should tail the proper log regardless of the environment *David Heinemeier Hansson*
+
+*   Update initializer to load Rails::VERSION as soon as possible. Closes #6698. *Nicholas Seckar*
+
+*   Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) *David Heinemeier Hansson*
+
+*   Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available *David Heinemeier Hansson*
+
+*   Update to Prototype and script.aculo.us [5579]. *Sam Stephenson, Thomas Fuchs*
+
+*   Made script/server work with -e and -d when using Mongrel *David Heinemeier Hansson*
+
+*   Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action *Tobias Lütke*
+
+*   Rails::VERSION::STRING should always be available without having to require 'rails/version'.  #6244 *fearoffish*
+
+*   Add grep-based fallback to reaper, to work in pidless setups *Jamis Buck*
+
+*   Only wrap request processing with our USR1 signal handler so FastCGI can trap it and raise an exception while waiting for connections. Idle processes exit immediately rather than waiting for another request; active processes gracefully exit when the request is finished.  *Jeremy Kemper*
+
+*   Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587. *Nicholas Seckar*
+
+*   Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT.  #6584 *jchris*
+
+*   scaffold_resource generator uses _path named routes and head instead of render :nothing => true.  #6545 *Josh Susser*
+
+*   Generator can show diff on file collision to help you decide whether to skip or overwrite.  #6364 *jeffw, Jeremy Kemper*
+
+*   Generated directories are recursively svn added, like mkdir -p.  #6416 *NeilW*
+
+*   resource and scaffold_resource generators add a restful route to config/routes.rb  *Jeremy Kemper*
+
+*   Revert environment changes for autoload_paths. *Michael Koziarski*
+
+*   Clean up the output of rake stats,  de-emphasise components and apis, and remove the indents for tests *Michael Koziarski*
+
+*   Added option to script/process/spawner of specifying the binding address #5133 *Dee Zsombor*
+
+*   Update environment.rb comments to include config.autoload_paths. Closes #6478 *caio*
+
+*   Update scaffold to use new form_tag block functionality.  Closes #6480. *Bob Silva*
+
+*   Plugin generator: check for class collisions.  #4833 *vinbarnes@gmail.com*
+
+*   Mailer generator: handle mailers in modules, set mime_version in unit test.  *Jeremy Kemper*
+
+*   Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. *Michael Koziarski*
+
+*   Added config.plugins to control which plugins are loaded #6269 [Stefan Kaes]. By default, everything in vendor/plugins will be loaded, but if you specify config.plugins, only those will be loaded. Example:
+
+        config.plugins = %w[ routing_navigator simply_helpful ]
+
+*   Clean up html on included error pages. *Tim Lucas*
+
+*   Fixed default 404.html and 500.htmls to remove extreme ugliness and include human language *David Heinemeier Hansson*
+
+*   Update to latest Prototype and script.aculo.us trunk versions *Thomas Fuchs*
+
+*   PostgreSQL: db:test:purge closes open database connections first.  #6236 *alex*
+
+*   Fixed test:uncommitted on Windows (backslash issue) #4999 *paul@paulbutcher.com*
+
+*   Fixed migration creation to work with namespaced models, so script/generate model Gallery::Image will use create_table :gallery_images #6327 *Bob Silva*
+
+*   Fixed rename_table on SQLite tables with indexes defined #5942 *brandon@opensoul.org*
+
+*   Added default timeout setting of 5 seconds to SQLite3 database.yml configurations *David Heinemeier Hansson*
+
+*   Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [David Heinemeier Hansson]. Examples:
+
+        ./script/generate model post title:string created_on:date body:text published:boolean
+
+*   Added script/generate resource which works just like scaffold_resource, but creates empty placeholders instead of predefined *David Heinemeier Hansson*
+
+*   script/runner can run files, pass on arguments, and be used as a shebang.  #6286 *Tuxie, dlpond*
+        #!/usr/bin/env /path/to/my/app/script/runner
+        # Example: just start using your models as if you are in script/console
+        Product.find(:all).each { |product| product.check_inventory }
+
+*   Look for rake tasks in plugin subdirs.  #6259 *obrie*
+
+*   Added map.connect ':controller/:action/:id.:format' as a default route to config/routes.rb *David Heinemeier Hansson*
+
+*   session_migration generator adds an index on updated_at.  #6207 *grg*
+
+*   script/server creates the tmp/pids directory.  #6204 *jonathan*
+
+*   Fix script/console --sandbox for internal transactions changes.  #5738 *Chris McGrath, charles.gerungan@gmail.com*
+
+*   Remove the uncanny default of adding all app/models/*/ directories to the load path. This change will break application which expect the current behavior. As
+    documented in initializer.rb, the workaround is:
+
+    config.autoload_paths += Dir*RAILS_ROOT + '/app/models/*/'*
+
+    References #6031. *Nicholas Seckar*
+
+*   Update to script.aculo.us 1.6.3 *Thomas Fuchs*
+
+*   Formally Deprecate the old rake tasks. *Michael Koziarski*
+
+*   Thoroughly test the FCGI dispatcher.  #5970 *Kevin Clark*
+
+*   Remove Dir.chdir in the Webrick DispatchServlet#initialize method.  Fix bad path errors when trying to load config/routes.rb.  *Rick Olson*
+
+*   Tighten rescue clauses.  #5985 *james@grayproductions.net*
+
+*   Cleaning up tests. *Kevin Clark, Jeremy Kemper*
+
+*   Add Dependencies.load_once_paths. *Nicholas Seckar*
+
+*   Assign Routing.controller_paths; fix script/about and rails info controller. *Nicholas Seckar*
+
+*   Don't warn dispatcher of Reloadable deprecations. *Nicholas Seckar*
+
+*   Rearrange application resetting and preparation, fix bug with leaking subclasses hash in ActiveRecord::Base *Rick Olson*
+
+    ActiveRecord::Base.reset_subclasses is called before Dependencies are cleared and classes removed.
+    ActiveRecord::Base.instantiate_observers is called during a Dispatcher preparation callback.
+
+*   Add missing mock directories from the autoload_paths configuration.  *Rick Olson*
+
+*   Nested controller scaffolding also nests the generated layout. *iain d broadfoot*
+
+*   Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. *Nicholas Seckar*
+
+*   Add autoload_paths support to Initializer. *Nicholas Seckar*
+
+*   Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743.  *Rick Olson*
+
+*   Clarify usage of script/plugin source. Closes #5344. *James Adam*
+
+*   Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. *Nicholas Seckar*
+
+*   Tweak the Rails load order so observers are loaded after plugins, and reloaded in development mode. Closed #5279.  *Rick Olson*
+
+*   Added that you can change the web server port in config/lighttpd.conf from script/server --port/-p #5465 *mats@imediatec.co.uk*
+
+*   script/performance/profiler compatibility with the new ruby-prof, including an option to choose the results printer.  #5679 *Shugo Maeda*
+
+*   Fixed the failsafe response so it uses either the current recognized controller or ApplicationController.  *Rick Olson*
+
+*   Make sure script/reaper only reaps dispatcher pids by default, and not the spawner's pid. *Jamis Buck*
+
+*   Fix script/plugin about so it uses about.yml and not meta.yml.  *James Adam*
+
+*   Dispatcher processes rescued actions with the same controller that processed the request. #4625 *sd@notso.net*
+
+*   rails -d frontbase to create a new project with a frontbase database.yml. #4945 *mlaster@metavillage.com*
+
+*   Ensure the logger is initialized. #5629 *mike@clarkware.com*
+
+*   Added Mongrel-spawning capabilities to script/process/spawner. Mongrel will be the default choice if installed, otherwise FCGI is tried [David Heinemeier Hansson]. Examples:
+
+        spawner               # starts instances on 8000, 8001, and 8002 using Mongrel if available
+        spawner fcgi          # starts instances on 8000, 8001, and 8002 using FCGI
+        spawner mongrel -i 5  # starts instances on 8000, 8001, 8002, 8003, and 8004 using Mongrel
+        spawner -p 9100 -i 10 # starts 10 instances counting from 9100 to 9109 using Mongrel if available
+        spawner -p 9100 -r 5  # starts 3 instances counting from 9100 to 9102 and attempts start them every 5 seconds
+
+    Also note that script/process/reaper is Mongrel capable. So the combination of spawner and reaper is a built-in alternative to something like mongrel_cluster.
+
+*   Update scaffolding functional tests to use :id => people(:first) instead of :id => 1. #5612 *evan@protest.net*
+
+*   db:test:clone should remove existing tables before reloading the schema. #5607 *sveit@tradeharbor.com*
+
+*   Fixed migration generation for class names like ACLController #5197 *brad@madriska.com*
+
+*   Added show_source_list and show_call_stack to breakpoints to make it easier to get context #5476 [takiuchi@drecom.co.jp]. Examples:
+
+        irb(#<TopController:0x40822a68>):002:0> show_source_list
+        0001  class TopController < ApplicationController
+        0002    def show
+        0003->    breakpoint
+        0004    end
+        0005
+        0006    def index
+        0007    end
+        0008
+        => "/path/to/rails/root/app/controllers/top_controller.rb"
+
+        irb(#<TopController:0x40822a68>):004:0> show_call_stack 3
+        vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
+        vendor/rails/railties/lib/breakpoint.rb:536:in `breakpoint'
+        app/controllers/top_controller.rb:3:in `show'
+        => "/path/to/rails/root/app/controllers/top_controller.rb:3"
+
+*   Generate scaffold layout in subdirectory appropriate to its module nesting. #5511 *nils@alumni.rice.edu*
+
+*   Mongrel: script/server tails the rails log like it does with lighttpd. Prefer mongrel over lighttpd. #5541 *mike@clarkware.com*
+
+*   Don't assume Active Record is available. #5497 *bob@sporkmonger.com*
+
+*   Mongrel: script/server works on Win32. #5499 *jeremydurham@gmail.com*
+
+*   Remove opts.on { |options[:option_name] } style hash assignment. Closes #4440. *Nick Sieger*
+
+*   Mongrel support for script/server.  #5475 *jeremydurham@gmail.com*
+
+*   Fix script/plugin so it doesn't barf on invalid URLs *Rick Olson*
+
+*   Fix plugin install bug at dir with space. (closes #5359) *Yoshimasa NIWA*
+
+*   Fix bug with 'script/plugin install' so it reports unknown plugin names correctly.  *Rick Olson*
+
+*   Added uninstall.rb hook to plugin handling, such that plugins have a way of removing assets and other artifacts on removal #5003 *takiuchi@drecom.co.jp*
+
+*   Create temporary dirs relative to RAILS_ROOT when running script/server #5014 *elliot@townx.org*
+
+*   Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. *Jamis Buck*
+
+*   Make "script/plugin install" work with svn+ssh URLs. *Sam Stephenson*
+
+*   Added lib/ to the directories that will get application docs generated *David Heinemeier Hansson*
+
+*   Add observer generator. Closes #5167. *François Beausoleil*
+
+*   Session migration generator obeys pluralize_table_names. #5145 *James Adam*
+
+*   rake test:recent understands subdirectories. #2925 *jerrett@bravenet.com*
+
+*   The app generator detects the XAMPP package's MySQL socket location. #3832 *elliot@townx.org*
+
+*   The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 *rcoder, rails-bug@owl.me.uk*
+
+*   Distinguish the spawners for different processes *David Heinemeier Hansson*
+
+*   Added -n/--process to script/process/spawner name the process pid (default is dispatch) *David Heinemeier Hansson*
+
+*   Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) *Julian Tarkhanov*
+
+*   Replace Ruby's deprecated append_features in favor of included. *Marcel Molina Jr.*
+
+*   Added script/process/inspector to do simple process status information on Rails dispatchers keeping pid files in tmp/pids *David Heinemeier Hansson*
+
+*   Added pid file usage to script/process/spawner and script/process/reaper along with a directive in default config/lighttpd.conf file to record the pid. They will all save their pid file in tmp/pids *David Heinemeier Hansson*
+
+
+## 1.1.6 (August 10th, 2006) ##
+
+*   Additional security patch
+
+
+## 1.1.5 (August 8th, 2006) ##
+
+*   Mention in docs that config.frameworks doesn't work when getting Rails via Gems.  #4857 *Alisdair McDiarmid*
+
+*   Change the scaffolding layout to use yield rather than @content_for_layout. *Marcel Molina Jr.*
+
+*   Includes critical security patch
+
+
+## 1.1.4 (June 29th, 2006) ##
+
+*   Remove use of opts.on { |options[:name] } style hash assignment. References #4440. *headius@headius.com*
+
+*   Updated to Action Pack 1.12.3, ActionWebService 1.1.4, ActionMailer 1.2.3
+
+
+## 1.1.3 (June 27th, 2006) ##
+
+*   Updated to Active Record 1.14.3, Action Pack 1.12.2, ActionWebService 1.1.3, ActionMailer 1.2.2
+
+
+## 1.1.2 (April 9th, 2006) ##
+
+*   Mention in docs that config.frameworks doesn't work when getting Rails via Gems. Closes #4857. *Alisdair McDiarmid*
+
+*   Change the scaffolding layout to use yield rather than @content_for_layout. *Marcel Molina Jr.*
+
+*   Added rake rails:update:configs to update config/boot.rb from the latest (also included in rake rails:update) *David Heinemeier Hansson*
+
+*   Fixed that boot.rb would set RAILS_GEM_VERSION twice, not respect an uncommented RAILS_GEM_VERSION line, and not use require_gem *David Heinemeier Hansson*
+
+
+## 1.1.1 (April 6th, 2006) ##
+
+*   Enhances plugin#discover allowing it to discover svn:// like URIs (closes #4565) *ruben.nine@gmail.com*
+
+*   Update to Prototype 1.5.0_rc0 *Sam Stephenson*
+
+*   Fixed that the -r/--ruby path option of the rails command was not being respected #4549 *ryan.raaum@gmail.com*
+
+*   Added that Dispatcher exceptions should not be shown to the user unless a default log has not been configured. Instead show public/500.html *David Heinemeier Hansson*
+
+*   Fixed that rake clone_structure_to_test should quit on pgsql if the dump is unsuccesful #4585 *augustz@augustz.com*
+
+*   Fixed that rails --version should have the return code of 0 (success) #4560 *blair@orcaware.com*
+
+*   Install alias so Rails::InfoController is accessible at /rails_info. Closes #4546. *Nicholas Seckar*
+
+*   Fixed that spawner should daemonize if running in repeat mode *David Heinemeier Hansson*
+
+*   Added TAG option for rake rails:freeze:edge, so you can say rake rails:freeze:edge TAG=rel_1-1-0 to lock to the 1.1.0 release *David Heinemeier Hansson*
+
+*   Applied Prototype $() performance patches (#4465, #4477) and updated script.aculo.us *Sam Stephenson, Thomas Fuchs*
+
+*   Use --simple-prompt instead of --prompt-mode simple for console compatibility with Windows/Ruby 1.8.2 #4532 *starr@starrnhorne.com*
+
+*   Make Rails::VERSION implicitly loadable #4491. *Nicholas Seckar*
+
+*   Fixed rake rails:freeze:gems #4518 *benji@silverinsanity.com*
+
+*   Added -f/--freeze option to rails command for freezing the application to the Rails version it was generated with *David Heinemeier Hansson*
+
+*   Added gem binding of apps generated through the rails command to the gems of they were generated with *Nicholas Seckar*
+
+*   Added expiration settings for JavaScript, CSS, HTML, and images to default lighttpd.conf *David Heinemeier Hansson*
+
+*   Added gzip compression for JavaScript, CSS, and HTML to default lighttpd.conf *David Heinemeier Hansson*
+
+*   Avoid passing escapeHTML non-string in Rails' info controller *Nicholas Seckar*
+
+
+## 1.1.0 (March 27th, 2006) ##
+
+*   Allow db:fixtures:load to load a subset of the applications fixtures. *Chad Fowler*
+
+    ex.
+
+     rake db:fixtures:load FIXTURES=customers,plans
+
+*   Update to Prototype 1.5.0_pre1 *Sam Stephenson*
+
+*   Update to script.aculo.us 1.6 *Thomas Fuchs*
+
+*   Add an integration_test generator *Jamis Buck*
+
+*   Make all ActionView helpers available in the console from the helper method for debugging purposes. n.b.: Only an 80% solution. Some stuff won't work, most will. *Marcel Molina Jr.*
+
+    ex.
+
+        >> puts helper.options_for_select([%w(a 1), %w(b 2), %w(c 3)])
+        <option value="1">a</option>
+        <option value="2">b</option>
+        <option value="3">c</option>
+        => nil
+
+*   Replaced old session rake tasks with db:sessions:create to generate a migration, and db:sessions:clear to remove sessions. *Rick Olson*
+
+*   Reject Ruby 1.8.3 when loading Rails; extract version checking code. *Chad Fowler*
+
+*   Remove explicit loading of RailsInfo and RailsInfoController. *Nicholas Seckar*
+
+*   Move RailsInfo and RailsInfoController to Rails::Info and Rails::InfoController. *Nicholas Seckar*
+
+*   Extend load path with Railties' builtin directory to make adding support code easy. *Nicholas Seckar*
+
+*   Fix the rails_info controller by explicitly loading it, and marking it as not reloadable. *Nicholas Seckar*
+
+*   Fixed rails:freeze:gems for Windows #3274 *paul@paulbutcher.com*
+
+*   Added 'port open?' check to the spawner when running in repeat mode so we don't needlessly boot the dispatcher if the port is already in use anyway #4089 *guy.naor@famundo.com*
+
+*   Add verification to generated scaffolds,  don't allow get for unsafe actions *Michael Koziarski*
+
+*   Don't replace application.js in public/javascripts if it already exists *Cody Fauser*
+
+*   Change test:uncommitted to delay execution of `svn status` by using internal Rake API's. *Nicholas Seckar*
+
+*   Use require_library_or_gem to load rake in commands/server.rb.  Closes #4205.  *rob.rasmussen@gmail.com*
+
+*   Use the Rake API instead of shelling out to create the tmp directory in commands/server.rb. *Chad Fowler*
+
+*   Added a backtrace to the evil WSOD (White Screen of Death).  Closes #4073. TODO: Clearer exceptions *Rick Olson*
+
+*   Added tracking of database and framework versions in script/about #4088 *charles.gerungan@gmail.com/Rick Olson*
+
+*   Added public/javascripts/application.js as a sample since it'll automatically be included in javascript_include_tag :defaults *David Heinemeier Hansson*
+
+*   Added socket cleanup for lighttpd, both before and after *David Heinemeier Hansson*
+
+*   Added automatic creation of tmp/ when running script/server *David Heinemeier Hansson*
+
+*   Added silence_stream that'll work on both STDERR or STDOUT or any other stream and deprecated silence_stderr in the process *David Heinemeier Hansson*
+
+*   Added reload! method to script/console to reload all models and others that include Reloadable without quitting the console #4056 *esad@esse.at*
+
+*   Added that rake rails:freeze:edge will now just export all the contents of the frameworks instead of just lib, so stuff like rails:update:scripts, rails:update:javascripts, and script/server on lighttpd still just works #4047 *David Heinemeier Hansson*
+
+*   Added fix for upload problems with lighttpd from Safari/IE to config/lighttpd.conf #3999 *Thijs van der Vossen*
+
+*   Added test:uncommitted to test changes since last checkin to Subversion #4035 *technomancy@gmail.com*
+
+*   Help script/about print the correct svn revision when in a non-English locale.  #4026 *babie7a0@ybb.ne.jp*
+
+*   Add 'app' accessor to script/console as an instance of Integration::Session *Jamis Buck*
+
+*   Generator::Base#usage takes an optional message argument which defaults to Generator::Base#usage_message. *Jeremy Kemper*
+
+*   Remove the extraneous AR::Base.threaded_connections setting from the webrick server. *Jeremy Kemper*
+
+*   Add integration test support to app generation and testing *Jamis Buck*
+
+*   Added namespaces to all tasks, so for example load_fixtures is now db:fixtures:load. All the old task names are still valid, they just point to the new namespaced names. "rake -T" will only show the namespaced ones, though *David Heinemeier Hansson*
+
+*   CHANGED DEFAULT: ActiveRecord::Base.schema_format is now :ruby by default instead of :sql. This means that we'll assume you want to live in the world of db/schema.rb where the grass is green and the girls are pretty. If your schema contains un-dumpable elements, such as constraints or database-specific column types, you just got an invitation to either 1) patch the dumper to include foreign key support, 2) stop being db specific, or 3) just change the default in config/environment.rb to config.active_record.schema_format = :sql -- we even include an example for that on new Rails skeletons now. Brought to you by the federation of opinionated framework builders! *David Heinemeier Hansson*
+
+*   Added -r/--repeat option to script/process/spawner that offers the same loop protection as the spinner did. This deprecates the script/process/spinner, so it's no longer included in the default Rails skeleton, but still available for backwards compatibility #3461 *ror@andreas-s.net*
+
+*   Added collision option to template generation in generators #3329 [anna@wota.jp]. Examples:
+
+        m.template "stuff.config" , "config/stuff.config" , :collision => :skip
+        m.template "auto-stamping", "config/generator.log", :collision => :force
+
+*   Added more information to script/plugin's doings to ease debugging #3755 *Rick Olson*
+
+*   Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets *David Heinemeier Hansson*
+
+*   Added a default configuration of the FileStore for fragment caching if tmp/cache is available, which makes action/fragment caching ready to use out of the box with no additional configuration *David Heinemeier Hansson*
+
+*   Changed the default session configuration to place sessions in tmp/sessions, if that directory is available, instead of /tmp (this essentially means a goodbye to 9/10 White Screen of Death errors and should have web hosting firms around the world cheering) *David Heinemeier Hansson*
+
+*   Added tmp/sessions, tmp/cache, and tmp/sockets as default directories in the Rails skeleton *David Heinemeier Hansson*
+
+*   Added that script/generate model will now automatically create a migration file for the model created. This can be turned off by calling the generator with --skip-migration *David Heinemeier Hansson*
+
+*   Added -d/--database option to the rails command, so you can do "rails --database=sqlite2 myapp" to start a new application preconfigured to use SQLite2 as the database. Removed the configuration examples from SQLite and PostgreSQL from the default MySQL configuration *David Heinemeier Hansson*
+
+*   Allow script/server -c /path/to/lighttpd.conf *Jeremy Kemper*
+
+*   Remove hardcoded path to reaper script in script/server *Jeremy Kemper*
+
+*   Update script.aculo.us to V1.5.3 *Thomas Fuchs*
+
+*   Added SIGTRAP signal handler to RailsFCGIHandler that'll force the process into a breakpoint after the next request. This breakpoint can then be caught with script/breakpointer and give you access to the Ruby image inside that process. Useful for debugging memory leaks among other things *David Heinemeier Hansson*
+
+*   Changed default lighttpd.conf to use CWD from lighttpd 1.4.10 that allows the same configuration to be used for both detach and not. Also ensured that auto-repeaping of FCGIs only happens when lighttpd is not detached. *David Heinemeier Hansson*
+
+*   Added Configuration#after_initialize for registering a block which gets called after the framework is fully initialized.  Useful for things like per-environment configuration of plugins. *Michael Koziarski*
+
+*   Added check for RAILS_FRAMEWORK_ROOT constant that allows the Rails framework to be found in a different place than vendor/rails. Should be set in boot.rb. *David Heinemeier Hansson*
+
+*   Fixed that static requests could unlock the mutex guarding dynamic requests in the WEBrick servlet #3433 *tom@craz8.com*
+
+*   Fixed documentation tasks to work with Rake 0.7.0 #3563 *kazuhiko@fdiary.net*
+
+*   Update to Prototype 1.5.0_pre0 *Sam Stephenson*
+
+*   Sort the list of plugins so we load in a consistent order *Rick Olson*
+
+*   Show usage when script/plugin is called without arguments *tom@craz8.com*
+
+*   Corrected problems with plugin loader where plugins set 'name' incorrectly #3297 *anna@wota.jp*
+
+*   Make migration generator only report on exact duplicate names, not partial dupliate names. #3442 *jeremy@planetargon.com Marcel Molina Jr.*
+
+*   Fix typo in mailer generator USAGE. #3458 *chriztian.steinmeier@gmail.com*
+
+*   Ignore version mismatch between pg_dump and the database server. #3457 *Simon Stapleton*
+
+*   Reap FCGI processes after lighttpd exits. *Sam Stephenson*
+
+*   Honor ActiveRecord::Base.pluralize_table_names when creating and destroying session store table. #3204. *rails@bencurtis.com, Marcel Molina Jr.*
+
+## 1.0.0 (December 13th, 2005) ##
+
+*   Update instructions on how to find and install generators. #3172. *Chad Fowler*
+
+*   Generator looks in vendor/generators also.  *Chad Fowler*
+
+*   Generator copies files in binary mode.  #3156 *minimudboy@gmail.com*
+
+*   Add builtin/ to the gemspec. Closes #3047. *Nicholas Seckar, Sam Stephenson*
+
+*   Add install.rb file to plugin generation which is loaded, if it exists, when you install a plugin. *Marcel Molina Jr.*
+
+*   Run initialize_logger in script/lighttpd to ensure the log file exists before tailing it. *Sam Stephenson*
+
+*   Make load_fixtures include csv fixtures. #3053. *me@mdaines.com*
+
+*   Fix freeze_gems so that the latest rails version is dumped by default. *Nicholas Seckar*
+
+*   script/plugin: handle root paths and plugin names which contain spaces.  #2995 *justin@aspect.net*
+
+*   Model generator: correct relative path to test_helper in unit test.  *Jeremy Kemper*
+
+*   Make the db_schema_dump task honor the SCHEMA environment variable if present the way db_schema_import does. #2931. *Blair Zajac*
+
+*   Have the lighttpd server script report the actual ip to which the server is bound. #2903. *Adam*
+
+*   Add plugin library directories to the load path after the lib directory so that libraries in the lib directory get precedence. #2910. *James Adam*
+
+*   Make help for the console command more explicit about how to specify the desired environment in which to run the console. #2911. *anonymous*
+
+*   PostgreSQL: the purge_test_database Rake task shouldn't explicitly specify the template0 template when creating a fresh test database.  #2964 *Dreamer3*
+
+*   Introducing the session_migration generator.  Creates an add_session_table migration.  Allows generator to specify migrations directory.  #2958, #2960 *Rick Olson*
+
+*   script/console uses RAILS_ENV environment variable if present.  #2932 [Blair Zajac <blair@orcaware.com>
+
+*   Windows: eliminate the socket option in database.yml.  #2924 *Wayne Vucenic <waynev@gmail.com>*
+
+*   Eliminate nil from newly generated logfiles.  #2927 *Blair Zajac <blair@orcaware.com>*
+
+*   Rename Version constant to VERSION. #2802 *Marcel Molina Jr.*
+
+*   Eliminate Subversion dependencies in scripts/plugin.  Correct install options.  Introduce --force option to reinstall a plugin.  Remove useless --long option for list.  Use --quiet to quiet the download output and --revision to update to a specific svn revision.  #2842 *Chad Fowler, Rick Olson*
+
+*   SQLite: the clone_structure_to_test and purge_test_database Rake tasks should always use the test environment.  #2846 *Rick Olson*
+
+*   Make sure that legacy db tasks also reference :database for SQLite #2830 *kazuhiko@fdiary.net*
+
+*   Pass __FILE__ when evaluating plugins' init.rb.  #2817 *James Adam*
+
+*   Better svn status matching for generators.  #2814 *François Beausoleil <francois.beausoleil@gmail.com>, Blair Zajac <blair@orcaware.com>*
+
+*   Don't reload routes until plugins have been loaded so they have a chance to extend the routing capabilities *David Heinemeier Hansson*
+
+*   Don't detach or fork for script/server tailing *Nicholas Seckar*
+
+*   Changed all script/* to use #!/usr/bin/env ruby instead of hard-coded Ruby path. public/dispatcher.* still uses the hard-coded path  for compatibility with web servers that don't have Ruby in path *David Heinemeier Hansson*
+
+*   Force RAILS_ENV to be "test" when running tests, so that ENV["RAILS_ENV"] = "production" in config/environment.rb doesn't wreck havok [David Heinemeier Hansson] #2660
+
+*   Correct versioning in :freeze_gems Rake task.  #2778 *Jakob Skjerning, Jeremy Kemper*
+
+*   Added an omnipresent RailsInfoController with a properties action that delivers an HTML rendering of Rails::Info (but only when local_request? is true). Added a new default index.html which fetches this with Ajax. *Sam Stephenson*
+
+
+## 0.14.3 (RC4) (November 7th, 2005) ##
+
+##  Add 'add_new_scripts' rake task for adding new rails scripts to script/ Jamis Buck ##
+
+*   Remove bogus hyphen from script/process/reaper calls to 'ps'.  #2767 *anonymous*
+
+*   Copy lighttpd.conf when it is first needed, instead of on app creation *Jamis Buck*
+
+*   Use require_library_or_gem 'fcgi' in script/server *Sam Stephenson*
+
+*   Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/server (works like script/server, but using lighttpd and FastCGI). It will use lighttpd if available, otherwise WEBrick. You can force either or using 'script/server lighttpd' or 'script/server webrick' *David Heinemeier Hansson*
+
+*   New configuration option config.plugin_paths which may be a single path like the default 'vendor/plugins' or an array of paths: ['vendor/plugins', 'lib/plugins'].  *Jeremy Kemper*
+
+*   Plugins are discovered in nested paths, so you can organize your plugins directory as you like.  *Jeremy Kemper*
+
+*   Refactor load_plugin from load_plugins.  #2757 *alex.r.moon@gmail.com*
+
+*   Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info *Sam Stephenson*
+
+*   Enable HTTP installation of plugins when svn isn't avaialable. Closes #2661. *Chad Fowler*
+
+*   Added script/about to display formatted Rails::Info output *Sam Stephenson*
+
+*   Added Rails::Info to catalog assorted information about a Rails application's environment *Sam Stephenson*
+
+*   Tail the logfile when running script/server lighttpd in the foreground *Sam Stephenson*
+
+*   Try to guess the port number from config/lighttpd.conf in script/server lighttpd *Sam Stephenson*
+
+*   Don't reap spawn-fcgi.  #2727 *matthew@walker.wattle.id.au*
+
+*   Reaper knows how to find processes even if the dispatch path is very long.  #2711 *matthew@walker.wattle.id.au*
+
+*   Make fcgi handler respond to TERM signals with an explicit exit *Jamis Buck*
+
+*   Added demonstration of fixture use to the test case generated by the model generator *David Heinemeier Hansson*
+
+*   If specified, pass PostgreSQL client character encoding to createdb.  #2703 *Kazuhiko <kazuhiko@fdiary.net>*
+
+*   Catch CGI multipart parse errors.  Wrap dispatcher internals in a failsafe response handler.  *Jeremy Kemper*
+
+*   The freeze_gems Rake task accepts the VERSION environment variable to decide which version of Rails to pull into vendor/rails.  *Chad Fowler, Jeremy Kemper*
+
+*   Removed script.aculo.us.js, builder.js and slider.js (preperation for move of scriptaculous extensions to plugins, core scriptaculous will remain in Railties) *Thomas Fuchs*
+
+*   The freeze_edge Rake task does smarter svn detection and can export a specific revision by passing the REVISION environment variable.  For example: rake freeze_edge REVISION=1234.  #2663 *Rick Olson*
+
+*   Comment database.yml and include PostgreSQL and SQLite examples.  *Jeremy Kemper*
+
+*   Improve script/plugin on Windows.  #2646 *Chad Fowler*
+
+*   The *_plugindoc Rake tasks look deeper into the plugins' lib directories.  #2652 *bellis@deepthought.org*
+
+*   The PostgreSQL :db_structure_dump Rake task limits its dump to the schema search path in database.yml.  *Anatol Pomozov <anatol.pomozov@gmail.com>*
+
+*   Add task to generate rdoc for all installed plugins. *Marcel Molina Jr.*
+
+*   Update script.aculo.us to V1.5_rc4 *Thomas Fuchs*
+
+*   Add default Mac + DarwinPorts MySQL socket locations to the app generator.  *Jeremy Kemper*
+
+*   Migrations may be destroyed: script/destroy migration foo.  #2635 *Charles M. Gerungan <charles.gerungan@gmail.com>, Jamis Buck, Jeremy Kemper*
+
+*   Added that plugins can carry generators and that generator stub files can be created along with new plugins using script/generate plugin <name> --with-generator *David Heinemeier Hansson*
+
+*   Removed app/apis as a default empty dir since its automatically created when using script/generate web_service *David Heinemeier Hansson*
+
+*   Added script/plugin to manage plugins (install, remove, list, etc) *Ryan Tomayko*
+
+*   Added test_plugins task: Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name) *David Heinemeier Hansson*
+
+*   Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) *David Heinemeier Hansson*
+
+*   Fixed scaffold generator when started with only 1 parameter #2609 *self@mattmower.com*
+
+*   rake should run functional tests even if the unit tests have failures *Jim Weirich*
+
+*   Back off cleanpath to be symlink friendly. Closes #2533 *Nicholas Seckar*
+
+*   Load rake task files in alphabetical order so you can build dependencies and count on them #2554 *Blair Zajac*
+
+
+## 0.14.2 (RC3) (October 26th, 2005) ##
+
+*   Constants set in the development/test/production environment file are set in Object
+
+*   Scaffold generator pays attention to the controller name.  #2562 *self@mattmower.com*
+
+*   Include tasks from vendor/plugins/*/tasks in the Rakefile #2545 *Rick Olson*
+
+
+## 0.14.1 (RC2) (October 19th, 2005) ##
+
+*   Don't clean RAILS_ROOT on windows
+
+*   Remove trailing '/' from RAILS_ROOT *Nicholas Seckar*
+
+*   Upgraded to Active Record 1.12.1 and Action Pack 1.10.1
+
+
+## 0.14.0 (RC1) (October 16th, 2005) ##
+
+*   Moved generator folder from RAILS_ROOT/generators to RAILS_ROOT/lib/generators *Tobias Lütke*
+
+*   Fix rake dev and related commands *Nicholas Seckar*
+
+*   The rails command tries to deduce your MySQL socket by running `mysql_config
+    --socket`.  If it fails, default to /path/to/your/mysql.sock
+
+*   Made the rails command use the application name for database names in the tailored database.yml file. Example: "rails ~/projects/blog" will use "blog_development" instead of "rails_development". *Florian Weber*
+
+*   Added Rails framework freezing tasks: freeze_gems (freeze to current gems), freeze_edge (freeze to Rails SVN trunk), unfreeze_rails (float with newest gems on system)
+
+*   Added update_javascripts task which will fetch all the latest js files from your current rails install. Use after updating rails. *Tobias Lütke*
+
+*   Added cleaning of RAILS_ROOT to useless elements such as '../non-dot-dot/'. Provides cleaner backtraces and error messages. *Nicholas Seckar*
+
+*   Made the instantiated/transactional fixtures settings be controlled through Rails::Initializer. Transactional and non-instantiated fixtures are default from now on. *Florian Weber*
+
+*   Support using different database adapters for development and test with ActiveRecord::Base.schema_format = :ruby *Sam Stephenson*
+
+*   Make webrick work with session(:off)
+
+*   Add --version, -v option to the Rails command. Closes #1840. *stancell*
+
+*   Update Prototype to V1.4.0_pre11, script.aculo.us to V1.5_rc3 [2504] and fix the rails generator to include the new .js files *Thomas Fuchs*
+
+*   Make the generator skip a file if it already exists and is identical to the new file.
+
+*   Add experimental plugin support #2335
+
+*   Made Rakefile aware of new .js files in script.aculo.us *Thomas Fuchs*
+
+*   Make table_name and controller_name in generators honor AR::Base.pluralize_table_names. #1216 #2213 *kazuhiko@fdiary.net*
+
+*   Clearly label functional and unit tests in rake stats output.  #2297 *lasse.koskela@gmail.com*
+
+*   Make the migration generator only check files ending in *.rb when calculating the next file name #2317 *Chad Fowler*
+
+*   Added prevention of duplicate migrations from the generator #2240 *François Beausoleil*
+
+*   Add db_schema_dump and db_schema_import rake tasks to work with the new ActiveRecord::SchemaDumper (for dumping a schema to and reading a schema from a ruby file).
+
+*   Reformed all the config/environments/* files to conform to the new Rails::Configuration approach. Fully backwards compatible.
+
+*   Added create_sessions_table, drop_sessions_table, and purge_sessions_table as rake tasks for databases that supports migrations (MySQL, PostgreSQL, SQLite) to get a table for use with CGI::Session::ActiveRecordStore
+
+*   Added dump of schema version to the db_structure_dump task for databases that support migrations #1835 *Rick Olson*
+
+*   Fixed script/profiler for Ruby 1.8.2 #1863 *Rick Olson*
+
+*   Fixed clone_structure_to_test task for SQLite #1864 *jon@burningbush.us*
+
+*   Added -m/--mime-types option to the WEBrick server, so you can specify a Apache-style mime.types file to load #2059 *ask@develooper.com*
+
+*   Added -c/--svn option to the generator that'll add new files and remove destroyed files using svn add/revert/remove as appropriate #2064 *Kevin Clark*
+
+*   Added -c/--charset option to WEBrick server, so you can specify a default charset (which without changes is UTF-8) #2084 *wejn@box.cz*
+
+*   Make the default stats task extendable by modifying the STATS_DIRECTORIES constant
+
+*   Allow the selected environment to define RAILS_DEFAULT_LOGGER, and have Rails::Initializer use it if it exists.
+
+*   Moved all the shared tasks from Rakefile into Rails, so that the Rakefile is empty and doesn't require updating.
+
+*   Added Rails::Initializer and Rails::Configuration to abstract all of the common setup out of config/environment.rb (uses config/boot.rb to bootstrap the initializer and paths)
+
+*   Fixed the scaffold generator to fail right away if the database isn't accessible instead of in mid-air #1169 *Chad Fowler*
+
+*   Corrected project-local generator location in scripts.rb #2010 *Michael Schuerig*
+
+*   Don't require the environment just to clear the logs #2093 *Scott Barron*
+
+*   Make the default rakefile read *.rake files from config/tasks (for easy extension of the rakefile by e.g. generators)
+
+*   Only load breakpoint in development mode and when BREAKPOINT_SERVER_PORT is defined.
+
+*   Allow the --toggle-spin switch on process/reaper to be negated
+
+*   Replace render_partial with render :partial in scaffold generator *Nicholas Seckar*
+
+*   Added -w flag to ps in process/reaper #1934 *Scott Barron*
+
+*   Allow ERb in the database.yml file (just like with fixtures), so you can pull out the database configuration in environment variables #1822 *Duane Johnson*
+
+*   Added convenience controls for FCGI processes (especially when managed remotely): spinner, spawner, and reaper. They reside in script/process. More details can be had by calling them with -h/--help.
+
+*   Added load_fixtures task to the Rakefile, which will load all the fixtures into the database for the current environment #1791 *Marcel Molina Jr.*
+
+*   Added an empty robots.txt to public/, so that web servers asking for it won't trigger a dynamic call, like favicon.ico #1738 *Michael Schubert*
+
+*   Dropped the 'immediate close-down' of FCGI processes since it didn't work consistently and produced bad responses when it didn't. So now a TERM ensures exit after the next request (just as if the process is handling a request when it receives the signal). This means that you'll have to 'nudge' all FCGI processes with a request in order to ensure that they have all reloaded. This can be done by something like ./script/process/repear --nudge 'http://www.myapp.com' --instances 10, which will load the myapp site 10 times (and thus hit all of the 10 FCGI processes once, enough to shut down).
+
+
+## 0.13.1 (11 July, 2005) ##
+
+*   Look for app-specific generators in RAILS_ROOT/generators rather than the clunky old RAILS_ROOT/script/generators.  Nobody really uses this feature except for the unit tests, so it's a negligible-impact change.  If you want to work with third-party generators, drop them in ~/.rails/generators or simply install gems.
+
+*   Fixed that each request with the WEBrick adapter would open a new database connection #1685 *Sam Stephenson*
+
+*   Added support for SQL Server in the database rake tasks #1652 [Ken Barker] Note: osql and scptxfr may need to be installed on your development environment. This involves getting the .exes and a .rll (scptxfr) from a production SQL Server (not developer level SQL Server). Add their location to your Environment PATH and you are all set.
+
+*   Added a VERSION parameter to the migrate task that allows you to do "rake migrate VERSION=34" to migrate to the 34th version traveling up or down depending on the current version
+
+*   Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release #1674 *court3nay*
+
+*   Improved documentation for environment config files #1625 *court3nay*
+
+
+## 0.13.0 (6 July, 2005) ##
+
+*   Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
+
+*   Added migration generator: ./script/generate migration add_system_settings
+
+*   Added "migrate" as rake task to execute all the pending migrations from db/migrate
+
+*   Fixed that model generator would make fixtures plural, even if ActiveRecord::Base.pluralize_table_names was false #1185 *Marcel Molina Jr.*
+
+*   Added a DOCTYPE of HTML transitional to the HTML files generated by Rails #1124 *Michael Koziarski*
+
+*   SIGTERM also gracefully exits dispatch.fcgi.  Ignore SIGUSR1 on Windows.
+
+*   Add the option to manually manage garbage collection in the FastCGI dispatcher.  Set the number of requests between GC runs in your public/dispatch.fcgi *Stefan Kaes*
+
+*   Allow dynamic application reloading for dispatch.fcgi processes by sending a SIGHUP. If the process is currently handling a request, the request will be allowed to complete first. This allows production fcgi's to be reloaded without having to restart them.
+
+*   RailsFCGIHandler (dispatch.fcgi) no longer tries to explicitly flush $stdout (CgiProcess#out always calls flush)
+
+*   Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 *Michael Schubert*
+
+*   ActionMailer::Base subclasses are reloaded with the other rails components #1262
+
+*   Made the WEBrick adapter not use a mutex around action performance if ActionController::Base.allow_concurrency is true (default is false)
+
+*   Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 *Scott Barron*
+
+*   Added a 'whiny nil' that's aim to ensure that when users pass nil to methods where that isn't appropriate, instead of NoMethodError? and the name of some method used by the framework users will see a message explaining what type of object was expected. Only active in test and development environments by default #1209 *Michael Koziarski*
+
+*   Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 *Nicholas Seckar*
+
+*   Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 *Nicholas Seckar*
+
+*   Added -e/--environment option to script/runner #1408 *François Beausoleil*
+
+*   Modernize the scaffold generator to use the simplified render and test methods and to change style from @params["id"] to params[:id].  #1367
+
+*   Added graceful exit from pressing CTRL-C during the run of the rails command #1150 *Caleb Tennis*
+
+*   Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. *Jamis Buck*
+
+*   Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. *Jamis Buck*
+
+*   Added console --profile for profiling an IRB session #1154 *Jeremy Kemper*
+
+*   Changed console_sandbox into console --sandbox #1154 *Jeremy Kemper*
+
+
+## 0.12.1 (20th April, 2005) ##
+
+*   Upgraded to Active Record 1.10.1, Action Pack 1.8.1, Action Mailer 0.9.1, Action Web Service 0.7.1
+
+
+## 0.12.0 (19th April, 2005) ##
+
+*   Fixed that purge_test_database would use database settings from the development environment when recreating the test database #1122 *rails@cogentdude.com*
+
+*   Added script/benchmarker to easily benchmark one or more statement a number of times from within the environment. Examples:
+
+        # runs the one statement 10 times
+        script/benchmarker 10 'Person.expensive_method(10)'
+
+        # pits the two statements against each other with 50 runs each
+        script/benchmarker 50 'Person.expensive_method(10)' 'Person.cheap_method(10)'
+
+*   Added script/profiler to easily profile a single statement from within the environment. Examples:
+
+        script/profiler 'Person.expensive_method(10)'
+        script/profiler 'Person.expensive_method(10)' 10 # runs the statement 10 times
+
+*   Added Rake target clear_logs that'll truncate all the *.log files in log/ to zero #1079 *Lucas Carlson*
+
+*   Added lazy typing for generate, such that ./script/generate cn == ./script/generate controller and the likes #1051 *k@v2studio.com*
+
+*   Fixed that ownership is brought over in pg_dump during tests for PostgreSQL #1060 *pburleson*
+
+*   Upgraded to Active Record 1.10.0, Action Pack 1.8.0, Action Mailer 0.9.0, Action Web Service 0.7.0, Active Support 1.0.4
+
+
+## 0.11.1 (27th March, 2005) ##
+
+*   Fixed the dispatch.fcgi use of a logger
+
+*   Upgraded to Active Record 1.9.1, Action Pack 1.7.0, Action Mailer 0.8.1, Action Web Service 0.6.2, Active Support 1.0.3
+
+
+## 0.11.0 (22th March, 2005) ##
+
+*   Removed SCRIPT_NAME from the WEBrick environment to prevent conflicts with PATH_INFO #896 *Nicholas Seckar*
+
+*   Removed ?$1 from the dispatch.f/cgi redirect line to get rid of 'complete/path/from/request.html' => nil being in the @params now that the ENV["REQUEST_URI"] is used to determine the path #895 *dblack/Nicholas Seckar*
+
+*   Added additional error handling to the FastCGI dispatcher to catch even errors taking down the entire process
+
+*   Improved the generated scaffold code a lot to take advantage of recent Rails developments #882 *Tobias Lütke*
+
+*   Combined the script/environment.rb used for gems and regular files version. If vendor/rails/* has all the frameworks, then files version is used, otherwise gems #878 *Nicholas Seckar*
+
+*   Changed .htaccess to allow dispatch.* to be called from a sub-directory as part of the push with Action Pack to make Rails work on non-vhost setups #826 *Nicholas Seckar/Tobias Lütke*
+
+*   Added script/runner which can be used to run code inside the environment by eval'ing the first parameter. Examples:
+
+        ./script/runner 'ReminderService.deliver'
+        ./script/runner 'Mailer.receive(STDIN.read)'
+
+    This makes it easier to do CRON and postfix scripts without actually making a script just to trigger 1 line of code.
+
+*   Fixed webrick_server cookie handling to allow multiple cookes to be set at once #800, #813 *dave@cherryville.org*
+
+*   Fixed the Rakefile's interaction with postgresql to:
+
+        1. Use PGPASSWORD and PGHOST in the environment to fix prompting for
+           passwords when connecting to a remote db and local socket connections.
+        2. Add a '-x' flag to pg_dump which stops it dumping privileges #807 [rasputnik]
+        3. Quote the user name and use template0 when dumping so the functions doesn't get dumped too #855 [pburleson]
+        4. Use the port if available #875 [madrobby]
+
+*   Upgraded to Active Record 1.9.0, Action Pack 1.6.0, Action Mailer 0.8.0, Action Web Service 0.6.1, Active Support 1.0.2
+
+
+## 0.10.1 (7th March, 2005) ##
+
+*   Fixed rake stats to ignore editor backup files like model.rb~ #791 *Sebastian Kanthak*
+
+*   Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 *Tobias Lütke*
+
+*   Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence)
+
+*   Fixed that scaffold generator new template should use local variable instead of instance variable #778 *Dan Peterson*
+
+*   Allow unit tests to run on a remote server for PostgreSQL #781 *adamm@galacticasoftware.com*
+
+*   Added web_service generator (run ./script/generate web_service for help) #776 *Leon Bredt*
+
+*   Added app/apis and components to code statistics report #729 *Scott Barron*
+
+*   Fixed WEBrick server to use ABSOLUTE_RAILS_ROOT instead of working_directory #687 *Nicholas Seckar*
+
+*   Fixed rails_generator to be usable without RubyGems #686 *Cristi BALAN*
+
+*   Fixed -h/--help for generate and destroy generators #331
+
+*   Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log)
+
+*   Fixed that association#count would produce invalid sql when called sequentialy #659 *kanis@comcard.de*
+
+*   Fixed test/mocks/testing to the correct test/mocks/test #740
+
+*   Added early failure if the Ruby version isn't 1.8.2 or above #735
+
+*   Removed the obsolete -i/--index option from the WEBrick servlet #743
+
+*   Upgraded to Active Record 1.8.0, Action Pack 1.5.1, Action Mailer 0.7.1, Action Web Service 0.6.0, Active Support 1.0.1
+
+
+## 0.10.0 (24th February, 2005) ##
+
+*   Changed default IP binding for WEBrick from 127.0.0.1 to 0.0.0.0 so that the server is accessible both locally and remotely #696 *Marcel Molina Jr.*
+
+*   Fixed that script/server -d was broken so daemon mode couldn't be used #687 *Nicholas Seckar*
+
+*   Upgraded to breakpoint 92 which fixes:
+
+        * overload IRB.parse_opts(), fixes #443
+          => breakpoints in tests work even when running them via rake
+        * untaint handlers, might fix an issue discussed on the Rails ML
+        * added verbose mode to breakpoint_client
+        * less noise caused by breakpoint_client by default
+        * ignored TerminateLineInput exception in signal handler
+          => quiet exit on Ctrl-C
+
+*   Added support for independent components residing in /components. Example:
+
+        Controller: components/list/items_controller.rb
+        (holds a List::ItemsController class with uses_component_template_root called)
+
+        Model     : components/list/item.rb
+        (namespace is still shared, so an Item model in app/models will take precedence)
+
+        Views     : components/list/items/show.rhtml
+
+
+*   Added --sandbox option to script/console that'll roll back all changes made to the database when you quit #672 *Jeremy Kemper*
+
+*   Added 'recent' as a rake target that'll run tests for files that changed in the last 10 minutes #612 *Jeremy Kemper*
+
+*   Changed script/console to default to development environment and drop --no-inspect #650 *Jeremy Kemper*
+
+*   Added that the 'fixture :posts' syntax can be used for has_and_belongs_to_many fixtures where a model doesn't exist #572 *Jeremy Kemper*
+
+*   Added that running test_units and test_functional now performs the clone_structure_to_test as well #566 *rasputnik*
+
+*   Added new generator framework that informs about its doings on generation and enables updating and destruction of generated artifacts. See the new script/destroy and script/update for more details #487 *Jeremy Kemper*
+
+*   Added Action Web Service as a new add-on framework for Action Pack *Leon Bredt*
+
+*   Added Active Support as an independent utility and standard library extension bundle
+
+*   Upgraded to Active Record 1.7.0, Action Pack 1.5.0, Action Mailer 0.7.0
+
+
+## 0.9.5 (January 25th, 2005) ##
+
+*   Fixed dependency reloading by switching to a remove_const approach where all Active Records, Active Record Observers, and Action Controllers are reloading by undefining their classes. This enables you to remove methods in all three types and see the change reflected immediately and it fixes #539. This also means that only those three types of classes will benefit from the const_missing and reloading approach. If you want other classes (like some in lib/) to reload, you must use require_dependency to do it.
+
+*   Added Florian Gross' latest version of Breakpointer and friends that fixes a variaty of bugs #441 *Florian Gross*
+
+*   Fixed skeleton Rakefile to work with sqlite3 out of the box #521 *rasputnik*
+
+*   Fixed that script/breakpointer didn't get the Ruby path rewritten as the other scripts #523 *brandt@kurowski.net*
+
+*   Fixed handling of syntax errors in models that had already been succesfully required once in the current interpreter
+
+*   Fixed that models that weren't referenced in associations weren't being reloaded in the development mode by reinstating the reload
+
+*   Fixed that generate scaffold would produce bad functional tests
+
+*   Fixed that FCGI can also display SyntaxErrors
+
+*   Upgraded to Active Record 1.6.0, Action Pack 1.4.0
+
+
+## 0.9.4.1 (January 18th, 2005) ##
+
+*   Added 5-second timeout to WordNet alternatives on creating reserved-word models #501 *Marcel Molina Jr.*
+
+*   Fixed binding of caller #496 *Alexey*
+
+*   Upgraded to Active Record 1.5.1, Action Pack 1.3.1, Action Mailer 0.6.1
+
+
+## 0.9.4 (January 17th, 2005) ##
+
+*   Added that ApplicationController will catch a ControllerNotFound exception if someone attempts to access a url pointing to an unexisting controller *Tobias Lütke*
+
+*   Flipped code-to-test ratio around to be more readable #468 *Scott Baron*
+
+*   Fixed log file permissions to be 666 instead of 777 (so they're not executable) #471 *Lucas Carlson*
+
+*   Fixed that auto reloading would some times not work or would reload the models twice #475 *Tobias Lütke*
+
+*   Added rewrite rules to deal with caching to public/.htaccess
+
+*   Added the option to specify a controller name to "generate scaffold" and made the default controller name the plural form of the model.
+
+*   Added that rake clone_structure_to_test, db_structure_dump, and purge_test_database tasks now pick up the source database to use from
+    RAILS_ENV instead of just forcing development #424 *Tobias Lütke*
+
+*   Fixed script/console to work with Windows (that requires the use of irb.bat) #418 *Chris McGrath*
+
+*   Fixed WEBrick servlet slowdown over time by restricting the load path reloading to mod_ruby
+
+*   Removed Fancy Indexing as a default option on the WEBrick servlet as it made it harder to use various caching schemes
+
+*   Upgraded to Active Record 1.5, Action Pack 1.3, Action Mailer 0.6
+
+
+## 0.9.3 (January 4th, 2005) ##
+
+*   Added support for SQLite in the auto-dumping/importing of schemas for development -> test #416
+
+*   Added automated rewriting of the shebang lines on installs through the gem rails command #379 *Manfred Stienstra*
+
+*   Added ActionMailer::Base.deliver_method = :test to the test environment so that mail objects are available in ActionMailer::Base.deliveries
+    for functional testing.
+
+*   Added protection for creating a model through the generators with a name of an existing class, like Thread or Date.
+    It'll even offer you a synonym using wordnet.princeton.edu as a look-up. No, I'm not kidding :) *Florian Gross*
+
+*   Fixed dependency management to happen in a unified fashion for Active Record and Action Pack using the new Dependencies module. This means that
+    the environment options needs to change from:
+
+        Before in development.rb:
+          ActionController::Base.reload_dependencies = true  
+          ActiveRecord::Base.reload_associations     = true
+
+        Now in development.rb:
+          Dependencies.mechanism = :load
+
+        Before in production.rb and test.rb:
+          ActionController::Base.reload_dependencies = false
+          ActiveRecord::Base.reload_associations     = false
+
+        Now in production.rb and test.rb:
+          Dependencies.mechanism = :require
+
+*   Fixed problems with dependency caching and controller hierarchies on Ruby 1.8.2 in development mode #351
+
+*   Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 *Lucas Carlson*
+
+*   Upgraded to Action Pack 1.2.0 and Active Record 1.4.0
+
+
+## 0.9.2 ##
+
+*   Fixed CTRL-C exists from the Breakpointer to be a clean affair without error dumping *Kent Sibilev*
+
+*   Fixed "rake stats" to work with sub-directories in models and controllers and to report the code to test ration *Scott Baron*
+
+*   Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record.
+
+*   Added graceful handling of an inaccessible log file by redirecting output to STDERR with a warning #330 *rainmkr*
+
+*   Added support for a -h/--help parameter in the generator #331 *Ulysses*
+
+*   Fixed that File.expand_path in config/environment.rb would fail when dealing with symlinked public directories *mjobin*
+
+*   Upgraded to Action Pack 1.1.0 and Active Record 1.3.0
+
+
+## 0.9.1 ##
+
+*   Upgraded to Action Pack 1.0.1 for important bug fix
+
+*   Updated gem dependencies
+
+
+## 0.9.0 ##
+
+*   Renamed public/dispatch.servlet to script/server -- it wasn't really dispatching anyway as its delegating calls to public/dispatch.rb
+
+*   Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible
+    for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb
+
+*   Added script/console that makes it even easier to start an IRB session for interacting with the domain model. Run with no-args to
+    see help.
+
+*   Added breakpoint support through the script/breakpointer client. This means that you can break out of execution at any point in
+    the code, investigate and change the model, AND then resume execution! Example:
+
+        class WeblogController < ActionController::Base
+          def index
+            @posts = Post.find_all
+            breakpoint "Breaking out from the list"
+          end
+        end
+
+    So the controller will accept the action, run the first line, then present you with a IRB prompt in the breakpointer window.
+    Here you can do things like:
+
+    Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
+
+        >> @posts.inspect
+        => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
+             #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
+        >> @posts.first.title = "hello from a breakpoint"
+        => "hello from a breakpoint"
+
+    ...and even better is that you can examine how your runtime objects actually work:
+
+        >> f = @posts.first
+        => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+        >> f.
+        Display all 152 possibilities? (y or n)
+
+    Finally, when you're ready to resume execution, you press CTRL-D
+
+*   Changed environments to be configurable through an environment variable. By default, the environment is "development", but you
+    can change that and set your own by configuring the Apache vhost with a string like (mod_env must be available on the server):
+
+        SetEnv RAILS_ENV production
+
+    ...if you're using WEBrick, you can pick the environment to use with the command-line parameters -e/--environment, like this:
+
+        ruby public/dispatcher.servlet -e production
+
+*   Added a new default environment called "development", which leaves the production environment to be tuned exclusively for that.
+
+*   Added a start_server in the root of the Rails application to make it even easier to get started
+
+*   Fixed public/.htaccess to use RewriteBase and share the same rewrite rules for all the dispatch methods
+
+*   Fixed webrick_server to handle requests in a serialized manner (the Rails reloading infrastructure is not thread-safe)
+
+*   Added support for controllers in directories. So you can have:
+
+        app/controllers/account_controller.rb        # URL: /account/
+        app/controllers/admin/account_controller.rb  # URL: /admin/account/
+
+    NOTE: You need to update your public/.htaccess with the new rules to pick it up
+
+*   Added reloading for associations and 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
+    ActiveRecord::Base.reload_associations = false and ActionController::Base.reload_dependencies = false in production environments.
+
+*   Added support for sub-directories in app/models. So now you can have something like Basecamp with:
+
+        app/models/accounting
+        app/models/project
+        app/models/participants
+        app/models/settings
+
+    It's poor man's namespacing, but only for file-system organization. You still require files just like before.
+    Nothing changes inside the files themselves.
+
+
+*   Fixed a few references in the tests generated by new_mailer *Jeremy Kemper*
+
+*   Added support for mocks in testing with test/mocks
+
+*   Cleaned up the environments a bit and added global constant RAILS_ROOT
+
+
+## 0.8.5 (9) ##
+
+*   Made dev-util available to all tests, so you can insert breakpoints in any test case to get an IRB prompt at that point [Jeremy Kemper]:
+
+        def test_complex_stuff
+          @david.projects << @new_project
+          breakpoint "Let's have a closer look at @david"
+        end
+
+    You need to install dev-utils yourself for this to work ("gem install dev-util").
+
+*   Added shared generator behavior so future upgrades should be possible without manually copying over files *Jeremy Kemper*
+
+*   Added the new helper style to both controller and helper templates *Jeremy Kemper*
+
+*   Added new_crud generator for creating a model and controller at the same time with explicit scaffolding *Jeremy Kemper*
+
+*   Added configuration of Test::Unit::TestCase.fixture_path to test_helper to concide with the new AR fixtures style
+
+*   Fixed that new_model was generating singular table/fixture names
+
+*   Upgraded to Action Mailer 0.4.0
+
+*   Upgraded to Action Pack 0.9.5
+
+*   Upgraded to Active Record 1.1.0
+
+
+## 0.8.0 (15) ##
+
+*   Removed custom_table_name option for new_model now that the Inflector is as powerful as it is
+
+*   Changed the default rake action to just do testing and separate API generation and coding statistics into a "doc" task.
+
+*   Fixed WEBrick dispatcher to handle missing slashes in the URLs gracefully *alexey*
+
+*   Added user option for all postgresql tool calls in the rakefile *elvstone*
+
+*   Fixed problem with running "ruby public/dispatch.servlet" instead of "cd public; ruby dispatch.servlet" *alexey*
+
+*   Fixed WEBrick server so that it no longer hardcodes the ruby interpreter used to "ruby" but will get the one used based
+    on the Ruby runtime configuration. *Marcel Molina Jr.*
+
+*   Fixed Dispatcher so it'll route requests to magic_beans to MagicBeansController/magic_beans_controller.rb *Caio Chassot*
+
+*   "new_controller MagicBeans" and "new_model SubscriptionPayments" will now both behave properly as they use the new Inflector.
+
+*   Fixed problem with MySQL foreign key constraint checks in Rake :clone_production_structure_to_test target *Andreas Schwarz*
+
+*   Changed WEBrick server to by default be auto-reloading, which is slower but makes source changes instant.
+    Class compilation cache can be turned on with "-c" or "--cache-classes".
+
+*   Added "-b/--binding" option to WEBrick dispatcher to bind the server to a specific IP address (default: 127.0.0.1) *Kevin Temp*
+
+*   dispatch.fcgi now DOESN'T set FCGI_PURE_RUBY as it was slowing things down for now reason *Andreas Schwarz*
+
+*   Added new_mailer generator to work with Action Mailer
+
+*   Included new framework: Action Mailer 0.3
+
+*   Upgraded to Action Pack 0.9.0
+
+*   Upgraded to Active Record 1.0.0
+
+
+## 0.7.0 ##
+
+*   Added an optional second argument to the new_model script that allows the programmer to specify the table name,
+    which will used to generate a custom table_name method in the model and will also be used in the creation of fixtures.
+    *Kevin Radloff*
+
+*   script/new_model now turns AccountHolder into account_holder instead of accountholder *Kevin Radloff*
+
+*   Fixed the faulty handleing of static files with WEBrick *Andreas Schwarz*
+
+*   Unified function_test_helper and unit_test_helper into test_helper
+
+*   Fixed bug with the automated production => test database dropping on PostgreSQL *dhawkins*
+
+*   create_fixtures in both the functional and unit test helper now turns off the log during fixture generation
+    and can generate more than one fixture at a time. Which makes it possible for assignments like:
+
+        @people, @projects, @project_access, @companies, @accounts =
+          create_fixtures "people", "projects", "project_access", "companies", "accounts"
+
+*   Upgraded to Action Pack 0.8.5 (locally-scoped variables, partials, advanced send_file)
+
+*   Upgraded to Active Record 0.9.5 (better table_name guessing, cloning, find_all_in_collection)
+
+
+## 0.6.5 ##
+
+*   No longer specifies a template for rdoc, so it'll use whatever is default (you can change it in the rakefile)
+
+*   The new_model generator will now use the same rules for plural wordings as Active Record
+    (so Category will give categories, not categorys) *Kevin Radloff*
+
+*   dispatch.fcgi now sets FCGI_PURE_RUBY to true to ensure that it's the Ruby version that's loaded *danp*
+
+*   Made the GEM work with Windows
+
+*   Fixed bug where mod_ruby would "forget" the load paths added when switching between controllers
+
+*   PostgreSQL are now supported for the automated production => test database dropping *Kevin Radloff*
+
+*   Errors thrown by the dispatcher are now properly handled in FCGI.
+
+*   Upgraded to Action Pack 0.8.0 (lots and lots and lots of fixes)
+
+*   Upgraded to Active Record 0.9.4 (a bunch of fixes)
+
+
+## 0.6.0 ##
+
+*   Added AbstractionApplicationController as a superclass for all controllers generated. This class can be used
+    to carry filters and methods that are to be shared by all. It has an accompanying ApplicationHelper that all
+    controllers will also automatically have available.
+
+*   Added environments that can be included from any script to get the full Active Record and Action Controller
+    context running. This can be used by maintenance scripts or to interact with the model through IRB. Example:
+
+        require 'config/environments/production'
+
+        for account in Account.find_all
+          account.recalculate_interests
+        end
+
+    A short migration script for an account model that had it's interest calculation strategy changed.
+
+*   Accessing the index of a controller with "/weblog" will now redirect to "/weblog/" (only on Apache, not WEBrick)
+
+*   Simplified the default Apache config so even remote requests are served off CGI as a default.
+    You'll now have to do something specific to activate mod_ruby and FCGI (like using the force urls).
+    This should make it easier for new comers that start on an external server.
+
+*   Added more of the necessary Apache options to .htaccess to make it easier to setup
+
+*   Upgraded to Action Pack 0.7.9 (lots of fixes)
+
+*   Upgraded to Active Record 0.9.3 (lots of fixes)
+
+
+## 0.5.7 ##
+
+*   Fixed bug in the WEBrick dispatcher that prevented it from getting parameters from the URL
+    (through GET requests or otherwise)
+
+*   Added lib in root as a place to store app specific libraries
+
+*   Added lib and vendor to load_path, so anything store within can be loaded directly.
+    Hence lib/redcloth.rb can be loaded with require "redcloth"
+
+*   Upgraded to Action Pack 0.7.8 (lots of fixes)
+
+*   Upgraded to Active Record 0.9.2 (minor upgrade)
+
+
+## 0.5.6 ##
+
+*   Upgraded to Action Pack 0.7.7 (multipart form fix)
+
+*   Updated the generated template stubs to valid XHTML files
+
+*   Ensure that controllers generated are capitalized, so "new_controller TodoLists"
+    gives the same as "new_controller Todolists" and "new_controller todolists".
+
+
+## 0.5.5 ##
+
+*   Works on Windows out of the box! (Dropped symlinks)
+
+*   Added webrick dispatcher: Try "ruby public/dispatch.servlet --help" *Florian Gross*
+
+*   Report errors about initialization to browser (instead of attempting to use uninitialized logger)
+
+*   Upgraded to Action Pack 0.7.6
+
+*   Upgraded to Active Record 0.9.1
+
+*   Added distinct 500.html instead of reusing 404.html
+
+*   Added MIT license
+
+
+## 0.5.0 ##
+
+*   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

---
 actionmailer/actionmailer.gemspec     | 2 +-
 actionpack/actionpack.gemspec         | 2 +-
 activemodel/activemodel.gemspec       | 2 +-
 activerecord/activerecord.gemspec     | 2 +-
 activeresource/activeresource.gemspec | 2 +-
 activesupport/activesupport.gemspec   | 2 +-
 railties/railties.gemspec             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index d7f450f751..7ecc35b7c7 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.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'
 
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'
 
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index 260ad01b65..49f664bf89 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
 
-  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
+  s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
 
   s.add_dependency('activesupport', version)
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 2de81c31a3..b4622005b4 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
 
-  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*']
+  s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*']
   s.require_path = 'lib'
 
   s.extra_rdoc_files = %w( README.rdoc )
diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec
index a8772ecf8c..f5c26f38df 100644
--- a/activeresource/activeresource.gemspec
+++ b/activeresource/activeresource.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email             = 'david@loudthinking.com'
   s.homepage          = 'http://www.rubyonrails.org'
 
-  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*']
+  s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'examples/**/*', 'lib/**/*']
   s.require_path = 'lib'
 
   s.extra_rdoc_files = %w( README.rdoc )
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 2ee6bb788a..70d17fb580 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.email        = 'david@loudthinking.com'
   s.homepage     = 'http://www.rubyonrails.org'
 
-  s.files        = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
+  s.files        = Dir['CHANGELOG.md', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
 
   s.add_dependency('i18n',       '~> 0.6')
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index b917128885..a7b9407daf 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.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', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
+  s.files              = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
   s.require_path       = 'lib'
 
   s.bindir             = 'bin'
-- 
cgit v1.2.3


From 6da558660cbb890bdd9c2fb59839d4741851fdf4 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 4 Nov 2011 19:30:59 +0530
Subject: Fix test as one more has_many added

---
 activerecord/test/cases/reflection_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 3868ecb3cb..b30db542a7 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -190,7 +190,7 @@ class ReflectionTest < ActiveRecord::TestCase
   def test_reflection_of_all_associations
     # FIXME these assertions bust a lot
     assert_equal 37, Firm.reflect_on_all_associations.size
-    assert_equal 26, Firm.reflect_on_all_associations(:has_many).size
+    assert_equal 27, Firm.reflect_on_all_associations(:has_many).size
     assert_equal 10, Firm.reflect_on_all_associations(:has_one).size
     assert_equal 0, Firm.reflect_on_all_associations(:belongs_to).size
   end
-- 
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(+)

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 69dcd45aea770ca90bb3e1f8ce4e944dfb37e766 Mon Sep 17 00:00:00 2001
From: Vlad Jebelev <vlad@jebelev.com>
Date: Fri, 4 Nov 2011 15:45:24 -0500
Subject: AR changes to support creating ordered (asc, desc) indexes

---
 activerecord/CHANGELOG.md                          |  2 ++
 .../abstract/schema_definitions.rb                 |  2 +-
 .../abstract/schema_statements.rb                  | 30 +++++++++++++++++-
 .../connection_adapters/abstract_adapter.rb        |  5 +++
 .../connection_adapters/abstract_mysql_adapter.rb  | 36 ++++++++++++++++------
 .../connection_adapters/postgresql_adapter.rb      | 16 ++++++++--
 .../connection_adapters/sqlite_adapter.rb          |  4 +++
 activerecord/lib/active_record/migration.rb        |  5 +--
 activerecord/lib/active_record/schema_dumper.rb    |  3 ++
 .../test/cases/adapters/postgresql/schema_test.rb  | 16 +++++++---
 activerecord/test/cases/migration_test.rb          | 12 ++++++++
 11 files changed, 111 insertions(+), 20 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 2b46a6a869..426f6b48b3 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Support index sort order in sqlite, mysql and postgres adapters. *Vlad Jebelev*
+
 *   Allow the :class_name option for associations to take a symbol (:Client) in addition to
     a string ('Client').
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 989a4fcbca..3f69f75565 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -6,7 +6,7 @@ require 'bigdecimal/util'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
-    class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths) #:nodoc:
+    class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders) #:nodoc:
     end
 
     # Abstract representation of a column definition. Instances of this type
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 7226069ebf..0e5e33fa02 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -339,6 +339,14 @@ module ActiveRecord
       #  CREATE INDEX by_name_surname ON accounts(name(10), surname(15))
       #
       # Note: SQLite doesn't support index length
+      #
+      # ====== Creating an index with a sort order (desc or asc, asc is the default)
+      #  add_index(:accounts, [:branch_id, :party_id, :surname], :order => {:branch_id => :desc, :part_id => :asc})
+      # generates
+      #  CREATE INDEX by_branch_desc_party ON accounts(branch_id DESC, party_id ASC, surname)
+      #
+      # Note: mysql doesn't yet support index order (it accepts the syntax but ignores it)
+      #
       def add_index(table_name, column_name, options = {})
         index_name, index_type, index_columns = add_index_options(table_name, column_name, options)
         execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} (#{index_columns})"
@@ -520,9 +528,29 @@ module ActiveRecord
       end
 
       protected
+        def add_index_sort_order(option_strings, column_names, options = {})
+          if options.is_a?(Hash) && order = options[:order]
+            case order
+            when Hash
+              column_names.each {|name| option_strings[name] += " #{order[name].to_s.upcase}" if order.has_key?(name)}
+            when String
+              column_names.each {|name| option_strings[name] += " #{order.upcase}"}
+            end
+          end
+
+          return option_strings
+        end
+
         # Overridden by the mysql adapter for supporting index lengths
         def quoted_columns_for_index(column_names, options = {})
-          column_names.map {|name| quote_column_name(name) }
+          option_strings = Hash[column_names.map {|name| [name, '']}]
+
+          # add index sort order if supported
+          if supports_index_sort_order?
+            option_strings = add_index_sort_order(option_strings, column_names, options)
+          end
+
+          column_names.map {|name| quote_column_name(name) + option_strings[name]}
         end
 
         def options_include_default?(options)
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 4c3a8f7233..c47bcfc406 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -130,6 +130,11 @@ module ActiveRecord
         false
       end
 
+      # Does this adapter support index sort order?
+      def supports_index_sort_order?
+        false
+      end
+
       # QUOTING ==================================================
 
       # Override to return the quoted table name. Defaults to column quoting.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index dd573ba569..35c2118190 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -155,6 +155,12 @@ module ActiveRecord
         true
       end
 
+      # Technically MySQL allows to create indexes with the sort order syntax 
+      # but at the moment (5.5) it doesn't yet implement them
+      def supports_index_sort_order?
+        true
+      end
+
       def native_database_types
         NATIVE_DATABASE_TYPES
       end
@@ -526,17 +532,29 @@ module ActiveRecord
 
       protected
 
+      def add_index_length(option_strings, column_names, options = {})
+        if options.is_a?(Hash) && length = options[:length]
+          case length
+          when Hash
+            column_names.each {|name| option_strings[name] += "(#{length[name]})" if length.has_key?(name)}
+          when Fixnum
+            column_names.each {|name| option_strings[name] += "(#{length})"}
+          end
+        end
+
+        return option_strings
+      end
+
       def quoted_columns_for_index(column_names, options = {})
-        length = options[:length] if options.is_a?(Hash)
+        option_strings = Hash[column_names.map {|name| [name, '']}]
 
-        case length
-        when Hash
-          column_names.map {|name| length[name] ? "#{quote_column_name(name)}(#{length[name]})" : quote_column_name(name) }
-        when Fixnum
-          column_names.map {|name| "#{quote_column_name(name)}(#{length})"}
-        else
-          column_names.map {|name| quote_column_name(name) }
-        end
+        # add index length
+        option_strings = add_index_length(option_strings, column_names, options)
+
+        # add index sort order
+        option_strings = add_index_sort_order(option_strings, column_names, options)
+
+        column_names.map {|name| quote_column_name(name) + option_strings[name]}
       end
 
       def translate_exception(exception, message)
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index e8a43e7bce..15e329a1c8 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -247,6 +247,10 @@ module ActiveRecord
         true
       end
 
+      def supports_index_sort_order?
+        true
+      end
+
       class StatementPool < ConnectionAdapters::StatementPool
         def initialize(connection, max)
           super
@@ -756,7 +760,7 @@ module ActiveRecord
       def indexes(table_name, name = nil)
          schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
          result = query(<<-SQL, name)
-           SELECT distinct i.relname, d.indisunique, d.indkey, t.oid
+           SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
            FROM pg_class t
            INNER JOIN pg_index d ON t.oid = d.indrelid
            INNER JOIN pg_class i ON d.indexrelid = i.oid
@@ -772,7 +776,8 @@ module ActiveRecord
           index_name = row[0]
           unique = row[1] == 't'
           indkey = row[2].split(" ")
-          oid = row[3]
+          inddef = row[3]
+          oid = row[4]
 
           columns = Hash[query(<<-SQL, "Columns for index #{row[0]} on #{table_name}")]
           SELECT a.attnum, a.attname
@@ -782,7 +787,12 @@ module ActiveRecord
           SQL
 
           column_names = columns.values_at(*indkey).compact
-          column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names)
+
+          # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
+          desc_order_columns = inddef.scan(/(\w+) DESC/).flatten
+          orders = desc_order_columns.any? ? Hash[desc_order_columns.map {|order_column| [order_column, :desc]}] : {}
+      
+          column_names.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names, [], orders)
         end.compact
       end
 
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index f74f3e6ec8..caecbc9b3a 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -157,6 +157,10 @@ module ActiveRecord
         sqlite_version >= '3.1.0'
       end
 
+      def supports_index_sort_order?
+        sqlite_version >= '3.3.0'
+      end
+
       def native_database_types #:nodoc:
         {
           :primary_key => default_primary_key_type,
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 7166f1b82a..2fb1b8f7a3 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -116,8 +116,9 @@ module ActiveRecord
   #   +column_name+ from the table called +table_name+.
   # * <tt>add_index(table_name, column_names, options)</tt>: Adds a new index
   #   with the name of the column. Other options include
-  #   <tt>:name</tt> and <tt>:unique</tt> (e.g.
-  #   <tt>{ :name => "users_name_index", :unique => true }</tt>).
+  #   <tt>:name</tt>, <tt>:unique</tt> (e.g.
+  #   <tt>{ :name => "users_name_index", :unique => true }</tt>) and <tt>:order</tt>
+  #   (e.g. { :order => {:name => :desc} }</tt>).
   # * <tt>remove_index(table_name, :column => column_name)</tt>: Removes the index
   #   specified by +column_name+.
   # * <tt>remove_index(table_name, :name => index_name)</tt>: Removes the index
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index 6fe305f843..cdde5cf3b9 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -190,6 +190,9 @@ HEADER
             index_lengths = (index.lengths || []).compact
             statement_parts << (':length => ' + Hash[index.columns.zip(index.lengths)].inspect) unless index_lengths.empty?
 
+            index_orders = (index.orders || {})
+            statement_parts << (':order => ' + index.orders.inspect) unless index_orders.empty?
+
             '  ' + statement_parts.join(', ')
           end
 
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index c8f8714f66..657527137a 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -10,14 +10,17 @@ class SchemaTest < ActiveRecord::TestCase
   INDEX_A_NAME = 'a_index_things_on_name'
   INDEX_B_NAME = 'b_index_things_on_different_columns_in_each_schema'
   INDEX_C_NAME = 'c_index_full_text_search'
+  INDEX_D_NAME = 'd_index_things_on_description_desc'
   INDEX_A_COLUMN = 'name'
   INDEX_B_COLUMN_S1 = 'email'
   INDEX_B_COLUMN_S2 = 'moment'
   INDEX_C_COLUMN = %q{(to_tsvector('english', coalesce(things.name, '')))}
+  INDEX_D_COLUMN = 'description'
   COLUMNS = [
     'id integer',
     'name character varying(50)',
     'email character varying(50)',
+    'description character varying(100)',
     'moment timestamp without time zone default now()'
   ]
   PK_TABLE_NAME = 'table_with_pk'
@@ -54,6 +57,8 @@ class SchemaTest < ActiveRecord::TestCase
     @connection.execute "CREATE INDEX #{INDEX_B_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_B_COLUMN_S2});"
     @connection.execute "CREATE INDEX #{INDEX_C_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING gin (#{INDEX_C_COLUMN});"
     @connection.execute "CREATE INDEX #{INDEX_C_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING gin (#{INDEX_C_COLUMN});"
+    @connection.execute "CREATE INDEX #{INDEX_D_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_D_COLUMN} DESC);"
+    @connection.execute "CREATE INDEX #{INDEX_D_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME}  USING btree (#{INDEX_D_COLUMN} DESC);"
     @connection.execute "CREATE TABLE #{SCHEMA_NAME}.#{PK_TABLE_NAME} (id serial primary key)"
   end
 
@@ -184,11 +189,11 @@ class SchemaTest < ActiveRecord::TestCase
   end
 
   def test_dump_indexes_for_schema_one
-    do_dump_index_tests_for_schema(SCHEMA_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S1)
+    do_dump_index_tests_for_schema(SCHEMA_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S1, INDEX_D_COLUMN)
   end
 
   def test_dump_indexes_for_schema_two
-    do_dump_index_tests_for_schema(SCHEMA2_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S2)
+    do_dump_index_tests_for_schema(SCHEMA2_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S2, INDEX_D_COLUMN)
   end
 
   def test_with_uppercase_index_name
@@ -288,13 +293,16 @@ class SchemaTest < ActiveRecord::TestCase
       @connection.schema_search_path = "'$user', public"
     end
 
-    def do_dump_index_tests_for_schema(this_schema_name, first_index_column_name, second_index_column_name)
+    def do_dump_index_tests_for_schema(this_schema_name, first_index_column_name, second_index_column_name, third_index_column_name)
       with_schema_search_path(this_schema_name) do
         indexes = @connection.indexes(TABLE_NAME).sort_by {|i| i.name}
-        assert_equal 2,indexes.size
+        assert_equal 3,indexes.size
 
         do_dump_index_assertions_for_one_index(indexes[0], INDEX_A_NAME, first_index_column_name)
         do_dump_index_assertions_for_one_index(indexes[1], INDEX_B_NAME, second_index_column_name)
+        do_dump_index_assertions_for_one_index(indexes[2], INDEX_D_NAME, third_index_column_name)
+
+        assert_equal :desc, indexes.select{|i| i.name == INDEX_D_NAME}[0].orders[INDEX_D_COLUMN]
       end
     end
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 5c47a8ad33..e8ad37d437 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -121,6 +121,18 @@ if ActiveRecord::Base.connection.supports_migrations?
         assert_nothing_raised { Person.connection.add_index("people", %w(last_name first_name administrator), :name => "named_admin") }
         assert_nothing_raised { Person.connection.remove_index("people", :name => "named_admin") }
       end
+
+      # Selected adapters support index sort order
+      if current_adapter?(:SQLite3Adapter, :MysqlAdapter, :Mysql2Adapter, :PostgreSQLAdapter)
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name"], :order => {:last_name => :desc}) }
+        assert_nothing_raised { Person.connection.remove_index("people", ["last_name"]) }
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => {:last_name => :desc}) }
+        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => {:last_name => :desc, :first_name => :asc}) }
+        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
+        assert_nothing_raised { Person.connection.add_index("people", ["last_name", "first_name"], :order => :desc) }
+        assert_nothing_raised { Person.connection.remove_index("people", ["last_name", "first_name"]) }
+      end
     end
 
     def test_index_symbol_names
-- 
cgit v1.2.3


From 15fb4302b6ff16e641b6279a3530eb8ed97f2899 Mon Sep 17 00:00:00 2001
From: Alex Tambellini <atambellini@gmail.com>
Date: Thu, 8 Sep 2011 16:07:04 -0400
Subject: schema_format :sql should behave like schema_format :ruby

This commit adds a db:structure:load task that is run instead of
db:schema:load when schema_format is set to :sql. This patch also removes
the prefixing of the structure.sql files to mimic the use of a single
schema.rb file. The patch originates from github issue #715.
---
 .../lib/active_record/railties/databases.rake      | 104 +++++++++++++--------
 1 file changed, 66 insertions(+), 38 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 44848b3391..aea928b443 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -151,6 +151,7 @@ db_namespace = namespace :db do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     db_namespace["schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+    db_namespace["structure:dump"].invoke if ActiveRecord::Base.schema_format == :sql
   end
 
   namespace :migrate do
@@ -174,6 +175,7 @@ db_namespace = namespace :db do
       raise 'VERSION is required' unless version
       ActiveRecord::Migrator.run(:up, ActiveRecord::Migrator.migrations_paths, version)
       db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+      db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
     end
 
     # desc 'Runs the "down" for a given migration VERSION.'
@@ -182,6 +184,7 @@ db_namespace = namespace :db do
       raise 'VERSION is required' unless version
       ActiveRecord::Migrator.run(:down, ActiveRecord::Migrator.migrations_paths, version)
       db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+      db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
     end
 
     desc 'Display status of migrations'
@@ -222,6 +225,7 @@ db_namespace = namespace :db do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
     db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+    db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
   end
 
   # desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
@@ -229,10 +233,14 @@ db_namespace = namespace :db do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.forward(ActiveRecord::Migrator.migrations_paths, step)
     db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
+    db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
   end
 
   # desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
-  task :reset => [ 'db:drop', 'db:setup' ]
+  task :reset => :environment do
+    db_namespace["drop"].invoke
+    db_namespace["setup"].invoke
+  end
 
   # desc "Retrieves the charset for the current environment's database"
   task :charset => :environment do
@@ -285,7 +293,12 @@ db_namespace = namespace :db do
   end
 
   desc 'Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)'
-  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+  task :setup => :environment do
+    db_namespace["create"].invoke
+    db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
+    db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
+    db_namespace["seed"].invoke
+  end
 
   desc 'Load the seed data from db/seeds.rb'
   task :seed => 'db:abort_if_pending_migrations' do
@@ -360,81 +373,96 @@ db_namespace = namespace :db do
       case abcs[Rails.env]['adapter']
       when /mysql/, 'oci', 'oracle'
         ActiveRecord::Base.establish_connection(abcs[Rails.env])
-        File.open("#{Rails.root}/db/#{Rails.env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+        File.open("#{Rails.root}/db/structure.sql", "w:utf-8") { |f| f << ActiveRecord::Base.connection.structure_dump }
       when /postgresql/
         ENV['PGHOST']     = abcs[Rails.env]['host'] if abcs[Rails.env]['host']
-        ENV['PGPORT']     = abcs[Rails.env]["port"].to_s if abcs[Rails.env]['port']
+        ENV['PGPORT']     = abcs[Rails.env]['port'].to_s if abcs[Rails.env]['port']
         ENV['PGPASSWORD'] = abcs[Rails.env]['password'].to_s if abcs[Rails.env]['password']
+        ENV['PGUSER']     = abcs[Rails.env]['username'].to_s if abcs[Rails.env]['username']
         search_path = abcs[Rails.env]['schema_search_path']
         unless search_path.blank?
           search_path = search_path.split(",").map{|search_path_part| "--schema=#{search_path_part.strip}" }.join(" ")
         end
-        `pg_dump -i -U "#{abcs[Rails.env]['username']}" -s -x -O -f db/#{Rails.env}_structure.sql #{search_path} #{abcs[Rails.env]['database']}`
+        `pg_dump -i -s -x -O -f db/structure.sql #{search_path} #{abcs[Rails.env]['database']}`
         raise 'Error dumping database' if $?.exitstatus == 1
       when /sqlite/
         dbfile = abcs[Rails.env]['database'] || abcs[Rails.env]['dbfile']
-        `sqlite3 #{dbfile} .schema > db/#{Rails.env}_structure.sql`
+        `sqlite3 #{dbfile} .schema > db/structure.sql`
       when 'sqlserver'
-        `smoscript -s #{abcs[Rails.env]['host']} -d #{abcs[Rails.env]['database']} -u #{abcs[Rails.env]['username']} -p #{abcs[Rails.env]['password']} -f db\\#{Rails.env}_structure.sql -A -U`
+        `smoscript -s #{abcs[Rails.env]['host']} -d #{abcs[Rails.env]['database']} -u #{abcs[Rails.env]['username']} -p #{abcs[Rails.env]['password']} -f db\\structure.sql -A -U`
       when "firebird"
         set_firebird_env(abcs[Rails.env])
         db_string = firebird_db_string(abcs[Rails.env])
-        sh "isql -a #{db_string} > #{Rails.root}/db/#{Rails.env}_structure.sql"
+        sh "isql -a #{db_string} > #{Rails.root}/db/structure.sql"
       else
         raise "Task not supported by '#{abcs[Rails.env]["adapter"]}'"
       end
 
       if ActiveRecord::Base.connection.supports_migrations?
-        File.open("#{Rails.root}/db/#{Rails.env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        File.open("#{Rails.root}/db/structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
       end
     end
-  end
-
-  namespace :test do
-    # desc "Recreate the test database from the current schema.rb"
-    task :load => 'db:test:purge' do
-      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
-      ActiveRecord::Schema.verbose = false
-      db_namespace['schema:load'].invoke
-    end
 
-    # desc "Recreate the test database from the current environment's database schema"
-    task :clone => %w(db:schema:dump db:test:load)
+    # desc "Recreate the databases from the structure.sql file"
+    task :load => [:environment, :load_config] do
+      env = ENV['RAILS_ENV'] || 'test'
 
-    # desc "Recreate the test databases from the development structure"
-    task :clone_structure => [ 'db:structure:dump', 'db:test:purge' ] do
       abcs = ActiveRecord::Base.configurations
-      case abcs['test']['adapter']
+      case abcs[env]['adapter']
       when /mysql/
-        ActiveRecord::Base.establish_connection(:test)
+        ActiveRecord::Base.establish_connection(abcs[env])
         ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-        IO.readlines("#{Rails.root}/db/#{Rails.env}_structure.sql").join.split("\n\n").each do |table|
+        IO.readlines("#{Rails.root}/db/structure.sql").join.split("\n\n").each do |table|
           ActiveRecord::Base.connection.execute(table)
         end
       when /postgresql/
-        ENV['PGHOST']     = abcs['test']['host'] if abcs['test']['host']
-        ENV['PGPORT']     = abcs['test']['port'].to_s if abcs['test']['port']
-        ENV['PGPASSWORD'] = abcs['test']['password'].to_s if abcs['test']['password']
-        `psql -U "#{abcs['test']['username']}" -f "#{Rails.root}/db/#{Rails.env}_structure.sql" #{abcs['test']['database']} #{abcs['test']['template']}`
+        ENV['PGHOST']     = abcs[env]['host'] if abcs[env]['host']
+        ENV['PGPORT']     = abcs[env]['port'].to_s if abcs[env]['port']
+        ENV['PGPASSWORD'] = abcs[env]['password'].to_s if abcs[env]['password']
+        ENV['PGUSER']     = abcs[env]['username'].to_s if abcs[env]['username']
+        `psql -f "#{Rails.root}/db/structure.sql" #{abcs[env]['database']} #{abcs[env]['template']}`
       when /sqlite/
-        dbfile = abcs['test']['database'] || abcs['test']['dbfile']
-        `sqlite3 #{dbfile} < "#{Rails.root}/db/#{Rails.env}_structure.sql"`
+        dbfile = abcs[env]['database'] || abcs[env]['dbfile']
+        `sqlite3 #{dbfile} < "#{Rails.root}/db/structure.sql"`
       when 'sqlserver'
-        `sqlcmd -S #{abcs['test']['host']} -d #{abcs['test']['database']} -U #{abcs['test']['username']} -P #{abcs['test']['password']} -i db\\#{Rails.env}_structure.sql`
+        `sqlcmd -S #{abcs[env]['host']} -d #{abcs[env]['database']} -U #{abcs[env]['username']} -P #{abcs[env]['password']} -i db\\structure.sql`
       when 'oci', 'oracle'
-        ActiveRecord::Base.establish_connection(:test)
-        IO.readlines("#{Rails.root}/db/#{Rails.env}_structure.sql").join.split(";\n\n").each do |ddl|
+        ActiveRecord::Base.establish_connection(abcs[env])
+        IO.readlines("#{Rails.root}/db/structure.sql").join.split(";\n\n").each do |ddl|
           ActiveRecord::Base.connection.execute(ddl)
         end
       when 'firebird'
-        set_firebird_env(abcs['test'])
-        db_string = firebird_db_string(abcs['test'])
-        sh "isql -i #{Rails.root}/db/#{Rails.env}_structure.sql #{db_string}"
+        set_firebird_env(abcs[env])
+        db_string = firebird_db_string(abcs[env])
+        sh "isql -i #{Rails.root}/db/structure.sql #{db_string}"
       else
-        raise "Task not supported by '#{abcs['test']['adapter']}'"
+        raise "Task not supported by '#{abcs[env]['adapter']}'"
+      end
+    end
+  end
+
+  namespace :test do
+    # desc "Recreate the test database from the current schema.rb"
+    task :load => 'db:test:purge' do
+      ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+      ActiveRecord::Schema.verbose = false
+      db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
+
+      begin
+        old_env, ENV['RAILS_ENV'] = ENV['RAILS_ENV'], 'test'
+        db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
+      ensure
+        ENV['RAILS_ENV'] = old_env
       end
+
     end
 
+    # desc "Recreate the test database from the current environment's database schema"
+    task :clone => %w(db:schema:dump db:test:load)
+
+    # desc "Recreate the test databases from the structure.sql file"
+    task :clone_structure => [ "db:structure:dump", "db:test:load" ]
+
     # desc "Empty the test database"
     task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
-- 
cgit v1.2.3


From bcd25e7576094a98dbc9f4b1ba2fb3451d13bf40 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian.walch@mineum.at>
Date: Sat, 5 Nov 2011 13:34:01 +0100
Subject: Fixed after_initialize/after_find guide

Defining after_initialize and after_find as ordinary methods like documented
in the guide doesn't work with Rails 3.1.1; now macro-style is used here, too.
---
 railties/guides/source/active_record_validations_callbacks.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile
index 4c1f66aedf..a27c292a4c 100644
--- a/railties/guides/source/active_record_validations_callbacks.textile
+++ b/railties/guides/source/active_record_validations_callbacks.textile
@@ -978,15 +978,15 @@ The +after_initialize+ callback will be called whenever an Active Record object
 
 The +after_find+ callback will be called whenever Active Record loads a record from the database. +after_find+ is called before +after_initialize+ if both are defined.
 
-The +after_initialize+ and +after_find+ callbacks are a bit different from the others. They have no +before_*+ counterparts, and they are registered simply by defining them as regular methods with predefined names. If you try to register +after_initialize+ or +after_find+ using macro-style class methods, they will just be ignored. This behavior is due to performance reasons, since +after_initialize+ and +after_find+ will both be called for each record found in the database, which would otherwise significantly slow down the queries.
+The +after_initialize+ and +after_find+ callbacks have no +before_*+ counterparts, but they can be registered just like the other Active Record callbacks.
 
 <ruby>
 class User < ActiveRecord::Base
-  def after_initialize
+  after_initialize do |user|
     puts "You have initialized an object!"
   end
 
-  def after_find
+  after_find do |user|
     puts "You have found an object!"
   end
 end
-- 
cgit v1.2.3


From 53f61acdcad51e28b36f41c0af3c7c1fb8078c10 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 5 Nov 2011 20:38:07 +0530
Subject: Revert "make the inline text a comment in the code block"

This reverts commit 36a5f48f9323c4a770c290a9a16ae58388e7925f.

Reason: Editing .gitignore in docrails is not allowed. Docrails is meant
only for documentation.
---
 .gitignore              | 2 --
 activemodel/README.rdoc | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 203fed69a5..aa14cee911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,3 @@ debug.log
 /railties/guides/output
 /railties/tmp
 /RDOC_MAIN.rdoc
-.DS_Store
-activemodel/.DS_Store
diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index 173bc18af1..fa3353a780 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -175,7 +175,7 @@ modules:
      attr_accessor :name
    end
 
-   #You could use any of the two ways mentioned above to use a Custom Validator.
+   You could use any of the two ways mentioned above to use a Custom Validator.
 
    class HasNameValidator < ActiveModel::Validator
      def validate(record)
-- 
cgit v1.2.3


From 09298e42578740094130f4a6536b944a7733d7f1 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 5 Nov 2011 20:43:04 +0530
Subject: Revert "outline two ways to invoke a custom active model validator"

This reverts commit d163d3bf7ebb98d90977974aed8f85b7ec678afd.

Reason: The alternate approach can be documented in the guide and
not disrupt the existing flow in the readme.
---
 activemodel/README.rdoc | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index fa3353a780..67701bc422 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -162,21 +162,13 @@ modules:
   {Learn more}[link:classes/ActiveModel/Validations.html]
 
 * Custom validators
-   
-   class Person
-     include ActiveModel::Validations
-     validates_with HasNameValidator
-     attr_accessor :name
-   end
 
    class Person
      include ActiveModel::Validations
-     validates :name, :has_name => true
+     validates_with HasNameValidator
      attr_accessor :name
    end
 
-   You could use any of the two ways mentioned above to use a Custom Validator.
-
    class HasNameValidator < ActiveModel::Validator
      def validate(record)
       record.errors[:name] = "must exist" if record.name.blank?
-- 
cgit v1.2.3


From 562583c7667f508493ab8c5b1a4215087fafd22d Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 4 Nov 2011 16:10:18 +0000
Subject: Add ActiveRecord::Relation#uniq for toggling DISTINCT in the SQL
 query

---
 Gemfile                                            |  2 ++
 activerecord/CHANGELOG.md                          | 16 ++++++++++++
 activerecord/lib/active_record/base.rb             |  4 ++-
 activerecord/lib/active_record/relation.rb         |  2 +-
 .../lib/active_record/relation/query_methods.rb    | 30 +++++++++++++++++-----
 activerecord/test/cases/base_test.rb               |  6 +++++
 activerecord/test/cases/relation_test.rb           |  2 +-
 activerecord/test/cases/relations_test.rb          | 16 ++++++++++++
 .../guides/source/active_record_querying.textile   | 24 ++++++++++++++---
 9 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4ac6bf764d..f94f267f05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,8 @@ gemspec
 
 if ENV['AREL']
   gem "arel", :path => ENV['AREL']
+else
+  gem "arel", :git => "git://github.com/rails/arel"
 end
 
 gem "bcrypt-ruby", "~> 3.0.0"
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 426f6b48b3..2524082062 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,21 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Add ActiveRecord::Relation#uniq for generating unique queries.
+
+    Before:
+
+        Client.select('DISTINCT name')
+
+    After:
+
+        Client.select(:name).uniq
+
+    This also allows you to revert the unqueness in a relation:
+
+        Client.select(:name).uniq.uniq(false)
+
+    *Jon Leighton*
+
 *   Support index sort order in sqlite, mysql and postgres adapters. *Vlad Jebelev*
 
 *   Allow the :class_name option for associations to take a symbol (:Client) in addition to
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 360e494af1..455b299270 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -445,7 +445,9 @@ module ActiveRecord #:nodoc:
       delegate :first_or_create, :first_or_create!, :first_or_initialize, :to => :scoped
       delegate :destroy, :destroy_all, :delete, :delete_all, :update, :update_all, :to => :scoped
       delegate :find_each, :find_in_batches, :to => :scoped
-      delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins, :where, :preload, :eager_load, :includes, :from, :lock, :readonly, :having, :create_with, :to => :scoped
+      delegate :select, :group, :order, :except, :reorder, :limit, :offset, :joins,
+               :where, :preload, :eager_load, :includes, :from, :lock, :readonly,
+               :having, :create_with, :uniq, :to => :scoped
       delegate :count, :average, :minimum, :maximum, :sum, :calculate, :to => :scoped
 
       # Executes a custom SQL query against your database and returns all the results. The results will
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index ecefaa633c..3baf9b3f49 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -7,7 +7,7 @@ module ActiveRecord
     JoinOperation = Struct.new(:relation, :join_class, :on)
     ASSOCIATION_METHODS = [:includes, :eager_load, :preload]
     MULTI_VALUE_METHODS = [:select, :group, :order, :joins, :where, :having, :bind]
-    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order]
+    SINGLE_VALUE_METHODS = [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order, :uniq]
 
     include FinderMethods, Calculations, SpawnMethods, QueryMethods, Batches
 
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 670ba0987d..c281bead0d 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -9,7 +9,8 @@ module ActiveRecord
                   :select_values, :group_values, :order_values, :joins_values,
                   :where_values, :having_values, :bind_values,
                   :limit_value, :offset_value, :lock_value, :readonly_value, :create_with_value,
-                  :from_value, :reorder_value, :reverse_order_value
+                  :from_value, :reorder_value, :reverse_order_value,
+                  :uniq_value
 
     def includes(*args)
       args.reject! {|a| a.blank? }
@@ -38,7 +39,7 @@ module ActiveRecord
     end
 
     # Works in two unique ways.
-    # 
+    #
     # First: takes a block so it can be used just like Array#select.
     #
     #   Model.scoped.select { |m| m.field == value }
@@ -176,9 +177,25 @@ module ActiveRecord
       relation
     end
 
+    # Specifies whether the records should be unique or not. For example:
+    #
+    #   User.select(:name)
+    #   # => Might return two records with the same name
+    #
+    #   User.select(:name).uniq
+    #   # => Returns 1 record per unique name
+    #
+    #   User.select(:name).uniq.uniq(false)
+    #   # => You can also remove the uniqueness
+    def uniq(value = true)
+      relation = clone
+      relation.uniq_value = value
+      relation
+    end
+
     # Used to extend a scope with additional methods, either through
-    # a module or through a block provided. 
-    # 
+    # a module or through a block provided.
+    #
     # The object returned is a relation, which can be further extended.
     #
     # === Using a module
@@ -200,7 +217,7 @@ module ActiveRecord
     #
     #   scope = Model.scoped.extending do
     #     def page(number)
-    #       # pagination code goes here 
+    #       # pagination code goes here
     #     end
     #   end
     #   scope.page(params[:page])
@@ -209,7 +226,7 @@ module ActiveRecord
     #
     #   scope = Model.scoped.extending(Pagination) do
     #     def per_page(number)
-    #       # pagination code goes here 
+    #       # pagination code goes here
     #     end
     #   end
     def extending(*modules)
@@ -252,6 +269,7 @@ module ActiveRecord
 
       build_select(arel, @select_values.uniq)
 
+      arel.distinct(@uniq_value)
       arel.from(@from_value) if @from_value
       arel.lock(@lock_value) if @lock_value
 
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 12c1cfb30e..fdb656fe13 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1935,4 +1935,10 @@ class BasicsTest < ActiveRecord::TestCase
     dev.update_attribute(:updated_at, nil)
     assert_match(/\/#{dev.id}$/, dev.cache_key)
   end
+
+  def test_uniq_delegates_to_scoped
+    scope = stub
+    Bird.stubs(:scoped).returns(mock(:uniq => scope))
+    assert_equal scope, Bird.uniq
+  end
 end
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index b23ead6feb..715a378431 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -20,7 +20,7 @@ module ActiveRecord
     end
 
     def test_single_values
-      assert_equal [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order].map(&:to_s).sort,
+      assert_equal [:limit, :offset, :lock, :readonly, :from, :reorder, :reverse_order, :uniq].map(&:to_s).sort,
         Relation::SINGLE_VALUE_METHODS.map(&:to_s).sort
     end
 
diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb
index 95408a5f29..bf1eb6386a 100644
--- a/activerecord/test/cases/relations_test.rb
+++ b/activerecord/test/cases/relations_test.rb
@@ -1148,4 +1148,20 @@ class RelationTest < ActiveRecord::TestCase
     assert_equal posts(:thinking), comments(:more_greetings).post
     assert_equal posts(:welcome),  comments(:greetings).post
   end
+
+  def test_uniq
+    tag1 = Tag.create(:name => 'Foo')
+    tag2 = Tag.create(:name => 'Foo')
+
+    query = Tag.select(:name).where(:id => [tag1.id, tag2.id])
+
+    assert_equal ['Foo', 'Foo'], query.map(&:name)
+    assert_sql(/DISTINCT/) do
+      assert_equal ['Foo'], query.uniq.map(&:name)
+    end
+    assert_sql(/DISTINCT/) do
+      assert_equal ['Foo'], query.uniq(true).map(&:name)
+    end
+    assert_equal ['Foo', 'Foo'], query.uniq(true).uniq(false).map(&:name)
+  end
 end
diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile
index 2e1f89cb78..0ad2644095 100644
--- a/railties/guides/source/active_record_querying.textile
+++ b/railties/guides/source/active_record_querying.textile
@@ -201,7 +201,7 @@ end
 
 But this approach becomes increasingly impractical as the table size increases, since +User.all.each+ instructs Active Record to fetch _the entire table_ in a single pass, build a model object per row, and then keep the entire array of model objects in memory. Indeed, if we have a large number of records, the entire collection may exceed the amount of memory available.
 
-Rails provides two methods that address this problem by dividing records into memory-friendly batches for processing. The first method, +find_each+, retrieves a batch of records and then yields _each_ record to the block individually as a model. The second method, +find_in_batches+, retrieves a batch of records and then yields _the entire batch_ to the block as an array of models. 
+Rails provides two methods that address this problem by dividing records into memory-friendly batches for processing. The first method, +find_each+, retrieves a batch of records and then yields _each_ record to the block individually as a model. The second method, +find_in_batches+, retrieves a batch of records and then yields _the entire batch_ to the block as an array of models.
 
 TIP: The +find_each+ and +find_in_batches+ methods are intended for use in the batch processing of a large number of records that wouldn't fit in memory all at once. If you just need to loop over a thousand records the regular find methods are the preferred option.
 
@@ -435,10 +435,26 @@ ActiveModel::MissingAttributeError: missing attribute: <attribute>
 
 Where +&lt;attribute&gt;+ is the attribute you asked for. The +id+ method will not raise the +ActiveRecord::MissingAttributeError+, so just be careful when working with associations because they need the +id+ method to function properly.
 
-You can also call SQL functions within the select option. For example, if you would like to only grab a single record per unique value in a certain field by using the +DISTINCT+ function you can do it like this:
+If you would like to only grab a single record per unique value in a certain field, you can use +uniq+:
 
 <ruby>
-Client.select("DISTINCT(name)")
+Client.select(:name).uniq
+</ruby>
+
+This would generate SQL like:
+
+<sql>
+SELECT DISTINCT name FROM clients
+</sql>
+
+You can also remove the uniqueness constraint:
+
+<ruby>
+query = Client.select(:name).uniq
+# => Returns unique names
+
+query.uniq(false)
+# => Returns all names, even if there are duplicates
 </ruby>
 
 h3. Limit and Offset
@@ -741,7 +757,7 @@ SELECT categories.* FROM categories
   INNER JOIN posts ON posts.category_id = categories.id
 </sql>
 
-Or, in English: "return a Category object for all categories with posts". Note that you will see duplicate categories if more than one post has the same category. If you want unique categories, you can use Category.joins(:post).select("distinct(categories.id)"). 
+Or, in English: "return a Category object for all categories with posts". Note that you will see duplicate categories if more than one post has the same category. If you want unique categories, you can use Category.joins(:post).select("distinct(categories.id)").
 
 h5. Joining Multiple Associations
 
-- 
cgit v1.2.3


From 9a111c7cf94d9e4614a0687345084cfe60a69187 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 4 Nov 2011 16:34:42 +0000
Subject: Use uniq instead of manually putting a DISTINCT in the query

---
 .../lib/active_record/associations/association_scope.rb  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb
index 6cc401e6cc..6f8b76abda 100644
--- a/activerecord/lib/active_record/associations/association_scope.rb
+++ b/activerecord/lib/active_record/associations/association_scope.rb
@@ -20,31 +20,19 @@ module ActiveRecord
         # It's okay to just apply all these like this. The options will only be present if the
         # association supports that option; this is enforced by the association builder.
         scope = scope.apply_finder_options(options.slice(
-          :readonly, :include, :order, :limit, :joins, :group, :having, :offset))
+          :readonly, :include, :order, :limit, :joins, :group, :having, :offset, :select))
 
         if options[:through] && !options[:include]
           scope = scope.includes(source_options[:include])
         end
 
-        if select = select_value
-          scope = scope.select(select)
-        end
+        scope = scope.uniq if options[:uniq]
 
         add_constraints(scope)
       end
 
       private
 
-      def select_value
-        select_value = options[:select]
-
-        if reflection.collection?
-          select_value ||= options[:uniq] && "DISTINCT #{reflection.quoted_table_name}.*"
-        end
-
-        select_value
-      end
-
       def add_constraints(scope)
         tables = construct_tables
 
-- 
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(+)

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 55621504b0d527393d2de86d15b5f40752825fde Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 5 Nov 2011 22:31:39 +0530
Subject: make class name consistent with the filename

---
 activesupport/test/flush_cache_on_private_memoization_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/test/flush_cache_on_private_memoization_test.rb b/activesupport/test/flush_cache_on_private_memoization_test.rb
index 20768b777a..bc488cc743 100644
--- a/activesupport/test/flush_cache_on_private_memoization_test.rb
+++ b/activesupport/test/flush_cache_on_private_memoization_test.rb
@@ -1,7 +1,7 @@
 require 'abstract_unit'
 require 'test/unit'
 
-class FlashCacheOnPrivateMemoizationTest < Test::Unit::TestCase
+class FlushCacheOnPrivateMemoizationTest < Test::Unit::TestCase
   ActiveSupport::Deprecation.silence do
     extend ActiveSupport::Memoizable
   end
-- 
cgit v1.2.3


From fb0bf3c984fb088b5e436b25e6e5ae042e99c523 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Mon, 31 Oct 2011 22:53:47 +0900
Subject: Fixed an issue id false option is ignored on mysql/mysql2 (fix #3440)

---
 activerecord/CHANGELOG.md                                   |  4 ++++
 .../connection_adapters/abstract_mysql_adapter.rb           | 13 +++++++++++--
 activerecord/test/cases/schema_dumper_test.rb               |  5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 2b46a6a869..0f224d69d2 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -67,6 +67,10 @@
 
     *Jon Leighton*
 
+*   MySQL: use the information_schema than the describe command when we look for a primary key. *GH #3440*
+
+    *Kenny J*
+
 ## Rails 3.1.1 (October 7, 2011) ##
 
 *   Add deprecation for the preload_associations method. Fixes #3022.
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index dd573ba569..e2075225f0 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -496,8 +496,17 @@ module ActiveRecord
 
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table)
-        execute_and_free("DESCRIBE #{quote_table_name(table)}", 'SCHEMA') do |result|
-          keys = each_hash(result).select { |row| row[:Key] == 'PRI' }.map { |row| row[:Field] }
+        sql = <<-SQL
+          SELECT t.constraint_type, k.column_name
+          FROM information_schema.table_constraints t
+          JOIN information_schema.key_column_usage k
+          USING (constraint_name, table_schema, table_name)
+          WHERE t.table_schema = DATABASE()
+            AND t.table_name   = '#{table}'
+        SQL
+
+        execute_and_free(sql, 'SCHEMA') do |result|
+          keys = each_hash(result).select { |row| row[:constraint_type] == 'PRIMARY KEY' }.map { |row| row[:column_name] }
           keys.length == 1 ? [keys.first, nil] : nil
         end
       end
diff --git a/activerecord/test/cases/schema_dumper_test.rb b/activerecord/test/cases/schema_dumper_test.rb
index 71ff727b7f..5c3a78688e 100644
--- a/activerecord/test/cases/schema_dumper_test.rb
+++ b/activerecord/test/cases/schema_dumper_test.rb
@@ -238,4 +238,9 @@ class SchemaDumperTest < ActiveRecord::TestCase
     assert_match %r(:id => false), match[1], "no table id not preserved"
     assert_match %r{t.string[[:space:]]+"id",[[:space:]]+:null => false$}, match[2], "non-primary key id column not preserved"
   end
+
+  def test_schema_dump_keeps_id_false_when_id_is_false_and_unique_not_null_column_added
+    output = standard_dump
+    assert_match %r{create_table "subscribers", :id => false}, output
+  end
 end
-- 
cgit v1.2.3


From f140445b1d2c4bf30bf5b0f28b9461773757b933 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 5 Nov 2011 17:21:58 +0000
Subject: Revert "Merge pull request #2378 from
 cesario/remove_warnings_activemodel"

This reverts commit 6aaae3de277b572f37e09f16ae12737c3c87dfb7, reversing
changes made to fdbc4e5f4e5746ebf558485348c841b33f038fda.

Reason: build failure.
---
 activemodel/test/cases/serializers/xml_serialization_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
index facbd73261..fc73d9dcd8 100644
--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
@@ -9,7 +9,6 @@ class Contact
 
   attr_accessor :address, :friends
 
-  remove_method :attributes
   def attributes
     instance_values.except("address", "friends")
   end
-- 
cgit v1.2.3


From b33232f1b2c3f92c7116adc4b4879a8afc07e70c Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 10:29:28 -0700
Subject: expands the documentation of AS::Notifications

---
 activesupport/lib/active_support/notifications.rb | 60 +++++++++++++++++------
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index b5a70d5933..89afe7b982 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -1,36 +1,68 @@
 module ActiveSupport
-  # Notifications provides an instrumentation API for Ruby. To instrument an
-  # action in Ruby you just need to do:
+  # = Notifications
   #
-  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
+  # +ActiveSupport::Notifications+ provides an instrumentation API for Ruby.
+  #
+  # == Instrumenters
+  #
+  # To instrument an event you just need to do:
+  #
+  #   ActiveSupport::Notifications.instrument("render", :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
+  # That executes the block first and notifies all subscribers once done.
+  #
+  # In the example above "render" is the name of the event, and the rest is called
+  # the _payload_. The payload is a mechanism that allows instrumenters to pass
+  # extra information to subscribers. Payloads consist of a hash whose contents
+  # are arbitrary and generally depend on the event.
+  #
+  # == Subscribers
+  #
   # You can consume those events and the information they provide by registering
-  # a log subscriber. For instance, let's store all instrumented events in an array:
+  # a subscriber. For instance, let's store all "render" events in an array:
   #
-  #   @events = []
+  #   events = []
   #
-  #   ActiveSupport::Notifications.subscribe do |*args|
-  #     @events << ActiveSupport::Notifications::Event.new(*args)
+  #   ActiveSupport::Notifications.subscribe("render") do |*args|
+  #     events << ActiveSupport::Notifications::Event.new(*args)
   #   end
   #
-  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
+  # That code returns right away, you are just subscribing to "render" events.
+  # The block will be called asynchronously whenever someone instruments "render":
+  #
+  #   ActiveSupport::Notifications.instrument("render", :extra => :information) do
   #     render :text => "Foo"
   #   end
   #
-  #   event = @events.first
-  #   event.name      # => :render
+  #   event = events.first
+  #   event.name      # => "render"
   #   event.duration  # => 10 (in milliseconds)
   #   event.payload   # => { :extra => :information }
   #
-  # When subscribing to Notifications, you can pass a pattern, to only consume
-  # events that match the pattern:
+  # The block in the +subscribe+ call gets the name of the event, start
+  # timestamp, end timestamp, a string with a unique identifier for that event
+  # (something like "535801666f04d0298cd6"), and a hash with the payload, in
+  # that order.
+  #
+  # If an exception happens during that particular instrumentation the payload will
+  # have a key +:exception+ with an array of two elements as value: a string with
+  # the name of the exception class, and the exception message.
+  #
+  # As the previous example depicts, the class +ActiveSupport::Notifications::Event+
+  # is able to take the arguments as they come and provide an object-oriented
+  # interface to that data.
   #
-  #   ActiveSupport::Notifications.subscribe(/render/) do |event|
-  #     @render_events << event
+  # You can also subscribe to all events whose name matches a certain regexp:
+  #
+  #   ActiveSupport::Notifications.subscribe(/render/) do |*args|
+  #     ...
   #   end
   #
+  # and even pass no argument to +subscribe+, in which case you are subscribing
+  # to all events.
+  #
   # Notifications ships with a queue implementation that consumes and publish events
   # to log subscribers in a thread. You can use any queue implementation you want.
   #
-- 
cgit v1.2.3


From d287e90870a9832c9d7e9d222881d3a6102bd04d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 12:02:54 -0700
Subject: implements AS::Notifications.subscribed, which provides subscriptions
 to events while a block runs

---
 activesupport/CHANGELOG.md                        |  2 ++
 activesupport/lib/active_support/notifications.rb | 41 +++++++++++++++++++++++
 activesupport/test/notifications_test.rb          | 20 +++++++++++
 3 files changed, 63 insertions(+)

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index ad3828d5e8..e03bfdee92 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   ActiveSupport::Notifications.subscribed provides subscriptions to events while a block runs. *fxn*
+
 *   Module#qualified_const_(defined?|get|set) are analogous to the corresponding methods
     in the standard API, but accept qualified constant names. *fxn*
 
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 89afe7b982..719f074948 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -63,6 +63,40 @@ module ActiveSupport
   # and even pass no argument to +subscribe+, in which case you are subscribing
   # to all events.
   #
+  # == Temporary Subscriptions
+  #
+  # Sometimes you do not want to subscribe to an event for the entire life of
+  # the application. There are two ways two unsubscribe.
+  #
+  # === Subscribe While a Block Runs
+  #
+  # You can subscribe to some event temporarily while some block runs. For
+  # example, in
+  #
+  #   callback = lambda {|*args| ... }
+  #   ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+  #     ...
+  #   end
+  #
+  # the callback will be called for all "sql.active_record" events instrumented
+  # during the execution of the block. The callback is unsubscribed automatically
+  # after that.
+  #
+  # === Manual Unsubscription
+  #
+  # The +subscribe+ method returns a subscriber object:
+  #
+  #   subscriber = ActiveSupport::Notifications.subscribe("render") do |*args|
+  #     ...
+  #   end
+  #
+  # To prevent that block from being called anymore, just unsubscribe passing
+  # that reference:
+  #
+  #   ActiveSupport::Notifications.unsubscribe(subscriber)
+  #
+  # == Default Queue
+  #
   # Notifications ships with a queue implementation that consumes and publish events
   # to log subscribers in a thread. You can use any queue implementation you want.
   #
@@ -94,6 +128,13 @@ module ActiveSupport
         end
       end
 
+      def subscribed(callback, *args, &block)
+        subscriber = subscribe(*args, &callback)
+        yield
+      ensure
+        unsubscribe(subscriber)
+      end
+
       def unsubscribe(args)
         notifier.unsubscribe(args)
         @instrumenters.clear
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index 884ee61547..fc9fa90d07 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -24,6 +24,26 @@ module Notifications
     end
   end
 
+  class SubscribedTest < TestCase
+    def test_subscribed
+      name     = "foo"
+      name2    = name * 2
+      expected = [name, name]
+
+      events   = []
+      callback = lambda {|*_| events << _.first}
+      ActiveSupport::Notifications.subscribed(callback, name) do
+        ActiveSupport::Notifications.instrument(name)
+        ActiveSupport::Notifications.instrument(name2)
+        ActiveSupport::Notifications.instrument(name)
+      end
+      assert_equal expected, events
+
+      ActiveSupport::Notifications.instrument(name)
+      assert_equal expected, events
+    end
+  end
+
   class UnsubscribeTest < TestCase
     def test_unsubscribing_removes_a_subscription
       @notifier.publish :foo
-- 
cgit v1.2.3


From 56f16e25e97fc23df9289abb2e1feb499e09d033 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Nov 2011 12:09:18 -0700
Subject: fixes typo

---
 activesupport/lib/active_support/notifications.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index 719f074948..f549d2fff3 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -66,7 +66,7 @@ module ActiveSupport
   # == Temporary Subscriptions
   #
   # Sometimes you do not want to subscribe to an event for the entire life of
-  # the application. There are two ways two unsubscribe.
+  # the application. There are two ways to unsubscribe.
   #
   # === Subscribe While a Block Runs
   #
-- 
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(-)

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 44e751fdd4bcb60bba667ec641a4febbf1133e0f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 5 Nov 2011 19:26:23 -0500
Subject: Add arel to Gemfile on apps generated in edge Rails

---
 railties/lib/rails/generators/app_base.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 10fdfdd8a9..0a79d6e86e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -139,11 +139,13 @@ module Rails
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :path => '#{Rails::Generators::RAILS_DEV_PATH}'
             gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         elsif options.edge?
           <<-GEMFILE.strip_heredoc
             gem 'rails',     :git => 'git://github.com/rails/rails.git'
             gem 'journey',   :git => 'git://github.com/rails/journey.git'
+            gem 'arel',      :git => 'git://github.com/rails/arel.git'
           GEMFILE
         else
           <<-GEMFILE.strip_heredoc
-- 
cgit v1.2.3


From e7b7b4412380e7ce2d8e6ae402cb7fe02d7666b8 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 20 Sep 2011 10:50:08 -0700
Subject: implements AR::Relation#explain

This is a first implementation, EXPLAIN is highly
dependent on the database and I have made some
compromises.

On one hand, the method allows you to run the most
common EXPLAIN and that's it. If you want EXPLAIN
ANALYZE in PostgreSQL you need to do it by hand.

On the other hand, I've tried to construct a string
as close as possible to the ones built by the
respective shells. The rationale is that IMO the
user should feel at home with the output and
recognize it at first sight. Per database.

I don't know whether this implementation is going
to work well. Let's see whether people like it.
---
 activerecord/CHANGELOG.md                          |  2 +
 .../connection_adapters/abstract_mysql_adapter.rb  | 75 ++++++++++++++++++++++
 .../connection_adapters/postgresql_adapter.rb      | 44 ++++++++++++-
 .../connection_adapters/sqlite_adapter.rb          | 19 ++++++
 activerecord/lib/active_record/relation.rb         | 16 +++++
 .../test/cases/adapters/mysql2/explain_test.rb     | 23 +++++++
 .../test/cases/adapters/postgresql/explain_test.rb | 25 ++++++++
 .../test/cases/adapters/sqlite3/explain_test.rb    | 23 +++++++
 .../guides/source/active_record_querying.textile   | 65 +++++++++++++++++++
 9 files changed, 291 insertions(+), 1 deletion(-)
 create mode 100644 activerecord/test/cases/adapters/mysql2/explain_test.rb
 create mode 100644 activerecord/test/cases/adapters/postgresql/explain_test.rb
 create mode 100644 activerecord/test/cases/adapters/sqlite3/explain_test.rb

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6b1cf4c841..a79f4df570 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Implemented ActiveRecord::Relation#explain. *fxn*
+
 *   Add ActiveRecord::Relation#uniq for generating unique queries.
 
     Before:
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 306b185c5e..1146323147 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -228,6 +228,80 @@ module ActiveRecord
 
       # DATABASE STATEMENTS ======================================
 
+      def explain(arel)
+        sql     = "EXPLAIN #{to_sql(arel)}"
+        start   = Time.now
+        result  = exec_query(sql, 'EXPLAIN')
+        elapsed = Time.now - start
+
+        ExplainPrettyPrinter.new.pp(result, elapsed)
+      end
+
+      class ExplainPrettyPrinter # :nodoc:
+        # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
+        # MySQL shell:
+        #
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
+        #   |  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
+        #   +----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+        #   2 rows in set (0.00 sec)
+        #
+        # This is an exercise in Ruby hyperrealism :).
+        def pp(result, elapsed)
+          widths    = compute_column_widths(result)
+          separator = build_separator(widths)
+
+          pp = []
+
+          pp << separator
+          pp << build_cells(result.columns, widths)
+          pp << separator
+
+          result.rows.each do |row|
+            pp << build_cells(row, widths)
+          end
+
+          pp << separator
+          pp << build_footer(result.rows.length, elapsed)
+
+          pp.join("\n") + "\n"
+        end
+
+        private
+
+        def compute_column_widths(result)
+          [].tap do |widths|
+            result.columns.each_with_index do |column, i|
+              cells_in_column = [column] + result.rows.map {|r| r[i].nil? ? 'NULL' : r[i].to_s}
+              widths << cells_in_column.map(&:length).max
+            end
+          end
+        end
+
+        def build_separator(widths)
+          # Each cell has one char of padding at both sides, that's why we add 2.
+          '+' + widths.map {|w| '-' * (w + 2)}.join('+')
+        end
+
+        def build_cells(items, widths)
+          cells = []
+          items.each_with_index do |item, i|
+            item = 'NULL' if item.nil?
+            justifier = item.is_a?(Numeric) ? 'rjust' : 'ljust'
+            cells << item.to_s.send(justifier, widths[i])
+          end
+          '| ' + cells.join(' | ') + ' |'
+        end
+
+        def build_footer(nrows, elapsed)
+          rows_label = nrows == 1 ? 'row' : 'rows'
+          "#{nrows} #{rows_label} in set (%.2f sec)" % elapsed
+        end
+      end
+
       # Executes the SQL statement in the context of this connection.
       def execute(sql, name = nil)
         if name == :skip_logging
@@ -290,6 +364,7 @@ module ActiveRecord
       # these, we must use a subquery. However, MySQL is too stupid to create a
       # temporary table for this automatically, so we have to give it some prompting
       # in the form of a subsubquery. Ugh!
+
       def join_to_update(update, select) #:nodoc:
         if select.limit || select.offset || select.orders.any?
           subsubselect = select.clone
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 15e329a1c8..44c2fa439c 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -517,6 +517,48 @@ module ActiveRecord
 
       # DATABASE STATEMENTS ======================================
 
+      def explain(arel)
+        sql = "EXPLAIN #{to_sql(arel)}"
+        ExplainPrettyPrinter.new.pp(exec_query(sql))
+      end
+
+      class ExplainPrettyPrinter # :nodoc:
+        # Pretty prints the result of a EXPLAIN in a way that resembles the output of the
+        # PostgreSQL shell:
+        #
+        #                                     QUERY PLAN
+        #   ------------------------------------------------------------------------------
+        #    Nested Loop Left Join  (cost=0.00..37.24 rows=8 width=0)
+        #      Join Filter: (posts.user_id = users.id)
+        #      ->  Index Scan using users_pkey on users  (cost=0.00..8.27 rows=1 width=4)
+        #            Index Cond: (id = 1)
+        #      ->  Seq Scan on posts  (cost=0.00..28.88 rows=8 width=4)
+        #            Filter: (posts.user_id = 1)
+        #   (6 rows)
+        #
+        def pp(result)
+          header = result.columns.first
+          lines  = result.rows.map(&:first)
+
+          # We add 2 because there's one char of padding at both sides, note
+          # the extra hyphens in the example above.
+          width = [header, *lines].map(&:length).max + 2
+
+          pp = []
+
+          pp << header.center(width).rstrip
+          pp << '-' * width
+
+          pp += lines.map {|line| " #{line}"}
+
+          nrows = result.rows.length
+          rows_label = nrows == 1 ? 'row' : 'rows'
+          pp << "(#{nrows} #{rows_label})"
+
+          pp.join("\n") + "\n"
+        end
+      end
+
       # Executes a SELECT query and returns an array of rows. Each row is an
       # array of field values.
       def select_rows(sql, name = nil)
@@ -836,7 +878,7 @@ module ActiveRecord
 
       # Returns the active schema search path.
       def schema_search_path
-        @schema_search_path ||= query('SHOW search_path')[0][0]
+        @schema_search_path ||= query('SHOW search_path', 'SCHEMA')[0][0]
       end
 
       # Returns the current client message level.
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index caecbc9b3a..35df0a1542 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -222,6 +222,25 @@ module ActiveRecord
 
       # DATABASE STATEMENTS ======================================
 
+      def explain(arel)
+        sql = "EXPLAIN QUERY PLAN #{to_sql(arel)}"
+        ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN'))
+      end
+
+      class ExplainPrettyPrinter
+        # Pretty prints the result of a EXPLAIN QUERY PLAN in a way that resembles
+        # the output of the SQLite shell:
+        #
+        #   0|0|0|SEARCH TABLE users USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)
+        #   0|1|1|SCAN TABLE posts (~100000 rows)
+        #
+        def pp(result) # :nodoc:
+          result.rows.map do |row|
+            row.join('|')
+          end.join("\n") + "\n"
+        end
+      end
+
       def exec_query(sql, name = nil, binds = [])
         log(sql, name, binds) do
 
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 3baf9b3f49..f0891440a6 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -143,6 +143,22 @@ module ActiveRecord
         super
     end
 
+    def explain
+      queries = []
+      callback = lambda do |*args|
+        payload = args.last
+        queries << payload[:sql] unless payload[:exception] || %w(SCHEMA EXPLAIN).include?(payload[:name])
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        to_a
+      end
+
+      queries.map do |sql|
+        @klass.connection.explain(sql)
+      end.join
+    end
+
     def to_a
       return @records if loaded?
 
diff --git a/activerecord/test/cases/adapters/mysql2/explain_test.rb b/activerecord/test/cases/adapters/mysql2/explain_test.rb
new file mode 100644
index 0000000000..8ea777b72b
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql2/explain_test.rb
@@ -0,0 +1,23 @@
+require "cases/helper"
+require 'models/developer'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class Mysql2Adapter
+      class ExplainTest < ActiveRecord::TestCase
+        fixtures :developers
+
+        def test_explain_for_one_query
+          explain = Developer.where(:id => 1).explain
+          assert_match %(developers | const), explain
+        end
+
+        def test_explain_with_eager_loading
+          explain = Developer.where(:id => 1).includes(:audit_logs).explain
+          assert_match %(developers | const), explain
+          assert_match %(audit_logs | ALL), explain
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/adapters/postgresql/explain_test.rb b/activerecord/test/cases/adapters/postgresql/explain_test.rb
new file mode 100644
index 0000000000..0d599ed37f
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/explain_test.rb
@@ -0,0 +1,25 @@
+require "cases/helper"
+require 'models/developer'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter
+      class ExplainTest < ActiveRecord::TestCase
+        fixtures :developers
+
+        def test_explain_for_one_query
+          explain = Developer.where(:id => 1).explain
+          assert_match %(QUERY PLAN), explain
+          assert_match %(Index Scan using developers_pkey on developers), explain
+        end
+
+        def test_explain_with_eager_loading
+          explain = Developer.where(:id => 1).includes(:audit_logs).explain
+          assert_match %(QUERY PLAN), explain
+          assert_match %(Index Scan using developers_pkey on developers), explain
+          assert_match %(Seq Scan on audit_logs), explain
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/adapters/sqlite3/explain_test.rb b/activerecord/test/cases/adapters/sqlite3/explain_test.rb
new file mode 100644
index 0000000000..97be9f14e9
--- /dev/null
+++ b/activerecord/test/cases/adapters/sqlite3/explain_test.rb
@@ -0,0 +1,23 @@
+require "cases/helper"
+require 'models/developer'
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SQLite3Adapter
+      class ExplainTest < ActiveRecord::TestCase
+        fixtures :developers
+
+        def test_explain_for_one_query
+          explain = Developer.where(:id => 1).explain
+          assert_match %(SEARCH TABLE developers USING INTEGER PRIMARY KEY), explain
+        end
+
+        def test_explain_with_eager_loading
+          explain = Developer.where(:id => 1).includes(:audit_logs).explain
+          assert_match %(SEARCH TABLE developers USING INTEGER PRIMARY KEY), explain
+          assert_match %(SCAN TABLE audit_logs), explain
+        end
+      end
+    end
+  end
+end
diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile
index 0ad2644095..a132d85ef9 100644
--- a/railties/guides/source/active_record_querying.textile
+++ b/railties/guides/source/active_record_querying.textile
@@ -8,6 +8,7 @@ This guide covers different ways to retrieve data from the database using Active
 * Use dynamic finders methods
 * Check for the existence of particular records
 * Perform various calculations on Active Record models
+* Run EXPLAIN on relations
 
 endprologue.
 
@@ -1274,3 +1275,67 @@ Client.sum("orders_count")
 </ruby>
 
 For options, please see the parent section, "Calculations":#calculations.
+
+h3. Running EXPLAIN
+
+You can run EXPLAIN on the queries triggered by relations. For example,
+
+<ruby>
+User.where(:id => 1).joins(:posts).explain
+</ruby>
+
+may yield
+
+<plain>
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+| id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+|  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
+|  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+2 rows in set (0.00 sec)
+</plain>
+
+under MySQL.
+
+Active Record performs a pretty printing that emulates the one of the database
+shells. So, the same query running with the PostreSQL adapter would yield instead
+
+<plain>
+                                  QUERY PLAN
+------------------------------------------------------------------------------
+ Nested Loop Left Join  (cost=0.00..37.24 rows=8 width=0)
+   Join Filter: (posts.user_id = users.id)
+   ->  Index Scan using users_pkey on users  (cost=0.00..8.27 rows=1 width=4)
+         Index Cond: (id = 1)
+   ->  Seq Scan on posts  (cost=0.00..28.88 rows=8 width=4)
+         Filter: (posts.user_id = 1)
+(6 rows)
+</plain>
+
+Eager loading may trigger more than one query under the hood, and some queries
+may need the results of previous ones. Because of that, +explain+ actually
+executes the query, and then asks for the query plans. For example,
+
+<ruby>
+User.where(:id => 1).includes(:posts).explain
+</ruby>
+
+yields
+
+<plain>
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
+| id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra |
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
+|  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |       |
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
+1 row in set (0.00 sec)
++----+-------------+-------+------+---------------+------+---------+------+------+-------------
+| id | select_type | table | type | possible_keys | key  | key_len | ref  | rows | Extra       |
++----+-------------+-------+------+---------------+------+---------+------+------+-------------
+|  1 | SIMPLE      | posts | ALL  | NULL          | NULL | NULL    | NULL |    1 | Using where |
++----+-------------+-------+------+---------------+------+---------+------+------+-------------
+1 row in set (0.00 sec)
+</plain>
+
+under MySQL.
-- 
cgit v1.2.3


From c7d20785965d5f0877d0c13d0d9929f2fce50a8b Mon Sep 17 00:00:00 2001
From: Justin Mazzi <hh@mailheist.com>
Date: Sat, 5 Nov 2011 22:36:19 -0400
Subject: Update ActiveRecord#attribute_present? to work as documented

"Returns true if the specified attribute has been set by the user or by
a database load and is neither nil nor empty?"

Fixes #1613
---
 activerecord/lib/active_record/base.rb            |  3 ++-
 activerecord/test/cases/attribute_methods_test.rb | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 455b299270..feeebb7131 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1771,7 +1771,8 @@ MSG
       # Returns true if the specified +attribute+ has been set by the user or by a database load and is neither
       # nil nor empty? (the latter only applies to objects that respond to empty?, most notably Strings).
       def attribute_present?(attribute)
-        !_read_attribute(attribute).blank?
+        value = _read_attribute(attribute)
+        !value.nil? || (value.respond_to?(:empty?) && !value.empty?)
       end
 
       # Returns the column object for the named attribute.
diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb
index b1b41fed0d..9300c57819 100644
--- a/activerecord/test/cases/attribute_methods_test.rb
+++ b/activerecord/test/cases/attribute_methods_test.rb
@@ -35,6 +35,24 @@ class AttributeMethodsTest < ActiveRecord::TestCase
     assert !t.attribute_present?("content")
   end
 
+  def test_attribute_present_with_booleans
+    b1 = Boolean.new
+    b1.value = false
+    assert b1.attribute_present?(:value)
+
+    b2 = Boolean.new
+    b2.value = true
+    assert b2.attribute_present?(:value)
+
+    b3 = Boolean.new
+    assert !b3.attribute_present?(:value)
+
+    b4 = Boolean.new
+    b4.value = false
+    b4.save!
+    assert Boolean.find(b4.id).attribute_present?(:value)
+  end
+
   def test_attribute_keys_on_new_instance
     t = Topic.new
     assert_equal nil, t.title, "The topics table has a title column, so it should be nil"
-- 
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(-)

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 52fa34faee76ca54b1b394ea3a25dfee42491c22 Mon Sep 17 00:00:00 2001
From: Henrik Hodne <dvyjones@dvyjones.com>
Date: Sun, 6 Nov 2011 11:13:51 +0100
Subject: Refactored pluralize and singularize into a common method.

See diff discussion on rails/#3536.
---
 .../lib/active_support/inflector/methods.rb        | 34 ++++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index e76ee60dd7..9eba02b6f0 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -21,14 +21,7 @@ module ActiveSupport
     #   "words".pluralize            # => "words"
     #   "CamelOctopus".pluralize     # => "CamelOctopi"
     def pluralize(word)
-      result = word.to_s.dup
-
-      if word.empty? || inflections.uncountables.include?(result.downcase)
-        result
-      else
-        inflections.plurals.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-        result
-      end
+      apply_inflections(word, inflections.plurals)
     end
 
     # The reverse of +pluralize+, returns the singular form of a word in a string.
@@ -40,14 +33,7 @@ module ActiveSupport
     #   "word".singularize             # => "word"
     #   "CamelOctopi".singularize      # => "CamelOctopus"
     def singularize(word)
-      result = word.to_s.dup
-
-      if inflections.uncountables.any? { |inflection| result =~ /\b(#{inflection})\Z/i }
-        result
-      else
-        inflections.singulars.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
-        result
-      end
+      apply_inflections(word, inflections.singulars)
     end
 
     # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
@@ -311,5 +297,21 @@ module ActiveSupport
         part.empty? ? acc : "#{part}(::#{acc})?"
       end
     end
+
+    # Applies inflection rules for +singluralize+ and +pluralize+.
+    #
+    # Examples:
+    #  apply_inflections("post", inflections.plurals) # => "posts"
+    #  apply_inflections("posts", inflections.singulars) # => "post"
+    def apply_inflections(word, rules)
+      result = word.to_s.dup
+
+      if word.empty? || inflections.uncountables.any? { |inflection| result =~ /\b#{inflection}\Z/i }
+        result
+      else
+        rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
+        result
+      end
+    end
   end
 end
-- 
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(-)

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

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(-)

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 8750c9a1cfb055fb45a798fee952953b6db829ad Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 6 Nov 2011 18:58:55 +0530
Subject: fix markups for plus in AR guide

---
 .../guides/source/active_record_querying.textile     | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile
index a132d85ef9..8526d8511b 100644
--- a/railties/guides/source/active_record_querying.textile
+++ b/railties/guides/source/active_record_querying.textile
@@ -1287,19 +1287,19 @@ User.where(:id => 1).joins(:posts).explain
 may yield
 
 <plain>
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
 | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra       |
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
 |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |             |
 |  1 | SIMPLE      | posts | ALL   | NULL          | NULL    | NULL    | NULL  |    1 | Using where |
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------------+
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------------<plus>
 2 rows in set (0.00 sec)
 </plain>
 
 under MySQL.
 
 Active Record performs a pretty printing that emulates the one of the database
-shells. So, the same query running with the PostreSQL adapter would yield instead
+shells. So, the same query running with the PostgreSQL adapter would yield instead
 
 <plain>
                                   QUERY PLAN
@@ -1324,17 +1324,17 @@ User.where(:id => 1).includes(:posts).explain
 yields
 
 <plain>
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------
 | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra |
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------
 |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |       |
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
+<plus>----<plus>-------------<plus>-------<plus>-------<plus>---------------<plus>---------<plus>---------<plus>-------<plus>------<plus>-------
 1 row in set (0.00 sec)
-+----+-------------+-------+------+---------------+------+---------+------+------+-------------
+<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------
 | id | select_type | table | type | possible_keys | key  | key_len | ref  | rows | Extra       |
-+----+-------------+-------+------+---------------+------+---------+------+------+-------------
+<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------
 |  1 | SIMPLE      | posts | ALL  | NULL          | NULL | NULL    | NULL |    1 | Using where |
-+----+-------------+-------+------+---------------+------+---------+------+------+-------------
+<plus>----<plus>-------------<plus>-------<plus>------<plus>---------------<plus>------<plus>---------<plus>------<plus>------<plus>-------------
 1 row in set (0.00 sec)
 </plain>
 
-- 
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(-)

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 1934b774067572d9ad298d774ad96ee45a431911 Mon Sep 17 00:00:00 2001
From: Pavan Kumar Sunkara <pavan.sss1991@gmail.com>
Date: Sun, 6 Nov 2011 19:22:32 +0530
Subject: Added the test case for #3537

---
 activesupport/test/inflector_test_cases.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index 0cb1f70657..e3a343af52 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -14,6 +14,7 @@ module InflectorTestCases
     "fish"        => "fish",
     "jeans"       => "jeans",
     "funky jeans" => "funky jeans",
+    "my money"    => "my money",
 
     "category"    => "categories",
     "query"       => "queries",
-- 
cgit v1.2.3


From 9b46613780dcd0aa49abf49877baea274040c0b2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 6 Nov 2011 08:15:34 -0800
Subject: Merge pull request #3521 from
 nulogy/fix_postgres_adapter_to_handle_spaces_between_schemas

Fix postgres adapter to handle spaces between schemas
---
 .../lib/active_record/connection_adapters/postgresql_adapter.rb       | 3 +--
 activerecord/test/cases/adapters/postgresql/schema_test.rb            | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 44c2fa439c..b7918c7f07 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -800,7 +800,6 @@ module ActiveRecord
 
       # Returns an array of indexes for the given table.
       def indexes(table_name, name = nil)
-         schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
          result = query(<<-SQL, name)
            SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid
            FROM pg_class t
@@ -809,7 +808,7 @@ module ActiveRecord
            WHERE i.relkind = 'i'
              AND d.indisprimary = 'f'
              AND t.relname = '#{table_name}'
-             AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname IN (#{schemas}) )
+             AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname = ANY (current_schemas(false)) )
           ORDER BY i.relname
         SQL
 
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 657527137a..19669bdeb0 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -196,6 +196,10 @@ class SchemaTest < ActiveRecord::TestCase
     do_dump_index_tests_for_schema(SCHEMA2_NAME, INDEX_A_COLUMN, INDEX_B_COLUMN_S2, INDEX_D_COLUMN)
   end
 
+  def test_dump_indexes_for_schema_multiple_schemas_in_search_path
+    do_dump_index_tests_for_schema("public, #{SCHEMA_NAME}", INDEX_A_COLUMN, INDEX_B_COLUMN_S1)
+  end
+
   def test_with_uppercase_index_name
     ActiveRecord::Base.connection.execute "CREATE INDEX \"things_Index\" ON #{SCHEMA_NAME}.things (name)"
     assert_nothing_raised { ActiveRecord::Base.connection.remove_index! "things", "#{SCHEMA_NAME}.things_Index"}
-- 
cgit v1.2.3


From 4db1bd37cb017e983e5381ae1bec5d969b6eb253 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 6 Nov 2011 22:03:06 +0530
Subject: fix typo

---
 activesupport/lib/active_support/inflector/methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 9eba02b6f0..282f46a836 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -298,7 +298,7 @@ module ActiveSupport
       end
     end
 
-    # Applies inflection rules for +singluralize+ and +pluralize+.
+    # Applies inflection rules for +singuralize+ and +pluralize+.
     #
     # Examples:
     #  apply_inflections("post", inflections.plurals) # => "posts"
-- 
cgit v1.2.3


From 9a7d916ceb6ca20547f62d2a809feae4f44e402b Mon Sep 17 00:00:00 2001
From: Henrik Hodne <dvyjones@dvyjones.com>
Date: Sun, 6 Nov 2011 17:35:02 +0100
Subject: Removed argument throwing warnings when running tests.

The last argument to DateTime.new/civil is the Julian day number for
when the calendar reform occured. DateTime ignores it if it's 0, and
sets it to the default of DateTime::ITALY instead, so we could just
leave it out. This also removes the warnings while running the
ActiveSupport tests (there still are some for the setup though).
---
 activesupport/test/core_ext/date_time_ext_test.rb |  6 +++---
 activesupport/test/core_ext/time_ext_test.rb      | 26 +++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 456736cbad..9be28272f7 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -34,8 +34,8 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
   end
 
   def test_to_time
-    assert_equal Time.utc(2005, 2, 21, 10, 11, 12), DateTime.new(2005, 2, 21, 10, 11, 12, 0, 0).to_time
-    assert_equal Time.utc_time(2039, 2, 21, 10, 11, 12), DateTime.new(2039, 2, 21, 10, 11, 12, 0, 0).to_time
+    assert_equal Time.utc(2005, 2, 21, 10, 11, 12), DateTime.new(2005, 2, 21, 10, 11, 12, 0).to_time
+    assert_equal Time.utc_time(2039, 2, 21, 10, 11, 12), DateTime.new(2039, 2, 21, 10, 11, 12, 0).to_time
     # DateTimes with offsets other than 0 are returned unaltered
     assert_equal DateTime.new(2005, 2, 21, 10, 11, 12, Rational(-5, 24)), DateTime.new(2005, 2, 21, 10, 11, 12, Rational(-5, 24)).to_time
     # Fractional seconds are preserved
@@ -99,7 +99,7 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2005,5,1,10), DateTime.civil(2005,6,5,10,0,0).weeks_ago(5)
     assert_equal DateTime.civil(2005,4,24,10), DateTime.civil(2005,6,5,10,0,0).weeks_ago(6)
     assert_equal DateTime.civil(2005,2,27,10),  DateTime.civil(2005,6,5,10,0,0).weeks_ago(14)
-    assert_equal DateTime.civil(2004,12,25,10),  DateTime.civil(2005,1,1,10,0,0).weeks_ago(1)    
+    assert_equal DateTime.civil(2004,12,25,10),  DateTime.civil(2005,1,1,10,0,0).weeks_ago(1)
   end
 
   def test_months_ago
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index ab9be4b18b..a1e088a28d 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -135,7 +135,7 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2005,5,1,10), Time.local(2005,6,5,10,0,0).weeks_ago(5)
     assert_equal Time.local(2005,4,24,10), Time.local(2005,6,5,10,0,0).weeks_ago(6)
     assert_equal Time.local(2005,2,27,10),  Time.local(2005,6,5,10,0,0).weeks_ago(14)
-    assert_equal Time.local(2004,12,25,10),  Time.local(2005,1,1,10,0,0).weeks_ago(1)    
+    assert_equal Time.local(2004,12,25,10),  Time.local(2005,1,1,10,0,0).weeks_ago(1)
   end
 
   def test_months_ago
@@ -479,7 +479,7 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
       assert_equal Time.local(2006,10,30), Time.local(2006,11,6,0,0,0).prev_week
       assert_equal Time.local(2006,11,15), Time.local(2006,11,23,0,0,0).prev_week(:wednesday)
     end
-  end    
+  end
 
   def test_next_week
     with_env_tz 'US/Eastern' do
@@ -538,12 +538,12 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
   end
 
   def test_to_datetime
-    assert_equal Time.utc(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, 0, 0)
+    assert_equal Time.utc(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, 0)
     with_env_tz 'US/Eastern' do
-      assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400), 0)
+      assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400))
     end
     with_env_tz 'NZ' do
-      assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400), 0)
+      assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400))
     end
     assert_equal ::Date::ITALY, Time.utc(2005, 2, 21, 17, 44, 30).to_datetime.start # use Ruby's default start value
   end
@@ -592,11 +592,11 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
   def test_time_with_datetime_fallback
     assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30), Time.utc(2005, 2, 21, 17, 44, 30)
     assert_equal Time.time_with_datetime_fallback(:local, 2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
-    assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
-    assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
-    assert_equal Time.time_with_datetime_fallback(:utc, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, 0, 0)
+    assert_equal Time.time_with_datetime_fallback(:utc, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0)
+    assert_equal Time.time_with_datetime_fallback(:local, 2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset)
+    assert_equal Time.time_with_datetime_fallback(:utc, 1900, 2, 21, 17, 44, 30), DateTime.civil(1900, 2, 21, 17, 44, 30, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 2005), Time.utc(2005)
-    assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0, 0)
+    assert_equal Time.time_with_datetime_fallback(:utc, 2039), DateTime.civil(2039, 1, 1, 0, 0, 0, 0)
     assert_equal Time.time_with_datetime_fallback(:utc, 2005, 2, 21, 17, 44, 30, 1), Time.utc(2005, 2, 21, 17, 44, 30, 1) #with usec
     # This won't overflow on 64bit linux
     unless time_is_64bits?
@@ -616,16 +616,16 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
 
   def test_utc_time
     assert_equal Time.utc_time(2005, 2, 21, 17, 44, 30), Time.utc(2005, 2, 21, 17, 44, 30)
-    assert_equal Time.utc_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0, 0)
-    assert_equal Time.utc_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, 0, 0)
+    assert_equal Time.utc_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, 0)
+    assert_equal Time.utc_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, 0)
   end
 
   def test_local_time
     assert_equal Time.local_time(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30)
-    assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
+    assert_equal Time.local_time(2039, 2, 21, 17, 44, 30), DateTime.civil(2039, 2, 21, 17, 44, 30, DateTime.local_offset)
 
     unless time_is_64bits?
-      assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset, 0)
+      assert_equal Time.local_time(1901, 2, 21, 17, 44, 30), DateTime.civil(1901, 2, 21, 17, 44, 30, DateTime.local_offset)
     end
   end
 
-- 
cgit v1.2.3


From 55b203dac1eb4b3430b313112b8d5a53b1016b4e Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 7 Nov 2011 11:56:50 +0900
Subject: self.up, self.down => up, down

---
 activerecord/README.rdoc                                             | 4 ++--
 activerecord/lib/active_record/base.rb                               | 4 ++--
 .../active_record/connection_adapters/abstract/schema_definitions.rb | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc
index b5db57569c..70922ef864 100644
--- a/activerecord/README.rdoc
+++ b/activerecord/README.rdoc
@@ -150,7 +150,7 @@ A short rundown of some of the major features:
 * Database agnostic schema management with Migrations.
 
     class AddSystemSettings < ActiveRecord::Migration
-      def self.up
+      def up
         create_table :system_settings do |t|
           t.string  :name
           t.string  :label
@@ -162,7 +162,7 @@ A short rundown of some of the major features:
         SystemSetting.create :name => "notice", :label => "Use notice?", :value => 1
       end
 
-      def self.down
+      def down
         drop_table :system_settings
       end
     end
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index feeebb7131..3558ae3545 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -760,7 +760,7 @@ module ActiveRecord #:nodoc:
       # values, eg:
       #
       #  class CreateJobLevels < ActiveRecord::Migration
-      #    def self.up
+      #    def up
       #      create_table :job_levels do |t|
       #        t.integer :id
       #        t.string :name
@@ -774,7 +774,7 @@ module ActiveRecord #:nodoc:
       #      end
       #    end
       #
-      #    def self.down
+      #    def down
       #      drop_table :job_levels
       #    end
       #  end
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 3f69f75565..6f135b56b5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -46,13 +46,13 @@ module ActiveRecord
     # +change_table+ is actually of this type:
     #
     #   class SomeMigration < ActiveRecord::Migration
-    #     def self.up
+    #     def up
     #       create_table :foo do |t|
     #         puts t.class  # => "ActiveRecord::ConnectionAdapters::TableDefinition"
     #       end
     #     end
     #
-    #     def self.down
+    #     def down
     #       ...
     #     end
     #   end
@@ -479,4 +479,3 @@ module ActiveRecord
 
   end
 end
-
-- 
cgit v1.2.3


From aff9e68cb5996c95bc5c7304d996343ea2382d3b Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 7 Nov 2011 14:03:33 +0900
Subject: document fix: remove_column takes multiple column_names

---
 activerecord/lib/active_record/migration.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index 2fb1b8f7a3..d70c7d1d34 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -112,8 +112,8 @@ module ActiveRecord
   #   a column but keeps the type and content.
   # * <tt>change_column(table_name, column_name, type, options)</tt>:  Changes
   #   the column to a different type using the same parameters as add_column.
-  # * <tt>remove_column(table_name, column_name)</tt>: Removes the column named
-  #   +column_name+ from the table called +table_name+.
+  # * <tt>remove_column(table_name, column_names)</tt>: Removes the column listed in
+  #   +column_names+ from the table called +table_name+.
   # * <tt>add_index(table_name, column_names, options)</tt>: Adds a new index
   #   with the name of the column. Other options include
   #   <tt>:name</tt>, <tt>:unique</tt> (e.g.
-- 
cgit v1.2.3


From 42cf5eba260f97e6da0ef66b954d95b9e7c2b102 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 7 Nov 2011 14:31:12 +0900
Subject: Remove redundant blank line at the bottom

---
 railties/lib/rails/generators/rails/controller/templates/controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb
index 8f5f78556f..52243f4a2f 100644
--- a/railties/lib/rails/generators/rails/controller/templates/controller.rb
+++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb
@@ -3,7 +3,7 @@ class <%= class_name %>Controller < ApplicationController
 <% actions.each do |action| -%>
   def <%= action %>
   end
-
+<%= "\n" unless action == actions.last -%>
 <% end -%>
 end
 <% end -%>
-- 
cgit v1.2.3


From b454601be403bd58af4a93b459f98ff4e2d211ea Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 6 Nov 2011 22:21:05 -0800
Subject: revises EXPLAIN tests for SQLite3

The output in Travis is a bit different. The SQLite
documentation (http://www.sqlite.org/eqp.html) warns
output may change dramatically between releases. I
do not want to mock the result set because I want a
real EXPLAIN to happen. I prefer a test that may fail
in future releases than a test that may give false
positives in future releases.
---
 activerecord/test/cases/adapters/sqlite3/explain_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/activerecord/test/cases/adapters/sqlite3/explain_test.rb b/activerecord/test/cases/adapters/sqlite3/explain_test.rb
index 97be9f14e9..e18892821d 100644
--- a/activerecord/test/cases/adapters/sqlite3/explain_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/explain_test.rb
@@ -9,13 +9,13 @@ module ActiveRecord
 
         def test_explain_for_one_query
           explain = Developer.where(:id => 1).explain
-          assert_match %(SEARCH TABLE developers USING INTEGER PRIMARY KEY), explain
+          assert_match(/(SEARCH )?TABLE developers USING (INTEGER )?PRIMARY KEY/, explain)
         end
 
         def test_explain_with_eager_loading
           explain = Developer.where(:id => 1).includes(:audit_logs).explain
-          assert_match %(SEARCH TABLE developers USING INTEGER PRIMARY KEY), explain
-          assert_match %(SCAN TABLE audit_logs), explain
+          assert_match(/(SEARCH )?TABLE developers USING (INTEGER )?PRIMARY KEY/, explain)
+          assert_match(/(SCAN )?TABLE audit_logs/, explain)
         end
       end
     end
-- 
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(-)

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 17ecdd388c70f7faf002ef21be6a674b4c0df7ca Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 7 Nov 2011 02:01:37 -0800
Subject: adds trailing +s to the output of EXPLAIN for MySQL

---
 .../connection_adapters/abstract_mysql_adapter.rb            |  5 ++---
 railties/guides/source/active_record_querying.textile        | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 1146323147..baf4c043c4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -282,8 +282,8 @@ module ActiveRecord
         end
 
         def build_separator(widths)
-          # Each cell has one char of padding at both sides, that's why we add 2.
-          '+' + widths.map {|w| '-' * (w + 2)}.join('+')
+          padding = 1
+          '+' + widths.map {|w| '-' * (w + (padding*2))}.join('+') + '+'
         end
 
         def build_cells(items, widths)
@@ -364,7 +364,6 @@ module ActiveRecord
       # these, we must use a subquery. However, MySQL is too stupid to create a
       # temporary table for this automatically, so we have to give it some prompting
       # in the form of a subsubquery. Ugh!
-
       def join_to_update(update, select) #:nodoc:
         if select.limit || select.offset || select.orders.any?
           subsubselect = select.clone
diff --git a/railties/guides/source/active_record_querying.textile b/railties/guides/source/active_record_querying.textile
index a132d85ef9..ad623ae434 100644
--- a/railties/guides/source/active_record_querying.textile
+++ b/railties/guides/source/active_record_querying.textile
@@ -1324,17 +1324,17 @@ User.where(:id => 1).includes(:posts).explain
 yields
 
 <plain>
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------+
 | id | select_type | table | type  | possible_keys | key     | key_len | ref   | rows | Extra |
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------+
 |  1 | SIMPLE      | users | const | PRIMARY       | PRIMARY | 4       | const |    1 |       |
-+----+-------------+-------+-------+---------------+---------+---------+-------+------+-------
++----+-------------+-------+-------+---------------+---------+---------+-------+------+-------+
 1 row in set (0.00 sec)
-+----+-------------+-------+------+---------------+------+---------+------+------+-------------
++----+-------------+-------+------+---------------+------+---------+------+------+-------------+
 | id | select_type | table | type | possible_keys | key  | key_len | ref  | rows | Extra       |
-+----+-------------+-------+------+---------------+------+---------+------+------+-------------
++----+-------------+-------+------+---------------+------+---------+------+------+-------------+
 |  1 | SIMPLE      | posts | ALL  | NULL          | NULL | NULL    | NULL |    1 | Using where |
-+----+-------------+-------+------+---------------+------+---------+------+------+-------------
++----+-------------+-------+------+---------------+------+---------+------+------+-------------+
 1 row in set (0.00 sec)
 </plain>
 
-- 
cgit v1.2.3


From 4cef581fcf83f161edcd681bbda1461d5f7d5f33 Mon Sep 17 00:00:00 2001
From: Anand <lucky.developer@gmail.com>
Date: Mon, 7 Nov 2011 16:22:30 +0530
Subject: replaced remove and define method calls to :redefine

---
 activemodel/lib/active_model/observing.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/activemodel/lib/active_model/observing.rb b/activemodel/lib/active_model/observing.rb
index 7a910d18e7..cd8eb357de 100644
--- a/activemodel/lib/active_model/observing.rb
+++ b/activemodel/lib/active_model/observing.rb
@@ -187,8 +187,7 @@ module ActiveModel
       def observe(*models)
         models.flatten!
         models.collect! { |model| model.respond_to?(:to_sym) ? model.to_s.camelize.constantize : model }
-        remove_possible_method(:observed_classes)
-        define_method(:observed_classes) { models }
+        redefine_method(:observed_classes) { models }
       end
 
       # Returns an array of Classes to observe.
-- 
cgit v1.2.3


From aabd61af8eca03ab7e627ca532c17f0a314984ca Mon Sep 17 00:00:00 2001
From: Anand <lucky.developer@gmail.com>
Date: Mon, 7 Nov 2011 16:22:52 +0530
Subject: added remove_method core_ext tests

---
 .../test/core_ext/module/remove_method_test.rb     | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 activesupport/test/core_ext/module/remove_method_test.rb

diff --git a/activesupport/test/core_ext/module/remove_method_test.rb b/activesupport/test/core_ext/module/remove_method_test.rb
new file mode 100644
index 0000000000..4657f0c175
--- /dev/null
+++ b/activesupport/test/core_ext/module/remove_method_test.rb
@@ -0,0 +1,29 @@
+require 'abstract_unit'
+require 'active_support/core_ext/module/remove_method'
+
+module RemoveMethodTests
+  class A
+    def do_something
+      return 1
+    end
+    
+  end
+end
+
+class RemoveMethodTest < ActiveSupport::TestCase
+  
+  def test_remove_method_from_an_object
+    RemoveMethodTests::A.class_eval{
+      self.remove_possible_method(:do_something)
+    }
+    assert !RemoveMethodTests::A.new.respond_to?(:do_something)
+  end
+  
+  def test_redefine_method_in_an_object
+    RemoveMethodTests::A.class_eval{
+      self.redefine_method(:do_something) { return 100 }
+    }
+    assert_equal 100, RemoveMethodTests::A.new.do_something
+  end
+
+end
\ No newline at end of file
-- 
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(-)

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(-)

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 f5ca190bd33722e6a9b3539968ae9f8ae01fb471 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 8 Nov 2011 10:37:06 +0530
Subject: fix typo again (Thanks Phillip Oertel)

---
 activesupport/lib/active_support/inflector/methods.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb
index 282f46a836..144cdd3c8f 100644
--- a/activesupport/lib/active_support/inflector/methods.rb
+++ b/activesupport/lib/active_support/inflector/methods.rb
@@ -298,7 +298,7 @@ module ActiveSupport
       end
     end
 
-    # Applies inflection rules for +singuralize+ and +pluralize+.
+    # Applies inflection rules for +singularize+ and +pluralize+.
     #
     # Examples:
     #  apply_inflections("post", inflections.plurals) # => "posts"
-- 
cgit v1.2.3


From b53f77ec99ee179d66cca5efa9b68a659b161841 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Tue, 8 Nov 2011 12:56:51 +0530
Subject: CHANGELOG to CHANGELOG.md

---
 railties/lib/rails/tasks/documentation.rake | 10 +++++-----
 tasks/release.rb                            |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index ca8875ad9b..2072a2b947 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -66,31 +66,31 @@ namespace :doc do
     rdoc.rdoc_files.include('README')
 
     gem_path('actionmailer') do |actionmailer|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|
         rdoc.rdoc_files.include("#{actionmailer}/#{file}")
       end
     end
 
     gem_path('actionpack') do |actionpack|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{actionpack}/#{file}")
       end
     end
 
     gem_path('activemodel') do |activemodel|
-      %w(README.rdoc CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/active_model/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activemodel}/#{file}")
       end
     end
 
     gem_path('activerecord') do |activerecord|
-      %w(README.rdoc CHANGELOG lib/active_record/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_record/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activerecord}/#{file}")
       end
     end
 
     gem_path('activeresource') do |activeresource|
-      %w(README.rdoc CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_resource.rb lib/active_resource/*).each do |file|
         rdoc.rdoc_files.include("#{activeresource}/#{file}")
       end
     end
diff --git a/tasks/release.rb b/tasks/release.rb
index 2422efa786..780543aa78 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -66,7 +66,7 @@ namespace :changelog do
     FRAMEWORKS.each do |fw|
       require 'date'
       replace = '\1(' + Date.today.strftime('%B %d, %Y') + ')'
-      fname = File.join fw, 'CHANGELOG'
+      fname = File.join fw, 'CHANGELOG.md'
 
       contents = File.read(fname).sub(/^([^(]*)\(unreleased\)/, replace)
       File.open(fname, 'wb') { |f| f.write contents }
@@ -76,7 +76,7 @@ namespace :changelog do
   task :release_summary do
     FRAMEWORKS.each do |fw|
       puts "## #{fw}"
-      fname    = File.join fw, 'CHANGELOG'
+      fname    = File.join fw, 'CHANGELOG.md'
       contents = File.readlines fname
       contents.shift
       changes = []
-- 
cgit v1.2.3


From b3175f6cb945f81f1dc3bf50a5fbe4a9207722df Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Tue, 8 Nov 2011 14:28:28 +0530
Subject: Warnings removed.

---
 tasks/release.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/release.rb b/tasks/release.rb
index 780543aa78..33aaee5a4b 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -26,16 +26,16 @@ directory "pkg"
       major, minor, tiny, pre = version.split('.')
       pre = pre ? pre.inspect : "nil"
 
-      ruby.gsub! /^(\s*)MAJOR = .*?$/, "\\1MAJOR = #{major}"
+      ruby.gsub!(/^(\s*)MAJOR = .*?$/, "\\1MAJOR = #{major}")
       raise "Could not insert MAJOR in #{file}" unless $1
 
-      ruby.gsub! /^(\s*)MINOR = .*?$/, "\\1MINOR = #{minor}"
+      ruby.gsub!(/^(\s*)MINOR = .*?$/, "\\1MINOR = #{minor}")
       raise "Could not insert MINOR in #{file}" unless $1
 
-      ruby.gsub! /^(\s*)TINY  = .*?$/, "\\1TINY  = #{tiny}"
+      ruby.gsub!(/^(\s*)TINY  = .*?$/, "\\1TINY  = #{tiny}")
       raise "Could not insert TINY in #{file}" unless $1
 
-      ruby.gsub! /^(\s*)PRE   = .*?$/, "\\1PRE   = #{pre}"
+      ruby.gsub!(/^(\s*)PRE   = .*?$/, "\\1PRE   = #{pre}")
       raise "Could not insert PRE in #{file}" unless $1
 
       File.open(file, 'w') { |f| f.write ruby }
-- 
cgit v1.2.3


From fe67501e62429a8d9c666837740cf9c1de1d4f87 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Tue, 8 Nov 2011 14:10:44 +0530
Subject: Should be checking if file exists or not.

I found this bug when running rake test:uncommitted
on a newly generated rails app which don't have
test file for application_controller.
Can see detail here #3461
---
 railties/lib/rails/test_unit/testing.rake | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 3d87529ad4..8bcceb9b2c 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -121,10 +121,16 @@ namespace :test do
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
-      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
-      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      unit_tests = models.map do |model|
+        file = "test/unit/#{File.basename(model, '.rb')}_test.rb"
+        file if File.exist?(file)
+      end
+      functional_tests = controllers.map do |controller|
+        file = "test/functional/#{File.basename(controller, '.rb')}_test.rb"
+        file if File.exist?(file)
+      end
 
-      unit_tests.uniq + functional_tests.uniq
+      (unit_tests.uniq + functional_tests.uniq).compact
     end
 
     t.libs << 'test'
-- 
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(-)

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(-)

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 1ffd5ec91069167043c8ecd0d949098f566d88eb Mon Sep 17 00:00:00 2001
From: Joost Baaij <joost@spacebabies.nl>
Date: Tue, 8 Nov 2011 16:27:15 +0100
Subject: Replace example with SQL placeholder syntax. This works just fine, is
 less code, and reduces the risk of someone implementing a SQL injection
 vulnerability.

---
 railties/guides/source/association_basics.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/association_basics.textile b/railties/guides/source/association_basics.textile
index 6829eb8ef4..451653655f 100644
--- a/railties/guides/source/association_basics.textile
+++ b/railties/guides/source/association_basics.textile
@@ -1234,7 +1234,7 @@ If you need to evaluate conditions dynamically at runtime, use a proc:
 <ruby>
 class Customer < ActiveRecord::Base
   has_many :latest_orders, :class_name => "Order",
-    :conditions => proc { "orders.created_at > #{10.hours.ago.to_s(:db).inspect}" }
+    :conditions => proc { ["orders.created_at > ?, 10.hours.ago] }
 end
 </ruby>
 
-- 
cgit v1.2.3


From 8e5686658eef0eb10a1a1edb91890a062736dfb4 Mon Sep 17 00:00:00 2001
From: Rahul Chaudhari <rahul100885@gmail.com>
Date: Tue, 8 Nov 2011 11:38:33 +0530
Subject: Updated Rakefile as CHANGELOG has been renamed to CHANGELOG.md

---
 Rakefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Rakefile b/Rakefile
index a47d415abc..e59abd5758 100755
--- a/Rakefile
+++ b/Rakefile
@@ -97,24 +97,24 @@ RDoc::Task.new do |rdoc|
   rdoc.options << '-g' # SDoc flag, link methods to GitHub
   rdoc.options << '-m' << RDOC_MAIN
 
-  rdoc.rdoc_files.include('railties/CHANGELOG')
+  rdoc.rdoc_files.include('railties/CHANGELOG.md')
   rdoc.rdoc_files.include('railties/MIT-LICENSE')
   rdoc.rdoc_files.include('railties/README.rdoc')
   rdoc.rdoc_files.include('railties/lib/**/*.rb')
   rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/**/*.rb')
 
   rdoc.rdoc_files.include('activerecord/README.rdoc')
-  rdoc.rdoc_files.include('activerecord/CHANGELOG')
+  rdoc.rdoc_files.include('activerecord/CHANGELOG.md')
   rdoc.rdoc_files.include('activerecord/lib/active_record/**/*.rb')
   rdoc.rdoc_files.exclude('activerecord/lib/active_record/vendor/*')
 
   rdoc.rdoc_files.include('activeresource/README.rdoc')
-  rdoc.rdoc_files.include('activeresource/CHANGELOG')
+  rdoc.rdoc_files.include('activeresource/CHANGELOG.md')
   rdoc.rdoc_files.include('activeresource/lib/active_resource.rb')
   rdoc.rdoc_files.include('activeresource/lib/active_resource/*')
 
   rdoc.rdoc_files.include('actionpack/README.rdoc')
-  rdoc.rdoc_files.include('actionpack/CHANGELOG')
+  rdoc.rdoc_files.include('actionpack/CHANGELOG.md')
   rdoc.rdoc_files.include('actionpack/lib/abstract_controller/**/*.rb')
   rdoc.rdoc_files.include('actionpack/lib/action_controller/**/*.rb')
   rdoc.rdoc_files.include('actionpack/lib/action_dispatch/**/*.rb')
@@ -122,18 +122,18 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.exclude('actionpack/lib/action_controller/vendor/*')
 
   rdoc.rdoc_files.include('actionmailer/README.rdoc')
-  rdoc.rdoc_files.include('actionmailer/CHANGELOG')
+  rdoc.rdoc_files.include('actionmailer/CHANGELOG.md')
   rdoc.rdoc_files.include('actionmailer/lib/action_mailer/base.rb')
   rdoc.rdoc_files.include('actionmailer/lib/action_mailer/mail_helper.rb')
   rdoc.rdoc_files.exclude('actionmailer/lib/action_mailer/vendor/*')
 
   rdoc.rdoc_files.include('activesupport/README.rdoc')
-  rdoc.rdoc_files.include('activesupport/CHANGELOG')
+  rdoc.rdoc_files.include('activesupport/CHANGELOG.md')
   rdoc.rdoc_files.include('activesupport/lib/active_support/**/*.rb')
   rdoc.rdoc_files.exclude('activesupport/lib/active_support/vendor/*')
 
   rdoc.rdoc_files.include('activemodel/README.rdoc')
-  rdoc.rdoc_files.include('activemodel/CHANGELOG')
+  rdoc.rdoc_files.include('activemodel/CHANGELOG.md')
   rdoc.rdoc_files.include('activemodel/lib/active_model/**/*.rb')
 end
 
-- 
cgit v1.2.3


From 74c6e80cabd8e3b7751fc3a32c9ad95c1780054b Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Wed, 9 Nov 2011 04:46:11 +0900
Subject: exclude ORDER BY clause when querying Relation#exists?

---
 activerecord/lib/active_record/relation/finder_methods.rb | 2 +-
 activerecord/test/cases/finder_test.rb                    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 7eeb3dde70..3c8e0f2052 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -191,7 +191,7 @@ module ActiveRecord
 
       join_dependency = construct_join_dependency_for_association_find
       relation = construct_relation_for_association_find(join_dependency)
-      relation = relation.except(:select).select("1").limit(1)
+      relation = relation.except(:select, :order).select("1").limit(1)
 
       case id
       when Array, Hash
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 3088ab012f..69754d23b9 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -57,6 +57,11 @@ class FinderTest < ActiveRecord::TestCase
     assert Topic.first.replies.exists?
   end
 
+  # ensures +exists?+ runs valid SQL by excluding order value
+  def test_exists_with_order
+    assert Topic.order(:id).uniq.exists?
+  end
+
   def test_does_not_exist_with_empty_table_and_no_args_given
     Topic.delete_all
     assert !Topic.exists?
-- 
cgit v1.2.3


From 5f826ea26f048df941325427c841608ced86f7a1 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 9 Nov 2011 09:46:06 +0530
Subject: Refactor test:uncommitted task.

Thanks to @sobrinho (Gabriel Sobrinho)
---
 railties/lib/rails/test_unit/testing.rake | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 8bcceb9b2c..52d92cdd96 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -121,16 +121,9 @@ namespace :test do
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
-      unit_tests = models.map do |model|
-        file = "test/unit/#{File.basename(model, '.rb')}_test.rb"
-        file if File.exist?(file)
-      end
-      functional_tests = controllers.map do |controller|
-        file = "test/functional/#{File.basename(controller, '.rb')}_test.rb"
-        file if File.exist?(file)
-      end
-
-      (unit_tests.uniq + functional_tests.uniq).compact
+      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
+      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      (unit_tests + functional_tests).uniq.select { |file| File.exist?(file) }
     end
 
     t.libs << 'test'
-- 
cgit v1.2.3


From f642724f27af5b16290f56795563eaa194e20301 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Wed, 9 Nov 2011 09:59:17 +0530
Subject: CHANGELOG => CHANGELOG.md

I missed these in previous commit
---
 railties/lib/rails/tasks/documentation.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 2072a2b947..1e7da5ccae 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -96,13 +96,13 @@ namespace :doc do
     end
 
     gem_path('activesupport') do |activesupport|
-      %w(README.rdoc CHANGELOG lib/active_support/**/*.rb).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/active_support/**/*.rb).each do |file|
         rdoc.rdoc_files.include("#{activesupport}/#{file}")
       end
     end
 
     gem_path('railties') do |railties|
-      %w(README.rdoc CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+      %w(README.rdoc CHANGELOG.md lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
         rdoc.rdoc_files.include("#{railties}/#{file}")
       end
     end
-- 
cgit v1.2.3


From 6d09f275c6e3224a8ea9a738512c90ee5334e20d Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Wed, 9 Nov 2011 15:42:19 +0900
Subject: Modulize Rails console methods so that other console libraries such
 as Pry can include these methods

---
 railties/lib/rails/application.rb         | 2 ++
 railties/lib/rails/console/app.rb         | 4 ++--
 railties/lib/rails/console/helpers.rb     | 4 ++--
 railties/test/application/console_test.rb | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..e8b160448b 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,6 +205,8 @@ module Rails
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
+
+      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
     end
   end
 end
diff --git a/railties/lib/rails/console/app.rb b/railties/lib/rails/console/app.rb
index cf081473a3..23d57379ba 100644
--- a/railties/lib/rails/console/app.rb
+++ b/railties/lib/rails/console/app.rb
@@ -5,8 +5,8 @@ require 'action_controller'
 # work around the at_exit hook in test/unit, which kills IRB
 Test::Unit.run = true if Test::Unit.respond_to?(:run=)
 
-module IRB
-  module ExtendCommandBundle
+module Rails
+  module ConsoleMethods
     # reference the global "app" instance, created on demand. To recreate the
     # instance, pass a non-false value as the parameter.
     def app(create=false)
diff --git a/railties/lib/rails/console/helpers.rb b/railties/lib/rails/console/helpers.rb
index 070d3c2bbf..230d3d9d04 100644
--- a/railties/lib/rails/console/helpers.rb
+++ b/railties/lib/rails/console/helpers.rb
@@ -1,5 +1,5 @@
-module IRB
-  module ExtendCommandBundle
+module Rails
+  module ConsoleMethods
     def helper
       @helper ||= ApplicationController.helpers
     end
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 5a1f71ddad..b3745f194e 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -19,7 +19,7 @@ class ConsoleTest < Test::Unit::TestCase
   end
 
   def irb_context
-    Object.new.extend(IRB::ExtendCommandBundle)
+    Object.new.extend(Rails::ConsoleMethods)
   end
 
   def test_app_method_should_return_integration_session
-- 
cgit v1.2.3


From f686d9429fc964ca7ef0c7a8246ac25fd861a05b 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:40:49 +0200
Subject: Use head :no_content on the guides as well.

---
 .../guides/code/getting_started/app/controllers/posts_controller.rb   | 4 ++--
 railties/guides/source/getting_started.textile                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/railties/guides/code/getting_started/app/controllers/posts_controller.rb b/railties/guides/code/getting_started/app/controllers/posts_controller.rb
index 7e903c984c..1581d4eb16 100644
--- a/railties/guides/code/getting_started/app/controllers/posts_controller.rb
+++ b/railties/guides/code/getting_started/app/controllers/posts_controller.rb
@@ -62,7 +62,7 @@ class PostsController < ApplicationController
     respond_to do |format|
       if @post.update_attributes(params[:post])
         format.html { redirect_to @post, notice: 'Post was successfully updated.' }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         format.html { render action: "edit" }
         format.json { render json: @post.errors, status: :unprocessable_entity }
@@ -78,7 +78,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to posts_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 end
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index bf6104b96b..ef80086eff 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1060,7 +1060,7 @@ def update
     if @post.update_attributes(params[:post])
       format.html  { redirect_to(@post,
                     :notice => 'Post was successfully updated.') }
-      format.json  { render :json => {}, :status => :ok }
+      format.json  { head :no_content }
     else
       format.html  { render :action => "edit" }
       format.json  { render :json => @post.errors,
@@ -1089,7 +1089,7 @@ def destroy
 
   respond_to do |format|
     format.html { redirect_to posts_url }
-    format.json { head :ok }
+    format.json { head :no_content }
   end
 end
 </ruby>
-- 
cgit v1.2.3


From a658fd2ffa2fd2019696ddd10b12aa5490b1668e Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Thu, 10 Nov 2011 06:47:35 +0900
Subject: Extend IRB right before starting IRB to remove dependency on IRB from
 Rails::Application

---
 railties/lib/rails/application.rb      | 2 --
 railties/lib/rails/commands/console.rb | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index e8b160448b..82fffe86bb 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -205,8 +205,6 @@ module Rails
       require "pp"
       require "rails/console/app"
       require "rails/console/helpers"
-
-      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
     end
   end
 end
diff --git a/railties/lib/rails/commands/console.rb b/railties/lib/rails/commands/console.rb
index 32e361d421..7733a8f116 100644
--- a/railties/lib/rails/commands/console.rb
+++ b/railties/lib/rails/commands/console.rb
@@ -42,6 +42,8 @@ module Rails
       else
         puts "Loading #{Rails.env} environment (Rails #{Rails.version})"
       end
+
+      IRB::ExtendCommandBundle.send :include, Rails::ConsoleMethods
       IRB.start
     end
   end
-- 
cgit v1.2.3


From 71e84a3b514b6a2630dfd7f658f4e7597424d6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 9 Nov 2011 19:48:56 -0200
Subject: Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt.

---
 activesupport/CHANGELOG.md                         |  2 +
 .../lib/active_support/message_encryptor.rb        | 49 ++++++++++++------
 activesupport/test/message_encryptor_test.rb       | 60 +++++++++++++---------
 3 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index e03bfdee92..18a115b369 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## Rails 3.2.0 (unreleased) ##
 
+*   Deprecated ActiveSupport::MessageEncryptor#encrypt and decrypt. *José Valim*
+
 *   ActiveSupport::Notifications.subscribed provides subscriptions to events while a block runs. *fxn*
 
 *   Module#qualified_const_(defined?|get|set) are analogous to the corresponding methods
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index e14386a85d..5ab0cc83a7 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -18,13 +18,39 @@ module ActiveSupport
         ActiveSupport::Deprecation.warn "The second parameter should be an options hash. Use :cipher => 'algorithm' to specify the cipher algorithm."
         options = { :cipher => options }
       end
-      
+
       @secret = secret
       @cipher = options[:cipher] || 'aes-256-cbc'
       @serializer = options[:serializer] || Marshal
     end
 
     def encrypt(value)
+      ActiveSupport::Deprecation.warn "MessageEncryptor#encrypt is deprecated as it is not safe without a signature. " \
+        "Please use MessageEncryptor#encrypt_and_sign instead."
+      _encrypt(value)
+    end
+
+    def decrypt(value)
+      ActiveSupport::Deprecation.warn "MessageEncryptor#decrypt is deprecated as it is not safe without a signature. " \
+        "Please use MessageEncryptor#decrypt_and_verify instead."
+      _decrypt(value)
+    end
+
+    # Encrypt and sign a message. We need to sign the message in order to avoid padding attacks.
+    # Reference: http://www.limited-entropy.com/padding-oracle-attacks
+    def encrypt_and_sign(value)
+      verifier.generate(_encrypt(value))
+    end
+
+    # Decrypt and verify a message. We need to verify the message in order to avoid padding attacks.
+    # Reference: http://www.limited-entropy.com/padding-oracle-attacks
+    def decrypt_and_verify(value)
+      _decrypt(verifier.verify(value))
+    end
+
+    private
+
+    def _encrypt(value)
       cipher = new_cipher
       # Rely on OpenSSL for the initialization vector
       iv = cipher.random_iv
@@ -39,7 +65,7 @@ module ActiveSupport
       [encrypted_data, iv].map {|v| ActiveSupport::Base64.encode64s(v)}.join("--")
     end
 
-    def decrypt(encrypted_message)
+    def _decrypt(encrypted_message)
       cipher = new_cipher
       encrypted_data, iv = encrypted_message.split("--").map {|v| ActiveSupport::Base64.decode64(v)}
 
@@ -55,23 +81,12 @@ module ActiveSupport
       raise InvalidMessage
     end
 
-    def encrypt_and_sign(value)
-      verifier.generate(encrypt(value))
+    def new_cipher
+      OpenSSL::Cipher::Cipher.new(@cipher)
     end
 
-    def decrypt_and_verify(value)
-      decrypt(verifier.verify(value))
+    def verifier
+      MessageVerifier.new(@secret)
     end
-
-
-
-    private
-      def new_cipher
-        OpenSSL::Cipher::Cipher.new(@cipher)
-      end
-
-      def verifier
-        MessageVerifier.new(@secret)
-      end
   end
 end
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 83a19f8106..55c4d42500 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -11,46 +11,51 @@ require 'active_support/time'
 require 'active_support/json'
 
 class MessageEncryptorTest < ActiveSupport::TestCase
-  
+
   class JSONSerializer
     def dump(value)
       ActiveSupport::JSON.encode(value)
     end
-    
+
     def load(value)
       ActiveSupport::JSON.decode(value)
     end
   end
-  
+
   def setup
-    @encryptor = ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64))
+    @secret    = SecureRandom.hex(64)
+    @verifier  = ActiveSupport::MessageVerifier.new(@secret)
+    @encryptor = ActiveSupport::MessageEncryptor.new(@secret)
     @data = { :some => "data", :now => Time.local(2010) }
   end
 
-  def test_simple_round_tripping
-    message = @encryptor.encrypt(@data)
-    assert_equal @data, @encryptor.decrypt(message)
-  end
-
   def test_encrypting_twice_yields_differing_cipher_text
-    first_messqage = @encryptor.encrypt(@data)
-    second_message = @encryptor.encrypt(@data)
+    first_messqage = @encryptor.encrypt_and_sign(@data).split("--").first
+    second_message = @encryptor.encrypt_and_sign(@data).split("--").first
     assert_not_equal first_messqage, second_message
   end
 
-  def test_messing_with_either_value_causes_failure
-    text, iv = @encryptor.encrypt(@data).split("--")
+  def test_messing_with_either_encrypted_values_causes_failure
+    text, iv = @verifier.verify(@encryptor.encrypt_and_sign(@data)).split("--")
     assert_not_decrypted([iv, text] * "--")
     assert_not_decrypted([text, munge(iv)] * "--")
     assert_not_decrypted([munge(text), iv] * "--")
     assert_not_decrypted([munge(text), munge(iv)] * "--")
   end
 
+  def test_messing_with_verified_values_causes_failures
+    text, iv = @encryptor.encrypt_and_sign(@data).split("--")
+    assert_not_verified([iv, text] * "--")
+    assert_not_verified([text, munge(iv)] * "--")
+    assert_not_verified([munge(text), iv] * "--")
+    assert_not_verified([munge(text), munge(iv)] * "--")
+  end
+
   def test_signed_round_tripping
     message = @encryptor.encrypt_and_sign(@data)
     assert_equal @data, @encryptor.decrypt_and_verify(message)
   end
-  
+
   def test_alternative_serialization_method
     encryptor = ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), :serializer => JSONSerializer.new)
     message = encryptor.encrypt_and_sign({ :foo => 123, 'bar' => Time.utc(2010) })
@@ -62,19 +67,26 @@ class MessageEncryptorTest < ActiveSupport::TestCase
       ActiveSupport::MessageEncryptor.new(SecureRandom.hex(64), 'aes-256-cbc')
     end
   end
-  
+
   private
-    def assert_not_decrypted(value)
-      assert_raise(ActiveSupport::MessageEncryptor::InvalidMessage) do
-        @encryptor.decrypt(value)
-      end
+
+  def assert_not_decrypted(value)
+    assert_raise(ActiveSupport::MessageEncryptor::InvalidMessage) do
+      @encryptor.decrypt_and_verify(@verifier.generate(value))
     end
+  end
 
-    def munge(base64_string)
-      bits = ActiveSupport::Base64.decode64(base64_string)
-      bits.reverse!
-      ActiveSupport::Base64.encode64s(bits)
+  def assert_not_verified(value)
+    assert_raise(ActiveSupport::MessageVerifier::InvalidSignature) do
+      @encryptor.decrypt_and_verify(value)
     end
-end
+  end
 
+  def munge(base64_string)
+    bits = ActiveSupport::Base64.decode64(base64_string)
+    bits.reverse!
+    ActiveSupport::Base64.encode64s(bits)
+  end
 end
+
+end
\ No newline at end of file
-- 
cgit v1.2.3


From a625523e755421b0f96fe5b0a885462ef51582b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 9 Nov 2011 20:11:46 -0200
Subject: Don't marshal dump twice when using encryptor.

---
 activesupport/lib/active_support/message_encryptor.rb | 13 ++++++++++++-
 activesupport/test/message_encryptor_test.rb          |  3 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb
index 5ab0cc83a7..9ef2b29580 100644
--- a/activesupport/lib/active_support/message_encryptor.rb
+++ b/activesupport/lib/active_support/message_encryptor.rb
@@ -10,6 +10,16 @@ module ActiveSupport
   # This can be used in situations similar to the <tt>MessageVerifier</tt>, but where you don't
   # want users to be able to determine the value of the payload.
   class MessageEncryptor
+    module NullSerializer #:nodoc:
+      def self.load(value)
+        value
+      end
+
+      def self.dump(value)
+        value
+      end
+    end
+
     class InvalidMessage < StandardError; end
     OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError
 
@@ -21,6 +31,7 @@ module ActiveSupport
 
       @secret = secret
       @cipher = options[:cipher] || 'aes-256-cbc'
+      @verifier = MessageVerifier.new(@secret, :serializer => NullSerializer)
       @serializer = options[:serializer] || Marshal
     end
 
@@ -86,7 +97,7 @@ module ActiveSupport
     end
 
     def verifier
-      MessageVerifier.new(@secret)
+      @verifier
     end
   end
 end
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 55c4d42500..3e6a5c6602 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -11,7 +11,6 @@ require 'active_support/time'
 require 'active_support/json'
 
 class MessageEncryptorTest < ActiveSupport::TestCase
-
   class JSONSerializer
     def dump(value)
       ActiveSupport::JSON.encode(value)
@@ -24,7 +23,7 @@ class MessageEncryptorTest < ActiveSupport::TestCase
 
   def setup
     @secret    = SecureRandom.hex(64)
-    @verifier  = ActiveSupport::MessageVerifier.new(@secret)
+    @verifier  = ActiveSupport::MessageVerifier.new(@secret, :serializer => ActiveSupport::MessageEncryptor::NullSerializer)
     @encryptor = ActiveSupport::MessageEncryptor.new(@secret)
     @data = { :some => "data", :now => Time.local(2010) }
   end
-- 
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(+)

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(-)

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 49349089ad38b403bf3f395ebf8fbc44cd232b49 Mon Sep 17 00:00:00 2001
From: Tyler Coville <tyler@tylercoville.com>
Date: Wed, 9 Nov 2011 23:22:26 -0800
Subject: Fixed error with 'rails generate new plugin' where the .gitignore was
 not properly generated if --dummy-path was used and added test case

---
 .../lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 2 +-
 .../lib/rails/generators/rails/plugin_new/templates/gitignore     | 6 +++---
 railties/test/generators/plugin_new_generator_test.rb             | 8 ++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 4baa2110e7..f5c8ccf940 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -39,7 +39,7 @@ module Rails
     end
 
     def gitignore
-      copy_file "gitignore", ".gitignore"
+      template "gitignore", ".gitignore"
     end
 
     def lib
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
index 1463de6dfb..92bd3c614b 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/gitignore
@@ -1,6 +1,6 @@
 .bundle/
 log/*.log
 pkg/
-test/dummy/db/*.sqlite3
-test/dummy/log/*.log
-test/dummy/tmp/
\ No newline at end of file
+<%= dummy_path %>/db/*.sqlite3
+<%= dummy_path %>/log/*.log
+<%= dummy_path %>/tmp/
\ No newline at end of file
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 9183945619..b70f9f4d9c 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -236,6 +236,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "spec/dummy/config/application.rb"
     assert_no_file "test"
   end
+  
+  def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
+    FileUtils.cd(Rails.root)
+    run_generator([destination_root, "--dummy_path", "spec/dummy" "--skip-test-unit"])
+    assert_file ".gitignore" do |contents|
+      assert_match(/spec\/dummy/, contents)
+    end
+  end
 
   def test_skipping_test_unit
     run_generator [destination_root, "--skip-test-unit"]
-- 
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(-)

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 bf6e29e00759547d5d0e0bab20434a12a449eb48 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 10 Nov 2011 10:25:27 +0200
Subject: AS::Callbacks#_define_runner refactored

Incapsulate the logic of keyed callback method definition and execution
in the separated method.
---
 activesupport/lib/active_support/callbacks.rb | 45 +++++++++++++--------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 656cba625c..73caede7d6 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -371,42 +371,41 @@ module ActiveSupport
       # Generate the internal runner method called by +run_callbacks+.
       def __define_runner(symbol) #:nodoc:
         body = send("_#{symbol}_callbacks").compile
+        runner_method = "_run_#{symbol}_callbacks" 
 
         silence_warnings do
-          undef_method "_run_#{symbol}_callbacks" if method_defined?("_run_#{symbol}_callbacks")
+          undef_method runner_method if method_defined?(runner_method)
           class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def _run_#{symbol}_callbacks(key = nil, &blk)
+            def #{runner_method}(key = nil, &blk)
               if key
-                name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"
-
-                unless respond_to?(name)
-                  self.class.__create_keyed_callback(name, :#{symbol}, self, &blk)
-                end
-
-                send(name, &blk)
+                self.class.__run_keyed_callback(key, :#{symbol}, self, &blk)
               else
                 #{body}
               end
             end
-            private :_run_#{symbol}_callbacks
+            private :#{runner_method}
           RUBY_EVAL
         end
       end
 
-      # This is called the first time a callback is called with a particular
-      # key. It creates a new callback method for the key, calculating
-      # which callbacks can be omitted because of per_key conditions.
-      #
-      def __create_keyed_callback(name, kind, object, &blk) #:nodoc:
-        @_keyed_callbacks ||= {}
-        @_keyed_callbacks[name] ||= begin
-          str = send("_#{kind}_callbacks").compile(name, object)
-          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-            def #{name}() #{str} end
-            protected :#{name}
-          RUBY_EVAL
-          true
+      # This method calls the callback method for the given key.
+      # If this called first time it creates a new callback method for the key, 
+      # calculating which callbacks can be omitted because of per_key conditions.
+      #
+      def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
+        name = "_run__#{self.class.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
+        unless respond_to?(name)
+          @_keyed_callbacks ||= {}
+          @_keyed_callbacks[name] ||= begin
+            str = send("_#{kind}_callbacks").compile(name, object)
+            class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+              def #{name}() #{str} end
+              protected :#{name}
+            RUBY_EVAL
+            true
+          end
         end
+        object.send(name, &blk)
       end
 
       # This is used internally to append, prepend and skip callbacks to the
-- 
cgit v1.2.3


From 80f96ebcf5218cafd2b29e58c7b0c55a07e2fe22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 10 Nov 2011 08:57:09 -0200
Subject: self.class.name -> self.name (we are already inside a class).

---
 activesupport/lib/active_support/callbacks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 73caede7d6..31737d54cb 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -393,7 +393,7 @@ module ActiveSupport
       # calculating which callbacks can be omitted because of per_key conditions.
       #
       def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
-        name = "_run__#{self.class.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
+        name = "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
         unless respond_to?(name)
           @_keyed_callbacks ||= {}
           @_keyed_callbacks[name] ||= begin
-- 
cgit v1.2.3


From 08cc49b919cfa43a19f55b761dba56bc3673b6b7 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Thu, 10 Nov 2011 16:42:27 +0200
Subject: AS::Callbacks.__run_keyed_callback: remove unused cache

---
 activesupport/lib/active_support/callbacks.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 31737d54cb..962299bf7c 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -394,16 +394,12 @@ module ActiveSupport
       #
       def __run_keyed_callback(key, kind, object, &blk) #:nodoc:
         name = "_run__#{self.name.hash.abs}__#{kind}__#{key.hash.abs}__callbacks"
-        unless respond_to?(name)
-          @_keyed_callbacks ||= {}
-          @_keyed_callbacks[name] ||= begin
-            str = send("_#{kind}_callbacks").compile(name, object)
-            class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-              def #{name}() #{str} end
-              protected :#{name}
-            RUBY_EVAL
-            true
-          end
+        unless object.respond_to?(name)
+          str = send("_#{kind}_callbacks").compile(name, object)
+          class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+            def #{name}() #{str} end
+            protected :#{name}
+          RUBY_EVAL
         end
         object.send(name, &blk)
       end
-- 
cgit v1.2.3


From 74233d48e64650c26600f82ac23eb55c39fea342 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Thu, 10 Nov 2011 22:36:20 +0530
Subject: Fixes deprecation warning about passing a template handler in the
 template name while generating guide related pages like index, layout and
 credits

---
 railties/guides/rails_guides/generator.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb
index 4682ead66e..6f6d3bda80 100644
--- a/railties/guides/rails_guides/generator.rb
+++ b/railties/guides/rails_guides/generator.rb
@@ -137,7 +137,8 @@ module RailsGuides
 
         if guide =~ /\.html\.erb$/
           # Generate the special pages like the home.
-          result = view.render(:layout => 'layout', :file => guide)
+          # Passing a template handler in the template name is deprecated. So pass the file name without the extension.
+          result = view.render(:layout => 'layout', :file => $`)
         else
           body = File.read(File.join(source_dir, guide))
           body = set_header_section(body, view)
-- 
cgit v1.2.3


From b805c71655ada0e3fcf7ccc1cdf3376e55b2b9ce Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Thu, 10 Nov 2011 19:05:37 +0530
Subject: Checking the arity of the block passed to create_table

A recent change made to create_table does away with the
need for the block argument. Checking the arity will prevent the
mixing up of the two syntaxes.
---
 .../connection_adapters/abstract/schema_statements.rb     |  8 +++++++-
 activerecord/test/cases/migration_test.rb                 | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 0e5e33fa02..be9a02682b 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -158,7 +158,13 @@ module ActiveRecord
         td = table_definition
         td.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
 
-        td.instance_eval(&blk) if blk
+        if block_given?
+          if blk.arity == 1
+            yield td
+          else
+            td.instance_eval(&blk)
+          end
+        end
 
         if options[:force] && table_exists?(table_name)
           drop_table(table_name)
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index e8ad37d437..50242a497c 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1742,6 +1742,21 @@ if ActiveRecord::Base.connection.supports_migrations?
     ensure
       Person.connection.drop_table :testings rescue nil
     end
+
+    def test_create_table_should_not_have_mixed_syntax
+      assert_raise(NoMethodError) do
+        Person.connection.create_table :testings, :force => true do |t|
+          t.string :foo
+          integer :bar
+        end
+      end
+      assert_raise(NameError) do
+        Person.connection.create_table :testings, :force => true do
+          t.string :foo
+          integer :bar
+        end
+      end
+    end
   end # SexierMigrationsTest
 
   class MigrationLoggerTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From fd17ffc7a27c2fc5c3c2afb82c9e1909fd5ba7a1 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Thu, 10 Nov 2011 18:49:37 +0100
Subject: Fix a tiny typo in custom validators documentation

---
 activemodel/lib/active_model/validations/validates.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemodel/lib/active_model/validations/validates.rb b/activemodel/lib/active_model/validations/validates.rb
index fbceb81e8f..8e09f6ac35 100644
--- a/activemodel/lib/active_model/validations/validates.rb
+++ b/activemodel/lib/active_model/validations/validates.rb
@@ -57,7 +57,7 @@ module ActiveModel
       #
       # Additionally validator classes may be in another namespace and still used within any class.
       #
-      #   validates :name, :'file/title' => true
+      #   validates :name, :'film/title' => true
       #
       # The validators hash can also handle regular expressions, ranges, 
       # arrays and strings in shortcut form, e.g.
-- 
cgit v1.2.3


From 9ce5d5155bc394fbd076203b14fbd8d83d10caf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20Wn=C4=99trzak?= <w.wnetrzak@gmail.com>
Date: Thu, 10 Nov 2011 18:52:39 +0100
Subject: fixed example code indentation

---
 railties/lib/rails/engine.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 1c9627734e..d652c6b7fe 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -296,16 +296,16 @@ module Rails
   # If you want to share just a few specific helpers you can add them to application's
   # helpers in ApplicationController:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::SharedEngineHelper
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::SharedEngineHelper
+  #   end
   #
   # If you want to include all of the engine's helpers, you can use #helpers method on an engine's
   # instance:
   #
-  # class ApplicationController < ActionController::Base
-  #   helper MyEngine::Engine.helpers
-  # end
+  #   class ApplicationController < ActionController::Base
+  #     helper MyEngine::Engine.helpers
+  #   end
   #
   # It will include all of the helpers from engine's directory. Take into account that this does
   # not include helpers defined in controllers with helper_method or other similar solutions,
-- 
cgit v1.2.3


From b9aaa317cfa56a68b406181a93d9e11b8560f9a1 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 11 Nov 2011 01:49:05 +0530
Subject: update ci file name in contributing guide

---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 4d84c50e2a..80c3cf6e1a 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -200,7 +200,7 @@ $ bundle exec rake test
 
 will now run the four of them in turn.
 
-You can also invoke +test_jdbcmysql+, +test_jdbcsqlite3+ or +test_jdbcpostgresql+. Check out the file +activerecord/RUNNING_UNIT_TESTS+ for information on running more targeted database tests, or the file +ci/ci_build.rb+ to see the test suite that the continuous integration server runs.
+You can also invoke +test_jdbcmysql+, +test_jdbcsqlite3+ or +test_jdbcpostgresql+. Check out the file +activerecord/RUNNING_UNIT_TESTS+ for information on running more targeted database tests, or the file +ci/travis.rb+ to see the test suite that the continuous integration server runs.
 
 h4. Older versions of Ruby on Rails
 
-- 
cgit v1.2.3


From 6e112e42176c6842270f879fd15a0b7b7371ecef Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 11 Nov 2011 02:47:27 +0530
Subject: Modify change_table to remove the need for the block argument.

---
 .../abstract/schema_statements.rb                  | 19 +++++---
 activerecord/test/cases/migration_test.rb          | 52 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index be9a02682b..11da84e245 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -241,14 +241,19 @@ module ActiveRecord
       #
       # See also Table for details on
       # all of the various column transformation
-      def change_table(table_name, options = {})
-        if supports_bulk_alter? && options[:bulk]
-          recorder = ActiveRecord::Migration::CommandRecorder.new(self)
-          yield Table.new(table_name, recorder)
-          bulk_change_table(table_name, recorder.commands)
-        else
-          yield Table.new(table_name, self)
+      def change_table(table_name, options = {}, &blk)
+        bulk_change = supports_bulk_alter? && options[:bulk]
+        recorder = bulk_change ? ActiveRecord::Migration::CommandRecorder.new(self) : self
+        table = Table.new(table_name, recorder)
+
+        if block_given?
+          if blk.arity == 1
+            yield table
+          else
+            table.instance_eval(&blk)
+          end
         end
+        bulk_change_table(table_name, recorder.commands) if bulk_change
       end
 
       # Renames a table.
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 50242a497c..e276993508 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1757,6 +1757,58 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
       end
     end
+
+    def test_change_table_without_block_parameter_no_bulk
+      Person.connection.create_table :testings, :force => true do
+        string :foo
+      end
+      assert Person.connection.column_exists?(:testings, :foo, :string)
+
+      Person.connection.change_table :testings do
+        remove :foo
+        integer :bar
+      end
+
+      assert_equal %w(bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+
+    def test_change_table_without_block_parameter_with_bulk
+      Person.connection.create_table :testings, :force => true do
+        string :foo
+      end
+      assert Person.connection.column_exists?(:testings, :foo, :string)
+
+      assert_queries(1) do
+        Person.connection.change_table(:testings, :bulk => true) do
+          integer :bar
+          string :foo_bar
+        end
+      end
+
+      assert_equal %w(bar foo foo_bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
+    ensure
+      Person.connection.drop_table :testings rescue nil
+    end
+
+    def test_change_table_should_not_have_mixed_syntax
+      Person.connection.create_table :testings, :force => true do
+        string :foo
+      end
+      assert_raise(NoMethodError) do
+        Person.connection.change_table :testings do |t|
+          t.remove :foo
+          integer :bar
+        end
+      end
+      assert_raise(NameError) do
+        Person.connection.change_table :testings do
+          t.remove :foo
+          integer :bar
+        end
+      end
+    end
   end # SexierMigrationsTest
 
   class MigrationLoggerTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From 2e5c4717ba8aca8459637f9413b100ed58a6bcd1 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 11 Nov 2011 12:47:03 +0530
Subject: change_table bulk test case should check if the connection supports
 bulk alter

---
 activerecord/test/cases/migration_test.rb | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index e276993508..d6c7edc461 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1774,22 +1774,24 @@ if ActiveRecord::Base.connection.supports_migrations?
       Person.connection.drop_table :testings rescue nil
     end
 
-    def test_change_table_without_block_parameter_with_bulk
-      Person.connection.create_table :testings, :force => true do
-        string :foo
-      end
-      assert Person.connection.column_exists?(:testings, :foo, :string)
+    if ActiveRecord::Base.connection.supports_bulk_alter?
+      def test_change_table_without_block_parameter_with_bulk
+        Person.connection.create_table :testings, :force => true do
+          string :foo
+        end
+        assert Person.connection.column_exists?(:testings, :foo, :string)
 
-      assert_queries(1) do
-        Person.connection.change_table(:testings, :bulk => true) do
-          integer :bar
-          string :foo_bar
+        assert_queries(1) do
+          Person.connection.change_table(:testings, :bulk => true) do
+            integer :bar
+            string :foo_bar
+          end
         end
-      end
 
-      assert_equal %w(bar foo foo_bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
-    ensure
-      Person.connection.drop_table :testings rescue nil
+        assert_equal %w(bar foo foo_bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
+      ensure
+        Person.connection.drop_table :testings rescue nil
+      end
     end
 
     def test_change_table_should_not_have_mixed_syntax
-- 
cgit v1.2.3


From e34e4d43301618307f94123d3710f094297f91f3 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Fri, 11 Nov 2011 17:04:50 +0800
Subject: Fix "in memory" where it should be "in-memory".

---
 activerecord/test/cases/nested_attributes_test.rb              | 4 ++--
 activerecord/test/cases/relation_scoping_test.rb               | 2 +-
 activesupport/lib/active_support/cache/file_store.rb           | 2 +-
 activesupport/lib/active_support/cache/mem_cache_store.rb      | 2 +-
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 2ae9cb4888..532d4654b5 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -937,13 +937,13 @@ class TestHasManyAutosaveAssociationWhichItselfHasAutosaveAssociations < ActiveR
     @trinket = @part.trinkets.create!(:name => "Necklace")
   end
 
-  test "if association is not loaded and association record is saved and then in memory record attributes should be saved" do
+  test "if association is not loaded and association record is saved and then in-memory record attributes should be saved" do
     @ship.parts_attributes=[{:id => @part.id,:name =>'Deck'}]
     assert_equal 1, @ship.association(:parts).target.size
     assert_equal 'Deck', @ship.parts[0].name
   end
 
-  test "if association is not loaded and child doesn't change and I am saving a grandchild then in memory record should be used" do
+  test "if association is not loaded and child doesn't change and I am saving a grandchild then in-memory record should be used" do
     @ship.parts_attributes=[{:id => @part.id,:trinkets_attributes =>[{:id => @trinket.id, :name => 'Ruby'}]}]
     assert_equal 1, @ship.association(:parts).target.size
     assert_equal 'Mast', @ship.parts[0].name
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 1e2093273e..ec1a6eda0c 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -527,7 +527,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
 
   def test_default_scope_is_threadsafe
     if in_memory_db?
-      skip "in memory db can't share a db between threads"
+      skip "in-memory db can't share a db between threads"
     end
 
     threads = []
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 85e7e21624..9460532af0 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index e07294178b..5234cdb4ce 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 0649a058aa..db5f228a70 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in memory cache for the
+      # Caches that implement LocalCache will be backed by an in-memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in memory cache for faster access.
+      # in-memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
-- 
cgit v1.2.3


From df5c9fd9f42e9bebb02bb61acf70de3d17bc8152 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Fri, 11 Nov 2011 17:07:02 +0800
Subject: Update Memcached website to its new one at http://memcached.org/.

---
 activesupport/lib/active_support/cache/mem_cache_store.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 5234cdb4ce..530839b24d 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -11,7 +11,7 @@ require 'active_support/core_ext/string/encoding'
 module ActiveSupport
   module Cache
     # A cache store implementation which stores data in Memcached:
-    # http://www.danga.com/memcached/
+    # http://memcached.org/
     #
     # This is currently the most popular cache store for production websites.
     #
-- 
cgit v1.2.3


From 27c5800c9cf8c19c3deb8bb6ebc1186d0f865d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noe=CC=81=20Froidevaux?= <noe.froidevaux@webdoc.com>
Date: Fri, 11 Nov 2011 12:09:51 +0100
Subject: Prevent multiple SHOW TABLES calls when a table don't exists in
 database.

---
 .../active_record/connection_adapters/abstract/connection_pool.rb   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 77a5fe1efb..92dfb844db 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -123,14 +123,14 @@ module ActiveRecord
 
       # A cached lookup for table existence.
       def table_exists?(name)
-        return true if @tables.key? name
+        return @tables[name] if @tables.key? name
 
         with_connection do |conn|
           conn.tables.each { |table| @tables[table] = true }
-          @tables[name] = true if !@tables.key?(name) && conn.table_exists?(name)
+          @tables[name] = !@tables.key?(name) && conn.table_exists?(name)
         end
 
-        @tables.key? name
+        @tables[name]
       end
 
       # Clears out internal caches:
-- 
cgit v1.2.3


From 9fd0cd3a12f969ca0c5c7ce6163e9e451637506d Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 11 Nov 2011 17:12:42 +0530
Subject: Revert "Fix "in memory" where it should be "in-memory"."

This reverts commit e34e4d43301618307f94123d3710f094297f91f3.

Reason: code changes are not allowed in docrails.
---
 activerecord/test/cases/nested_attributes_test.rb              | 4 ++--
 activerecord/test/cases/relation_scoping_test.rb               | 2 +-
 activesupport/lib/active_support/cache/file_store.rb           | 2 +-
 activesupport/lib/active_support/cache/mem_cache_store.rb      | 2 +-
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/activerecord/test/cases/nested_attributes_test.rb b/activerecord/test/cases/nested_attributes_test.rb
index 532d4654b5..2ae9cb4888 100644
--- a/activerecord/test/cases/nested_attributes_test.rb
+++ b/activerecord/test/cases/nested_attributes_test.rb
@@ -937,13 +937,13 @@ class TestHasManyAutosaveAssociationWhichItselfHasAutosaveAssociations < ActiveR
     @trinket = @part.trinkets.create!(:name => "Necklace")
   end
 
-  test "if association is not loaded and association record is saved and then in-memory record attributes should be saved" do
+  test "if association is not loaded and association record is saved and then in memory record attributes should be saved" do
     @ship.parts_attributes=[{:id => @part.id,:name =>'Deck'}]
     assert_equal 1, @ship.association(:parts).target.size
     assert_equal 'Deck', @ship.parts[0].name
   end
 
-  test "if association is not loaded and child doesn't change and I am saving a grandchild then in-memory record should be used" do
+  test "if association is not loaded and child doesn't change and I am saving a grandchild then in memory record should be used" do
     @ship.parts_attributes=[{:id => @part.id,:trinkets_attributes =>[{:id => @trinket.id, :name => 'Ruby'}]}]
     assert_equal 1, @ship.association(:parts).target.size
     assert_equal 'Mast', @ship.parts[0].name
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index ec1a6eda0c..1e2093273e 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -527,7 +527,7 @@ class DefaultScopingTest < ActiveRecord::TestCase
 
   def test_default_scope_is_threadsafe
     if in_memory_db?
-      skip "in-memory db can't share a db between threads"
+      skip "in memory db can't share a db between threads"
     end
 
     threads = []
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 9460532af0..85e7e21624 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in-memory cache inside of a block.
+    # an in memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 530839b24d..ba37f3e871 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in-memory cache inside of a block.
+    # an in memory cache inside of a block.
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index db5f228a70..0649a058aa 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in-memory cache for the
+      # Caches that implement LocalCache will be backed by an in memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in-memory cache for faster access.
+      # in memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
-- 
cgit v1.2.3


From 8483c7c0a612592316dcf6048cc45e8aee101e47 Mon Sep 17 00:00:00 2001
From: Bogdan Gusiev <agresso@gmail.com>
Date: Fri, 11 Nov 2011 14:27:40 +0200
Subject: AS::Callbacks::Callback#_compile_option refactored

---
 activesupport/lib/active_support/callbacks.rb | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb
index 962299bf7c..ea37355fc1 100644
--- a/activesupport/lib/active_support/callbacks.rb
+++ b/activesupport/lib/active_support/callbacks.rb
@@ -153,7 +153,7 @@ module ActiveSupport
 
         @klass.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           def _one_time_conditions_valid_#{@callback_id}?
-            true #{key_options[0]}
+            true if #{key_options}
           end
         RUBY_EVAL
       end
@@ -171,8 +171,8 @@ module ActiveSupport
           # if condition    # before_save :filter_name, :if => :condition
           #   filter_name
           # end
-          filter = <<-RUBY_EVAL
-            unless halted
+          <<-RUBY_EVAL
+            if !halted && #{@compiled_options}
               # This double assignment is to prevent warnings in 1.9.3.  I would
               # remove the `result` variable, but apparently some other
               # generated code is depending on this variable being set sometimes
@@ -181,8 +181,6 @@ module ActiveSupport
               halted = (#{chain.config[:terminator]})
             end
           RUBY_EVAL
-
-          [@compiled_options[0], filter, @compiled_options[1]].compact.join("\n")
         when :around
           # Compile around filters with conditions into proxy methods
           # that contain the conditions.
@@ -202,7 +200,7 @@ module ActiveSupport
           name = "_conditional_callback_#{@kind}_#{next_id}"
           @klass.class_eval <<-RUBY_EVAL,  __FILE__, __LINE__ + 1
              def #{name}(halted)
-              #{@compiled_options[0] || "if true"} && !halted
+              if #{@compiled_options} && !halted
                 #{@filter} do
                   yield self
                 end
@@ -222,10 +220,12 @@ module ActiveSupport
 
         case @kind
         when :after
-          # if condition    # after_save :filter_name, :if => :condition
-          #   filter_name
-          # end
-          [@compiled_options[0], @filter, @compiled_options[1]].compact.join("\n")
+          # after_save :filter_name, :if => :condition
+          <<-RUBY_EVAL
+          if #{@compiled_options}
+            #{@filter}
+          end
+          RUBY_EVAL
         when :around
           <<-RUBY_EVAL
             value
@@ -240,9 +240,7 @@ module ActiveSupport
       # symbols, string, procs, and objects), so compile a conditional
       # expression based on the options
       def _compile_options(options)
-        return [] if options[:if].empty? && options[:unless].empty?
-
-        conditions = []
+        conditions = ["true"]
 
         unless options[:if].empty?
           conditions << Array.wrap(_compile_filter(options[:if]))
@@ -252,7 +250,7 @@ module ActiveSupport
           conditions << Array.wrap(_compile_filter(options[:unless])).map {|f| "!#{f}"}
         end
 
-        ["if #{conditions.flatten.join(" && ")}", "end"]
+        conditions.flatten.join(" && ")
       end
 
       # Filters support:
-- 
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(-)

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 84908fa38264ea6de55fb7a858b4af7b64bb6efa Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Fri, 11 Nov 2011 13:34:55 -0500
Subject: For what it's worth; Update `memcache-client` gem name

---
 railties/guides/source/caching_with_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index 4273d0dd64..5bf2284230 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -293,7 +293,7 @@ Note that the cache will grow until the disk is full unless you periodically cle
 
 h4. ActiveSupport::Cache::MemCacheStore
 
-This cache store uses Danga's +memcached+ server to provide a centralized cache for your application. Rails uses the bundled +memcached-client+ gem by default. This is currently the most popular cache store for production websites. It can be used to provide a single, shared cache cluster with very a high performance and redundancy.
+This cache store uses Danga's +memcached+ server to provide a centralized cache for your application. Rails uses the bundled +memcache-client+ gem by default. This is currently the most popular cache store for production websites. It can be used to provide a single, shared cache cluster with very a high performance and redundancy.
 
 When initializing the cache, you need to specify the addresses for all memcached servers in your cluster. If none is specified, it will assume memcached is running on the local host on the default port, but this is not an ideal set up for larger sites.
 
-- 
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(-)

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(-)

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(-)

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 df300a754bf64d0c350fdc8c69408c5bd04b80a3 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sat, 12 Nov 2011 15:16:53 -0200
Subject: Allow to use ruby-debug in 1.9.3

---
 Gemfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index f94f267f05..1b7d478f18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,8 +41,7 @@ platforms :mri_18 do
 end
 
 platforms :mri_19 do
-  # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19", :require => "ruby-debug" unless RUBY_VERSION > "1.9.2" || ENV['TRAVIS']
+  gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS']
 end
 
 platforms :mri do
-- 
cgit v1.2.3


From a02b40a3d28c4b262dd49a8a6166c0275dfd9964 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sun, 13 Nov 2011 13:18:55 +0800
Subject: Fix "in memory" where it should be "in-memory".

---
 activesupport/lib/active_support/cache/file_store.rb           | 2 +-
 activesupport/lib/active_support/cache/mem_cache_store.rb      | 2 +-
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb
index 85e7e21624..9460532af0 100644
--- a/activesupport/lib/active_support/cache/file_store.rb
+++ b/activesupport/lib/active_support/cache/file_store.rb
@@ -8,7 +8,7 @@ module ActiveSupport
     # A cache store implementation which stores everything on the filesystem.
     #
     # FileStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class FileStore < Store
       attr_reader :cache_path
 
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index ba37f3e871..530839b24d 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -21,7 +21,7 @@ module ActiveSupport
     #   server goes down, then MemCacheStore will ignore it until it comes back up.
     #
     # MemCacheStore implements the Strategy::LocalCache strategy which implements
-    # an in memory cache inside of a block.
+    # an in-memory cache inside of a block.
     class MemCacheStore < Store
       module Response # :nodoc:
         STORED      = "STORED\r\n"
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 0649a058aa..db5f228a70 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -4,9 +4,9 @@ require 'active_support/core_ext/string/inflections'
 module ActiveSupport
   module Cache
     module Strategy
-      # Caches that implement LocalCache will be backed by an in memory cache for the
+      # Caches that implement LocalCache will be backed by an in-memory cache for the
       # duration of a block. Repeated calls to the cache for the same key will hit the
-      # in memory cache for faster access.
+      # in-memory cache for faster access.
       module LocalCache
         # Simple memory backed cache. This cache is not thread safe and is intended only
         # for serving as a temporary memory cache for a single thread.
-- 
cgit v1.2.3


From 650ec898e5f4668b63925d05f8b722a5226a79dd Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sun, 13 Nov 2011 13:25:39 +0800
Subject: Suggest a workaround for page caching and parameters instead of an
 unhelpful warning.

---
 railties/guides/source/caching_with_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index 5bf2284230..972579b453 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -64,7 +64,7 @@ end
 
 If you want a more complicated expiration scheme, you can use cache sweepers to expire cached objects when things change. This is covered in the section on Sweepers.
 
-NOTE: Page caching ignores all parameters. For example +/products?page=1+ will be written out to the filesystem as +products.html+ with no reference to the +page+ parameter. Thus, if someone requests +/products?page=2+ later, they will get the cached first page. Be careful when page caching GET parameters in the URL!
+NOTE: Page caching ignores all parameters. For example +/products?page=1+ will be written out to the filesystem as +products.html+ with no reference to the +page+ parameter. Thus, if someone requests +/products?page=2+ later, they will get the cached first page. A workaround for this limitation is to include the parameters in the page's path, e.g. +/productions/page/1+.
 
 INFO: Page caching runs in an after filter. Thus, invalid requests won't generate spurious cache entries as long as you halt them. Typically, a redirection in some before filter that checks request preconditions does the job.
 
-- 
cgit v1.2.3


From d9703fe92ea0d39eed7bec44027468e6fed70a8a Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sun, 13 Nov 2011 13:34:16 +0800
Subject: Clearing cache in action caching is not "the exact same way" as with
 page caching.

---
 railties/guides/source/caching_with_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index 972579b453..aa08148bdb 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -72,7 +72,7 @@ h4. Action Caching
 
 One of the issues with Page Caching is that you cannot use it for pages that require to restrict access somehow. This is where Action Caching comes in. Action Caching works like Page Caching except for the fact that the incoming web request does go from the webserver to the Rails stack and Action Pack so that before filters can be run on it before the cache is served. This allows authentication and other restriction to be run while still serving the result of the output from a cached copy.
 
-Clearing the cache works in the exact same way as with Page Caching.
+Clearing the cache works in a similar way to Page Caching, except you use the +expire_action+ instead of +expire_page+.
 
 Let's say you only wanted authenticated users to call actions on +ProductsController+.
 
-- 
cgit v1.2.3


From f323b425f29b633e07441cbc97fcbecf7e4b61a8 Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sun, 13 Nov 2011 13:35:32 +0800
Subject: Fix bad English.

---
 railties/guides/source/caching_with_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/caching_with_rails.textile b/railties/guides/source/caching_with_rails.textile
index aa08148bdb..0ef6f51190 100644
--- a/railties/guides/source/caching_with_rails.textile
+++ b/railties/guides/source/caching_with_rails.textile
@@ -72,7 +72,7 @@ h4. Action Caching
 
 One of the issues with Page Caching is that you cannot use it for pages that require to restrict access somehow. This is where Action Caching comes in. Action Caching works like Page Caching except for the fact that the incoming web request does go from the webserver to the Rails stack and Action Pack so that before filters can be run on it before the cache is served. This allows authentication and other restriction to be run while still serving the result of the output from a cached copy.
 
-Clearing the cache works in a similar way to Page Caching, except you use the +expire_action+ instead of +expire_page+.
+Clearing the cache works in a similar way to Page Caching, except you use +expire_action+ instead of +expire_page+.
 
 Let's say you only wanted authenticated users to call actions on +ProductsController+.
 
-- 
cgit v1.2.3


From 962c55de0d24561d54babe5608630f93afc2681f Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:16:58 -0700
Subject: Add Tip about skipping to Section 3 if they want to come back to the
 philosophy later

---
 railties/guides/source/getting_started.textile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index bf6104b96b..ce556a0f87 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -46,6 +46,10 @@ in rails/railties/guides/code/getting_started.
 
 h3. What is Rails?
 
+TIP: This section goes into the background and philosophy of the Rails framework
+in detail. You can safely skip this section and come back to it at a later time.
+Section 3 starts you on the path to creating your first Rails application.
+
 Rails is a web application development framework written in the Ruby language.
 It is designed to make programming web applications easier by making assumptions
 about what every developer needs to get started. It allows you to write less
-- 
cgit v1.2.3


From ee100128c3a917f96d6f40293bb5a5ed3bcf8c27 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:18:24 -0700
Subject: Move paragraphs to flow better

- Give the user a way to know they are fully installed and ready to continue
---
 railties/guides/source/getting_started.textile | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index ce556a0f87..447b8e86d0 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -219,7 +219,12 @@ Ian Robinson
 
 h3. Creating a New Rails Project
 
-If you follow this guide, you'll create a Rails project called <tt>blog</tt>, a
+The best way to use this guide is to follow each step as it happens, no code or
+step needed to make this example application has been left out, so you can
+literally follow along step by step. If you need to see the completed code, you
+can download it from "Getting Started Code":https://github.com/mikel/getting-started-code.
+
+By following along with this guide, you'll create a Rails project called <tt>blog</tt>, a
 (very) simple weblog. Before you can start building the application, you need to
 make sure that you have Rails itself installed.
 
@@ -237,13 +242,16 @@ Usually run this as the root user:
 TIP. If you're working on Windows, you can quickly install Ruby and Rails with
 "Rails Installer":http://railsinstaller.org.
 
-h4. Creating the Blog Application
+To verify that you have everything installed correctly, you should be able to run
+the following:
 
-The best way to use this guide is to follow each step as it happens, no code or
-step needed to make this example application has been left out, so you can
-literally follow along step by step. If you need to see the completed code, you
-can download it from "Getting Started
-Code":https://github.com/mikel/getting-started-code.
+<shell>
+# rails --version
+</shell>
+
+If it says something like "Rails 3.1.1" you are ready to continue.
+
+h4. Creating the Blog Application
 
 To begin, open a terminal, navigate to a folder where you have rights to create
 files, and type:
-- 
cgit v1.2.3


From 6ac65c92029d3eefd101f9458d86bae0314cd14c Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:19:21 -0700
Subject: Use rails help new instead of rails new -h

---
 railties/guides/source/getting_started.textile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 447b8e86d0..b9a0f6a8ba 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -263,8 +263,7 @@ $ rails new blog
 This will create a Rails application called Blog in a directory called blog.
 
 TIP: You can see all of the switches that the Rails application builder accepts
-by running
-<tt>rails new -h</tt>.
+by running <tt>rails help new</tt>.
 
 After you create the blog application, switch to its folder to continue work
 directly in that application:
-- 
cgit v1.2.3


From b778a7eefbf755f5f131b5af06a4c555628075a9 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:21:40 -0700
Subject: Updated wording on what 'rails new blog' did for the user

- Alphabetized the files/folders created
- Added link to Configuring Rails Applications
---
 railties/guides/source/getting_started.textile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index b9a0f6a8ba..dfd27459b4 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -272,28 +272,28 @@ directly in that application:
 $ cd blog
 </shell>
 
-In any case, Rails will create a folder in your working directory called
-<tt>blog</tt>. Open up that folder and explore its contents. Most of the work in
+The 'rails new blog' command we ran above created a folder in your working directory 
+called <tt>blog</tt>. The <tt>blog</tt> folder has a number of auto-generated folders
+that make up the structure of a Rails application. Most of the work in
 this tutorial will happen in the <tt>app/</tt> folder, but here's a basic
-rundown on the function of each folder that Rails creates in a new application
-by default:
+rundown on the function of each of the files and folders that Rails created by default:
 
 |_.File/Folder|_.Purpose|
-|Gemfile|This file allows you to specify what gem dependencies are needed for your Rails application. See section on Bundler, below.|
-|README|This is a brief instruction manual for your application. You should edit this file to tell others what your application does, how to set it up, and so on.|
-|Rakefile|This file locates and loads tasks that can be run from the command line. The task definitions are defined throughout the components of Rails. Rather than changing Rakefile, you should add your own tasks by adding files to the lib/tasks directory of your application.|
 |app/|Contains the controllers, models, views and assets for your application. You'll focus on this folder for the remainder of this guide.|
-|config/|Configure your application's runtime rules, routes, database, and more.|
+|config/|Configure your application's runtime rules, routes, database, and more.  This is covered in more detail in "Configuring Rails Applications":configuring.html|
 |config.ru|Rack configuration for Rack based servers used to start the application.|
-|db/|Shows your current database schema, as well as the database migrations. You'll learn about migrations shortly.|
+|db/|Contains your current database schema, as well as the database migrations.|
 |doc/|In-depth documentation for your application.|
-|lib/|Extended modules for your application (not covered in this guide).|
+|Gemfile<BR />Gemfile.lock|These files allow you to specify what gem dependencies are needed for your Rails application.|
+|lib/|Extended modules for your application.|
 |log/|Application log files.|
 |public/|The only folder seen to the world as-is. Contains the static files and compiled assets.|
+|Rakefile|This file locates and loads tasks that can be run from the command line. The task definitions are defined throughout the components of Rails. Rather than changing Rakefile, you should add your own tasks by adding files to the lib/tasks directory of your application.|
+|README|This is a brief instruction manual for your application. You should edit this file to tell others what your application does, how to set it up, and so on.|
 |script/|Contains the rails script that starts your app and can contain other scripts you use to deploy or run your application.|
 |test/|Unit tests, fixtures, and other test apparatus. These are covered in "Testing Rails Applications":testing.html|
 |tmp/|Temporary files|
-|vendor/|A place for all third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you install it into your project) and plugins containing additional prepackaged functionality.|
+|vendor/|A place for all third-party code. In a typical Rails application, this includes Ruby Gems, the Rails source code (if you optionally install it into your project) and plugins containing additional prepackaged functionality.|
 
 h4. Configuring a Database
 
-- 
cgit v1.2.3


From 194a42e7aa7d1812257b14eabdd30c35f45bc8ed Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:24:44 -0700
Subject: Updated wording to read better

---
 railties/guides/source/getting_started.textile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index dfd27459b4..86fcb226d5 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -300,11 +300,12 @@ h4. Configuring a Database
 Just about every Rails application will interact with a database. The database
 to use is specified in a configuration file, +config/database.yml+.  If you open
 this file in a new Rails application, you'll see a default database
-configuration using SQLite3. The file contains sections for three different
+configured to use SQLite3. The file contains sections for three different
 environments in which Rails can run by default:
 
-* The +development+ environment is used on your development computer as you interact manually with the application.
-* The +test+ environment is used to run automated tests.
+* The +development+ environment is used on your development/local computer as you interact 
+manually with the application.
+* The +test+ environment is used when running automated tests.
 * The +production+ environment is used when you deploy your application for the world to use.
 
 h5. Configuring an SQLite3 Database
-- 
cgit v1.2.3


From 4bf057b8661754948681a18cf17ff5676518d774 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:25:45 -0700
Subject: Move Tip up higher so users who are fine with SQLite can skip to the
 next section

---
 railties/guides/source/getting_started.textile | 34 ++++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 86fcb226d5..63afc5898f 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -334,7 +334,17 @@ and PostgreSQL "out of the box", and has plugins for many database systems. If
 you are using a database in a production environment Rails most likely has an
 adapter for it.
 
-h5. Configuring a MySQL Database
+h5. Other database configuration options
+
+TIP: You don't have to update the database configurations manually. If you look at the
+options of the application generator, you will see that one of the options
+is named <tt>--database</tt>. This option allows you to choose an adapter from a
+list of the most used relational databases. You can even run the generator
+repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
+ of the +config/database.yml+ file, your application will be configured for MySQL
+instead of SQLite.
+
+h6. Configuring a MySQL Database
 
 If you choose to use MySQL instead of the shipped SQLite3 database, your
 +config/database.yml+ will look a little different. Here's the development
@@ -355,7 +365,7 @@ If your development computer's MySQL installation includes a root user with an
 empty password, this configuration should work for you. Otherwise, change the
 username and password in the +development+ section as appropriate.
 
-h5. Configuring a PostgreSQL Database
+h6. Configuring a PostgreSQL Database
 
 If you choose to use PostgreSQL, your +config/database.yml+ will be customized
 to use PostgreSQL databases:
@@ -370,9 +380,9 @@ development:
   password:
 </yaml>
 
-h5. Configuring an SQLite3 Database for JRuby Platform
+h6. Configuring an SQLite3 Database for JRuby Platform
 
-If you choose to use SQLite3 and are using JRuby, your +config/database.yml+ will
+If you choose to use SQLite3 and using JRuby, your +config/database.yml+ will
 look a little different. Here's the development section:
 
 <yaml>
@@ -381,9 +391,9 @@ development:
   database: db/development.sqlite3
 </yaml>
 
-h5. Configuring a MySQL Database for JRuby Platform
+h6. Configuring a MySQL Database for JRuby Platform
 
-If you choose to use MySQL and are using JRuby, your +config/database.yml+ will look
+If you choose to use MySQL and using JRuby, your +config/database.yml+ will look
 a little different. Here's the development section:
 
 <yaml>
@@ -394,9 +404,9 @@ development:
   password:
 </yaml>
 
-h5. Configuring a PostgreSQL Database for JRuby Platform
+h6. Configuring a PostgreSQL Database for JRuby Platform
 
-Finally if you choose to use PostgreSQL and are using JRuby, your
+Finally if you choose to use PostgreSQL and using JRuby, your
 +config/database.yml+ will look a little different. Here's the development
 section:
 
@@ -411,14 +421,6 @@ development:
 
 Change the username and password in the +development+ section as appropriate.
 
-TIP: You don't have to update the database configurations manually. If you look at the
-options of the application generator, you will see that one of the options
-is named <tt>--database</tt>. This option allows you to choose an adapter from a
-list of the most used relational databases. You can even run the generator
-repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
- of the +config/database.yml+ file, your application will be configured for MySQL
-instead of SQLite.
-
 h4. Creating the Database
 
 Now that you have your database configured, it's time to have Rails create an
-- 
cgit v1.2.3


From 703d5c2033665987c2fa6eff9f39095fb6c03061 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:26:23 -0700
Subject: Fix typo

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 63afc5898f..c40c21102c 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -494,7 +494,7 @@ Open this file in your text editor and edit it to contain a single line of code:
 h4. Setting the Application Home Page
 
 Now that we have made the controller and view, we need to tell Rails when we
-want "Hello Rails" to show up. In our case, we want it to show up when we
+want "Hello Rails!" to show up. In our case, we want it to show up when we
 navigate to the root URL of our site,
 "http://localhost:3000":http://localhost:3000, instead of the "Welcome Aboard"
 smoke test.
-- 
cgit v1.2.3


From 434fbe454cb2367e74b757ba34b7035f7379ac8a Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:27:14 -0700
Subject: Update wording to flow better

---
 railties/guides/source/getting_started.textile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index c40c21102c..78cf01cdc0 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -515,8 +515,8 @@ file_ which holds entries in a special DSL (domain-specific language) that tells
 Rails how to connect incoming requests to controllers and actions. This file
 contains many sample routes on commented lines, and one of them actually shows
 you how to connect the root of your site to a specific controller and action.
-Find the line beginning with +root :to+, uncomment it and change it like the
-following:
+Find the line beginning with +root :to+, uncomment it by removing the pound sign
+at the beginning of the line.  It should look something like the following:
 
 <ruby>
 Blog::Application.routes.draw do
@@ -544,7 +544,7 @@ resource in a single operation, scaffolding is the tool for the job.
 
 h3. Creating a Resource
 
-In the case of the blog application, you can start by generating a scaffolded
+In the case of the blog application, you can start by generating a scaffold for the
 Post resource: this will represent a single blog posting. To do this, enter this
 command in your terminal:
 
-- 
cgit v1.2.3


From 094bb8e50c839be9f5ed93282ececeb4e3a15d76 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:28:09 -0700
Subject: Update order so they show up in the order they do in the scaffolding
 output

---
 railties/guides/source/getting_started.textile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 78cf01cdc0..d8e55eed60 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -558,21 +558,21 @@ folders, and edit <tt>config/routes.rb</tt>. Here's a quick overview of what it
 |_.File                                       |_.Purpose|
 |db/migrate/20100207214725_create_posts.rb    |Migration to create the posts table in your database (your name will include a different timestamp)|
 |app/models/post.rb                           |The Post model|
-|test/fixtures/posts.yml                      |Dummy posts for use in testing|
+|test/unit/post_test.rb                       |Unit testing harness for the posts model|
+|test/fixtures/posts.yml                      |Sample posts for use in testing|
+|config/routes.rb                             |Edited to include routing information for posts|
 |app/controllers/posts_controller.rb          |The Posts controller|
 |app/views/posts/index.html.erb               |A view to display an index of all posts |
 |app/views/posts/edit.html.erb                |A view to edit an existing post|
 |app/views/posts/show.html.erb                |A view to display a single post|
 |app/views/posts/new.html.erb                 |A view to create a new post|
 |app/views/posts/_form.html.erb               |A partial to control the overall look and feel of the form used in edit and new views|
-|app/helpers/posts_helper.rb                  |Helper functions to be used from the post views|
-|app/assets/stylesheets/scaffolds.css.scss    |Cascading style sheet to make the scaffolded views look better|
-|app/assets/stylesheets/posts.css.scss        |Cascading style sheet for the posts controller|
-|app/assets/javascripts/posts.js.coffee       |CoffeeScript for the posts controller|
-|test/unit/post_test.rb                       |Unit testing harness for the posts model|
 |test/functional/posts_controller_test.rb     |Functional testing harness for the posts controller|
+|app/helpers/posts_helper.rb                  |Helper functions to be used from the post views|
 |test/unit/helpers/posts_helper_test.rb       |Unit testing harness for the posts helper|
-|config/routes.rb                             |Edited to include routing information for posts|
+|app/assets/javascripts/posts.js.coffee       |CoffeeScript for the posts controller|
+|app/assets/stylesheets/posts.css.scss        |Cascading style sheet for the posts controller|
+|app/assets/stylesheets/scaffolds.css.scss    |Cascading style sheet to make the scaffolded views look better|
 
 NOTE. While scaffolding will get you up and running quickly, the code it
 generates is unlikely to be a perfect fit for your application. You'll most
-- 
cgit v1.2.3


From 06a8d16c8e0d87ab9a0dbba642aeb255f877cc8e Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:29:11 -0700
Subject: Update wording to be more explicit on what the timestamp fields track

---
 railties/guides/source/getting_started.textile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index d8e55eed60..01e0def226 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -609,12 +609,12 @@ class CreatePosts < ActiveRecord::Migration
 end
 </ruby>
 
-The above migration creates a method named +change+ which will be called when you
-run this migration. The action defined in that method is also reversible, which
+The above migration has one method named +change+ which will be called when you
+run this migration. The action defined in this method is also reversible, which
 means Rails knows how to reverse the change made by this migration, in case you
-want to reverse it at later date. By default, when you run this migration it
-creates a +posts+ table with two string columns and a text column. It also
-creates two timestamp fields to track record creation and updating. More
+want to reverse it at later date. When you run this migration it will create a 
++posts+ table with two string columns and a text column. It also creates two 
+timestamp fields to allow Rails to track post creation and update times. More
 information about Rails migrations can be found in the "Rails Database
 Migrations":migrations.html guide.
 
-- 
cgit v1.2.3


From 1394c5447a8c27ab654556595468b7a0376c0cc9 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:31:07 -0700
Subject: Update wording to read better

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 01e0def226..d4bb55b5ba 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -634,7 +634,7 @@ table.
 ==  CreatePosts: migrated (0.0020s) ===========================================
 </shell>
 
-NOTE. Because by default you're working in the development environment, this
+NOTE. Because you're working in the development environment by default, this
 command will apply to the database defined in the +development+ section of your
 +config/database.yml+ file. If you would like to execute migrations in another
 environment, for instance in production, you must explicitly pass it when
-- 
cgit v1.2.3


From fc8f0a85b5c6869aed3f8d05b15c6b014deb054f Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:31:33 -0700
Subject: Add link to AR Validations and Callbacks to further explain
 validations

---
 railties/guides/source/getting_started.textile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index d4bb55b5ba..1f1976393f 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -705,7 +705,8 @@ end
 These changes will ensure that all posts have a name and a title, and that the
 title is at least five characters long. Rails can validate a variety of
 conditions in a model, including the presence or uniqueness of columns, their
-format, and the existence of associated objects.
+format, and the existence of associated objects.  Validations are covered in detail
+in "Active Record Validations and Callbacks":active_record_validations_callbacks.html#validations-overview
 
 h4. Using the Console
 
-- 
cgit v1.2.3


From cb552f807e5bb2650791d17b01b6ac67c6023937 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:32:26 -0700
Subject: p.errors.full_messages is a little more human readable

---
 railties/guides/source/getting_started.textile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 1f1976393f..e88d0a7629 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -731,10 +731,8 @@ After the console loads, you can use it to work with your application's models:
      updated_at: nil>
 >> p.save
 => false
->> p.errors
-=> #<OrderedHash { :title=>["can't be blank",
-                           "is too short (minimum is 5 characters)"],
-                   :name=>["can't be blank"] }>
+>> p.errors.full_messages
+=> ["Name can't be blank", "Title can't be blank", "Title is too short (minimum is 5 characters)"]
 </shell>
 
 This code shows creating a new +Post+ instance, attempting to save it and
-- 
cgit v1.2.3


From 9b96f7414e7380266ed5ccf582f55f1e10ba877b Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:33:29 -0700
Subject: Be explicit about changing code

---
 railties/guides/source/getting_started.textile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index e88d0a7629..1d03698f4a 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -742,8 +742,8 @@ inspecting the +errors+ of the post.
 When you're finished, type +exit+ and hit +return+ to exit the console.
 
 TIP: Unlike the development web server, the console does not automatically load
-your code afresh for each line. If you make changes to your models while the
-console is open, type +reload!+ at the console prompt to load them.
+your code afresh for each line. If you make changes to your models (in your editor)
+while the console is open, type +reload!+ at the console prompt to load them.
 
 h4. Listing All Posts
 
-- 
cgit v1.2.3


From 3e3872b5985f0b360571b97cdc1b3203989d40fd Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:35:08 -0700
Subject: Make the guide more friendly

- Changed Rails 3.0 to 3.0+
---
 railties/guides/source/getting_started.textile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 1d03698f4a..bd929a6ae2 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -747,8 +747,9 @@ while the console is open, type +reload!+ at the console prompt to load them.
 
 h4. Listing All Posts
 
-The easiest place to start looking at functionality is with the code that lists
-all posts. Open the file +app/controllers/posts_controller.rb+ and look at the
+Let's dive into the Rails code a little deeper to see how the application is
+showing us the list of Posts. Open the file 
++app/controllers/posts_controller.rb+ and look at the
 +index+ action:
 
 <ruby>
@@ -762,9 +763,9 @@ def index
 end
 </ruby>
 
-+Post.all+ calls the +Post+ model to return all of the posts currently in the
-database. The result of this call is an array of posts that we store in an
-instance variable called +@posts+.
++Post.all+ calls the all method on the +Post+ model, which returns all of 
+the posts currently in the database. The result of this call is an array 
+of Post records that we store in an instance variable called +@posts+.
 
 TIP: For more information on finding records with Active Record, see "Active
 Record Query Interface":active_record_querying.html.
@@ -815,7 +816,7 @@ and links. A few things to note in the view:
 
 NOTE. In previous versions of Rails, you had to use +&lt;%=h post.name %&gt;+ so
 that any HTML would be escaped before being inserted into the page. In Rails
-3.0, this is now the default. To get unescaped HTML, you now use +&lt;%= raw
+3.0+, this is now the default. To get unescaped HTML, you now use +&lt;%= raw
 post.name %&gt;+.
 
 TIP: For more details on the rendering process, see "Layouts and Rendering in
@@ -829,9 +830,10 @@ Rails renders a view to the browser, it does so by putting the view's HTML into
 a layout's HTML. In previous versions of Rails, the +rails generate scaffold+
 command would automatically create a controller specific layout, like
 +app/views/layouts/posts.html.erb+, for the posts controller. However this has
-been changed in Rails 3.0. An application specific +layout+ is used for all the
+been changed in Rails 3.0+. An application specific +layout+ is used for all the
 controllers and can be found in +app/views/layouts/application.html.erb+. Open
-this layout in your editor and modify the +body+ tag:
+this layout in your editor and modify the +body+ tag to include the style directive
+below:
 
 <erb>
 <!DOCTYPE html>
-- 
cgit v1.2.3


From 5e83491e976c867c57892d1542dbbcf571bada41 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 01:40:28 -0700
Subject: Be explicit on where the show.html.erb is located

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index bd929a6ae2..8f48c52442 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1011,7 +1011,7 @@ end
 
 The +show+ action uses +Post.find+ to search for a single record in the database
 by its id value. After finding the record, Rails displays it by using
-+show.html.erb+:
++app/views/posts/show.html.erb+:
 
 <erb>
 <p class="notice"><%= notice %></p>
-- 
cgit v1.2.3


From bf6efa8d9cd0f7ce2eea7c1a0ff51f1d165cafc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noe=CC=81=20Froidevaux?= <noe.froidevaux@webdoc.com>
Date: Sun, 13 Nov 2011 11:03:22 +0100
Subject: Fix pull request #3609

---
 .../lib/active_record/connection_adapters/abstract/connection_pool.rb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 92dfb844db..0ec0576795 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -127,7 +127,7 @@ module ActiveRecord
 
         with_connection do |conn|
           conn.tables.each { |table| @tables[table] = true }
-          @tables[name] = !@tables.key?(name) && conn.table_exists?(name)
+          @tables[name] = conn.table_exists?(name) if !@tables.key?(name)
         end
 
         @tables[name]
-- 
cgit v1.2.3


From c0ee497436718ae6be50cfef5ee83473f1070fcd Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 03:12:13 -0700
Subject: Grammar change

---
 railties/guides/source/getting_started.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 8f48c52442..d0ba07a82d 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1116,7 +1116,7 @@ the controller.
 
 h3. Adding a Second Model
 
-Now that you've seen how a model built with scaffolding looks like, it's time to
+Now that you've seen what a model built with scaffolding looks like, it's time to
 add a second model to the application. The second model will handle comments on
 blog posts.
 
-- 
cgit v1.2.3


From 0774f22941f6846acd79a07d43cd417cd09a1998 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 03:13:58 -0700
Subject: Convert tables to table format

---
 railties/guides/source/getting_started.textile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index d0ba07a82d..f387dddce8 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1135,9 +1135,11 @@ $ rails generate model Comment commenter:string body:text post:references
 
 This command will generate four files:
 
-* +app/models/comment.rb+ - The model.
-* +db/migrate/20100207235629_create_comments.rb+ - The migration.
-* +test/unit/comment_test.rb+ and +test/fixtures/comments.yml+ - The test harness.
+|_.File                                       |_.Purpose|
+|db/migrate/20100207235629_create_comments.rb | Migration to create the comments table in your database (your name will include a different timestamp) |
+| app/models/comment.rb                       | The Comment model |
+| test/unit/comment_test.rb                   | Unit testing harness for the comments model |
+| test/fixtures/comments.yml                  | Sample comments for use in testing |
 
 First, take a look at +comment.rb+:
 
@@ -1258,13 +1260,14 @@ $ rails generate controller Comments
 
 This creates six files and one empty directory:
 
-* +app/controllers/comments_controller.rb+ - The controller.
-* +app/helpers/comments_helper.rb+ - A view helper file.
-* +test/functional/comments_controller_test.rb+ - The functional tests for the controller.
-* +test/unit/helpers/comments_helper_test.rb+ - The unit tests for the helper.
-* +app/views/comments/+ - Views of the controller are stored here.
-* +app/assets/stylesheets/comment.css.scss+ - Cascading style sheet for the controller.
-* +app/assets/javascripts/comment.js.coffee+ - CoffeeScript for the controller.
+|_.File/Directory                             |_.Purpose                                 |
+| app/controllers/comments_controller.rb      | The Comments controller                  |
+| app/views/comments/                         | Views of the controller are stored here  |
+| test/functional/comments_controller_test.rb | The functional tests for the controller  |
+| app/helpers/comments_helper.rb              | A view helper file                       |
+| test/unit/helpers/comments_helper_test.rb   | The unit tests for the helper            |
+| app/assets/javascripts/comment.js.coffee    | CoffeeScript for the controller          |
+| app/assets/stylesheets/comment.css.scss     | Cascading style sheet for the controller |
 
 Like with any blog, our readers will create their comments directly after
 reading the post, and once they have added their comment, will be sent back to
-- 
cgit v1.2.3


From a3156ac0f2d57ca5a57c035530ff5b49f81716f3 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 03:15:22 -0700
Subject: Add output for add_index command

---
 railties/guides/source/getting_started.textile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index f387dddce8..8faacdd03e 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -1186,8 +1186,10 @@ run against the current database, so in this case you will just see:
 <shell>
 ==  CreateComments: migrating =================================================
 -- create_table(:comments)
-   -> 0.0017s
-==  CreateComments: migrated (0.0018s) ========================================
+   -> 0.0008s
+-- add_index(:comments, :post_id)
+   -> 0.0003s
+==  CreateComments: migrated (0.0012s) ========================================
 </shell>
 
 h4. Associating Models
-- 
cgit v1.2.3


From 50a9de514f8724b04d3681aa9ca228a8ca490909 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 03:15:56 -0700
Subject: Update guide to use Ruby 1.9 hash syntax

---
 railties/guides/source/getting_started.textile | 88 +++++++++++++-------------
 1 file changed, 43 insertions(+), 45 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 8faacdd03e..8f34e87e9a 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -524,10 +524,10 @@ Blog::Application.routes.draw do
   #...
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  root :to => "home#index"
+  root to: "home#index"
 </ruby>
 
-The +root :to => "home#index"+ tells Rails to map the root action to the home
+The +root to: "home#index"+ tells Rails to map the root action to the home
 controller's index action.
 
 Now if you navigate to "http://localhost:3000":http://localhost:3000 in your
@@ -696,9 +696,9 @@ Open the +app/models/post.rb+ file and edit it:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
+  validates :name,  presence: true
+  validates :title, presence: true,
+                    length: { minimum: 5 }
 end
 </ruby>
 
@@ -725,7 +725,7 @@ open a console that will roll back any changes you make by using <tt>rails conso
 After the console loads, you can use it to work with your application's models:
 
 <shell>
->> p = Post.new(:content => "A new post")
+>> p = Post.new(content: "A new post")
 => #<Post id: nil, name: nil, title: nil,
      content: "A new post", created_at: nil,
      updated_at: nil>
@@ -758,11 +758,15 @@ def index
 
   respond_to do |format|
     format.html  # index.html.erb
-    format.json  { render :json => @posts }
+    format.json  { render json: @posts }
   end
 end
 </ruby>
 
+TIP: This Guide was written using Ruby 1.9.2.  If you are using Ruby 1.8.7, some of
+the syntax may look slightly different.  For example, the hash syntax changed from
+render :json => @posts (1.8.7) to render json: @posts (1.9.2).
+
 +Post.all+ calls the all method on the +Post+ model, which returns all of 
 the posts currently in the database. The result of this call is an array 
 of Post records that we store in an instance variable called +@posts+.
@@ -797,8 +801,7 @@ Here's +app/views/posts/index.html.erb+:
     <td><%= post.content %></td>
     <td><%= link_to 'Show', post %></td>
     <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?',
-                                     :method => :delete %></td>
+    <td><%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %></td>
   </tr>
 <% end %>
 </table>
@@ -866,7 +869,7 @@ def new
 
   respond_to do |format|
     format.html  # new.html.erb
-    format.json  { render :json => @post }
+    format.json  { render json: @post }
   end
 end
 </ruby>
@@ -958,14 +961,11 @@ def create
 
   respond_to do |format|
     if @post.save
-      format.html  { redirect_to(@post,
-                    :notice => 'Post was successfully created.') }
-      format.json  { render :json => @post,
-                    :status => :created, :location => @post }
+      format.html { redirect_to @post, notice: 'Post was successfully created.' }
+      format.json { render json: @post, status: :created, location: @post }
     else
-      format.html  { render :action => "new" }
-      format.json  { render :json => @post.errors,
-                    :status => :unprocessable_entity }
+      format.html { render action: "new" }
+      format.json { render json: @post.errors, status: :unprocessable_entity }
     end
   end
 end
@@ -1003,8 +1003,8 @@ def show
   @post = Post.find(params[:id])
 
   respond_to do |format|
-    format.html  # show.html.erb
-    format.json  { render :json => @post }
+    format.html # show.html.erb
+    format.json { render json: @post }
   end
 end
 </ruby>
@@ -1073,13 +1073,11 @@ def update
 
   respond_to do |format|
     if @post.update_attributes(params[:post])
-      format.html  { redirect_to(@post,
-                    :notice => 'Post was successfully updated.') }
-      format.json  { render :json => {}, :status => :ok }
+      format.html { redirect_to @post, notice: 'Post was successfully updated.' }
+      format.json { head :ok }
     else
-      format.html  { render :action => "edit" }
-      format.json  { render :json => @post.errors,
-                    :status => :unprocessable_entity }
+      format.html { render action: "edit" }
+      format.json { render json: @post.errors, status: :unprocessable_entity }
     end
   end
 end
@@ -1215,9 +1213,9 @@ You'll need to edit the +post.rb+ file to add the other side of the association:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
+  validates :name,  presence: true
+  validates :title, presence: true,
+                    length: { :minimum: 5 }
 
   has_many :comments
 end
@@ -1559,8 +1557,8 @@ So first, let's add the delete link in the
 
 <p>
   <%= link_to 'Destroy Comment', [comment.post, comment],
-               :confirm => 'Are you sure?',
-               :method => :delete %>
+               confirm: 'Are you sure?',
+               method: :delete %>
 </p>
 </erb>
 
@@ -1602,10 +1600,10 @@ model, +app/models/post.rb+, as follows:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
-  has_many :comments, :dependent => :destroy
+  validates :name, presence: true
+  validates :title, presence: true,
+            length: {minimum: 5}
+  has_many :comments, dependent: :destroy
 end
 </ruby>
 
@@ -1629,7 +1627,7 @@ action, except for +index+ and +show+, so we write that:
 <ruby>
 class PostsController < ApplicationController
 
-  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => [:index, :show]
+  http_basic_authenticate_with name: "dhh", password: "secret", except: [:index, :show]
 
   # GET /posts
   # GET /posts.json
@@ -1645,7 +1643,7 @@ We also only want to allow authenticated users to delete comments, so in the
 <ruby>
 class CommentsController < ApplicationController
 
-  http_basic_authenticate_with :name => "dhh", :password => "secret", :only => :destroy
+  http_basic_authenticate_with name: "dhh", password: "secret", only: :destroy
 
   def create
     @post = Post.find(params[:post_id])
@@ -1683,15 +1681,14 @@ edit tags via posts:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name,  :presence => true
-  validates :title, :presence => true,
-                    :length => { :minimum => 5 }
-
-  has_many :comments, :dependent => :destroy
+  validates :name, presence: true
+  validates :title, presence: true,
+            length: {minimum: 5}
+  has_many :comments, dependent: :destroy
   has_many :tags
 
-  accepts_nested_attributes_for :tags, :allow_destroy => :true,
-    :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
+  accepts_nested_attributes_for :tags, allow_destroy: :true,
+    reject_if: proc { |attrs| attrs.all? { |k, v| v.blank? } }
 end
 </ruby>
 
@@ -1729,8 +1726,9 @@ We will modify +views/posts/_form.html.erb+ to render a partial to make a tag:
     <%= post_form.text_area :content %>
   </div>
   <h2>Tags</h2>
-  <%= render :partial => 'tags/form',
-             :locals => {:form => post_form} %>
+  <%= render partial: 'tags/form',
+             locals: {form: post_form} %>
+
   <div class="actions">
     <%= post_form.submit %>
   </div>
-- 
cgit v1.2.3


From e1099eb4fdb64b82485843a569ecd5006aa3dad8 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 13 Nov 2011 21:50:18 +0530
Subject: Revert "Update guide to use Ruby 1.9 hash syntax"

This reverts commit 50a9de514f8724b04d3681aa9ca228a8ca490909.

Reason: Let's keep the guides at 1.8 syntax
---
 railties/guides/source/getting_started.textile | 88 +++++++++++++-------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 8f34e87e9a..8faacdd03e 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -524,10 +524,10 @@ Blog::Application.routes.draw do
   #...
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
-  root to: "home#index"
+  root :to => "home#index"
 </ruby>
 
-The +root to: "home#index"+ tells Rails to map the root action to the home
+The +root :to => "home#index"+ tells Rails to map the root action to the home
 controller's index action.
 
 Now if you navigate to "http://localhost:3000":http://localhost:3000 in your
@@ -696,9 +696,9 @@ Open the +app/models/post.rb+ file and edit it:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name,  presence: true
-  validates :title, presence: true,
-                    length: { minimum: 5 }
+  validates :name,  :presence => true
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
 end
 </ruby>
 
@@ -725,7 +725,7 @@ open a console that will roll back any changes you make by using <tt>rails conso
 After the console loads, you can use it to work with your application's models:
 
 <shell>
->> p = Post.new(content: "A new post")
+>> p = Post.new(:content => "A new post")
 => #<Post id: nil, name: nil, title: nil,
      content: "A new post", created_at: nil,
      updated_at: nil>
@@ -758,15 +758,11 @@ def index
 
   respond_to do |format|
     format.html  # index.html.erb
-    format.json  { render json: @posts }
+    format.json  { render :json => @posts }
   end
 end
 </ruby>
 
-TIP: This Guide was written using Ruby 1.9.2.  If you are using Ruby 1.8.7, some of
-the syntax may look slightly different.  For example, the hash syntax changed from
-render :json => @posts (1.8.7) to render json: @posts (1.9.2).
-
 +Post.all+ calls the all method on the +Post+ model, which returns all of 
 the posts currently in the database. The result of this call is an array 
 of Post records that we store in an instance variable called +@posts+.
@@ -801,7 +797,8 @@ Here's +app/views/posts/index.html.erb+:
     <td><%= post.content %></td>
     <td><%= link_to 'Show', post %></td>
     <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %></td>
+    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?',
+                                     :method => :delete %></td>
   </tr>
 <% end %>
 </table>
@@ -869,7 +866,7 @@ def new
 
   respond_to do |format|
     format.html  # new.html.erb
-    format.json  { render json: @post }
+    format.json  { render :json => @post }
   end
 end
 </ruby>
@@ -961,11 +958,14 @@ def create
 
   respond_to do |format|
     if @post.save
-      format.html { redirect_to @post, notice: 'Post was successfully created.' }
-      format.json { render json: @post, status: :created, location: @post }
+      format.html  { redirect_to(@post,
+                    :notice => 'Post was successfully created.') }
+      format.json  { render :json => @post,
+                    :status => :created, :location => @post }
     else
-      format.html { render action: "new" }
-      format.json { render json: @post.errors, status: :unprocessable_entity }
+      format.html  { render :action => "new" }
+      format.json  { render :json => @post.errors,
+                    :status => :unprocessable_entity }
     end
   end
 end
@@ -1003,8 +1003,8 @@ def show
   @post = Post.find(params[:id])
 
   respond_to do |format|
-    format.html # show.html.erb
-    format.json { render json: @post }
+    format.html  # show.html.erb
+    format.json  { render :json => @post }
   end
 end
 </ruby>
@@ -1073,11 +1073,13 @@ def update
 
   respond_to do |format|
     if @post.update_attributes(params[:post])
-      format.html { redirect_to @post, notice: 'Post was successfully updated.' }
-      format.json { head :ok }
+      format.html  { redirect_to(@post,
+                    :notice => 'Post was successfully updated.') }
+      format.json  { render :json => {}, :status => :ok }
     else
-      format.html { render action: "edit" }
-      format.json { render json: @post.errors, status: :unprocessable_entity }
+      format.html  { render :action => "edit" }
+      format.json  { render :json => @post.errors,
+                    :status => :unprocessable_entity }
     end
   end
 end
@@ -1213,9 +1215,9 @@ You'll need to edit the +post.rb+ file to add the other side of the association:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name,  presence: true
-  validates :title, presence: true,
-                    length: { :minimum: 5 }
+  validates :name,  :presence => true
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
 
   has_many :comments
 end
@@ -1557,8 +1559,8 @@ So first, let's add the delete link in the
 
 <p>
   <%= link_to 'Destroy Comment', [comment.post, comment],
-               confirm: 'Are you sure?',
-               method: :delete %>
+               :confirm => 'Are you sure?',
+               :method => :delete %>
 </p>
 </erb>
 
@@ -1600,10 +1602,10 @@ model, +app/models/post.rb+, as follows:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name, presence: true
-  validates :title, presence: true,
-            length: {minimum: 5}
-  has_many :comments, dependent: :destroy
+  validates :name,  :presence => true
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
+  has_many :comments, :dependent => :destroy
 end
 </ruby>
 
@@ -1627,7 +1629,7 @@ action, except for +index+ and +show+, so we write that:
 <ruby>
 class PostsController < ApplicationController
 
-  http_basic_authenticate_with name: "dhh", password: "secret", except: [:index, :show]
+  http_basic_authenticate_with :name => "dhh", :password => "secret", :except => [:index, :show]
 
   # GET /posts
   # GET /posts.json
@@ -1643,7 +1645,7 @@ We also only want to allow authenticated users to delete comments, so in the
 <ruby>
 class CommentsController < ApplicationController
 
-  http_basic_authenticate_with name: "dhh", password: "secret", only: :destroy
+  http_basic_authenticate_with :name => "dhh", :password => "secret", :only => :destroy
 
   def create
     @post = Post.find(params[:post_id])
@@ -1681,14 +1683,15 @@ edit tags via posts:
 
 <ruby>
 class Post < ActiveRecord::Base
-  validates :name, presence: true
-  validates :title, presence: true,
-            length: {minimum: 5}
-  has_many :comments, dependent: :destroy
+  validates :name,  :presence => true
+  validates :title, :presence => true,
+                    :length => { :minimum => 5 }
+
+  has_many :comments, :dependent => :destroy
   has_many :tags
 
-  accepts_nested_attributes_for :tags, allow_destroy: :true,
-    reject_if: proc { |attrs| attrs.all? { |k, v| v.blank? } }
+  accepts_nested_attributes_for :tags, :allow_destroy => :true,
+    :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
 end
 </ruby>
 
@@ -1726,9 +1729,8 @@ We will modify +views/posts/_form.html.erb+ to render a partial to make a tag:
     <%= post_form.text_area :content %>
   </div>
   <h2>Tags</h2>
-  <%= render partial: 'tags/form',
-             locals: {form: post_form} %>
-
+  <%= render :partial => 'tags/form',
+             :locals => {:form => post_form} %>
   <div class="actions">
     <%= post_form.submit %>
   </div>
-- 
cgit v1.2.3


From c8c08bd000c00817d2f17f560f392965fd82229b Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 13 Nov 2011 21:57:39 +0530
Subject: Revert "Use rails help new instead of rails new -h"

This reverts commit 6ac65c92029d3eefd101f9458d86bae0314cd14c.
---
 railties/guides/source/getting_started.textile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 8faacdd03e..98e7c93dc7 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -263,7 +263,8 @@ $ rails new blog
 This will create a Rails application called Blog in a directory called blog.
 
 TIP: You can see all of the switches that the Rails application builder accepts
-by running <tt>rails help new</tt>.
+by running
+<tt>rails new -h</tt>.
 
 After you create the blog application, switch to its folder to continue work
 directly in that application:
-- 
cgit v1.2.3


From af51409de433f14d251f7f229a2f651d3ddf7b1c Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 13 Nov 2011 22:07:54 +0530
Subject: Revert "Move Tip up higher so users who are fine with SQLite can skip
 to the next section"

This reverts commit 4bf057b8661754948681a18cf17ff5676518d774.

Reason: Prefer to keep the configuration of all databases at the same
level
---
 railties/guides/source/getting_started.textile | 34 ++++++++++++--------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 98e7c93dc7..9e774ff298 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -335,17 +335,7 @@ and PostgreSQL "out of the box", and has plugins for many database systems. If
 you are using a database in a production environment Rails most likely has an
 adapter for it.
 
-h5. Other database configuration options
-
-TIP: You don't have to update the database configurations manually. If you look at the
-options of the application generator, you will see that one of the options
-is named <tt>--database</tt>. This option allows you to choose an adapter from a
-list of the most used relational databases. You can even run the generator
-repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
- of the +config/database.yml+ file, your application will be configured for MySQL
-instead of SQLite.
-
-h6. Configuring a MySQL Database
+h5. Configuring a MySQL Database
 
 If you choose to use MySQL instead of the shipped SQLite3 database, your
 +config/database.yml+ will look a little different. Here's the development
@@ -366,7 +356,7 @@ If your development computer's MySQL installation includes a root user with an
 empty password, this configuration should work for you. Otherwise, change the
 username and password in the +development+ section as appropriate.
 
-h6. Configuring a PostgreSQL Database
+h5. Configuring a PostgreSQL Database
 
 If you choose to use PostgreSQL, your +config/database.yml+ will be customized
 to use PostgreSQL databases:
@@ -381,9 +371,9 @@ development:
   password:
 </yaml>
 
-h6. Configuring an SQLite3 Database for JRuby Platform
+h5. Configuring an SQLite3 Database for JRuby Platform
 
-If you choose to use SQLite3 and using JRuby, your +config/database.yml+ will
+If you choose to use SQLite3 and are using JRuby, your +config/database.yml+ will
 look a little different. Here's the development section:
 
 <yaml>
@@ -392,9 +382,9 @@ development:
   database: db/development.sqlite3
 </yaml>
 
-h6. Configuring a MySQL Database for JRuby Platform
+h5. Configuring a MySQL Database for JRuby Platform
 
-If you choose to use MySQL and using JRuby, your +config/database.yml+ will look
+If you choose to use MySQL and are using JRuby, your +config/database.yml+ will look
 a little different. Here's the development section:
 
 <yaml>
@@ -405,9 +395,9 @@ development:
   password:
 </yaml>
 
-h6. Configuring a PostgreSQL Database for JRuby Platform
+h5. Configuring a PostgreSQL Database for JRuby Platform
 
-Finally if you choose to use PostgreSQL and using JRuby, your
+Finally if you choose to use PostgreSQL and are using JRuby, your
 +config/database.yml+ will look a little different. Here's the development
 section:
 
@@ -422,6 +412,14 @@ development:
 
 Change the username and password in the +development+ section as appropriate.
 
+TIP: You don't have to update the database configurations manually. If you look at the
+options of the application generator, you will see that one of the options
+is named <tt>--database</tt>. This option allows you to choose an adapter from a
+list of the most used relational databases. You can even run the generator
+repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
+ of the +config/database.yml+ file, your application will be configured for MySQL
+instead of SQLite.
+
 h4. Creating the Database
 
 Now that you have your database configured, it's time to have Rails create an
-- 
cgit v1.2.3


From 30122307a1fe6645d6a75dedceca40a440f2f969 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 13 Nov 2011 22:27:44 +0530
Subject: copy edits in getting started guide

---
 railties/guides/source/getting_started.textile | 27 ++++++++++++--------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 9e774ff298..5f370615ca 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -221,8 +221,7 @@ h3. Creating a New Rails Project
 
 The best way to use this guide is to follow each step as it happens, no code or
 step needed to make this example application has been left out, so you can
-literally follow along step by step. If you need to see the completed code, you
-can download it from "Getting Started Code":https://github.com/mikel/getting-started-code.
+literally follow along step by step. You can get the complete code "here":https://github.com/lifo/docrails/tree/master/railties/guides/code/getting_started.
 
 By following along with this guide, you'll create a Rails project called <tt>blog</tt>, a
 (very) simple weblog. Before you can start building the application, you need to
@@ -246,7 +245,7 @@ To verify that you have everything installed correctly, you should be able to ru
 the following:
 
 <shell>
-# rails --version
+$ rails --version
 </shell>
 
 If it says something like "Rails 3.1.1" you are ready to continue.
@@ -273,7 +272,7 @@ directly in that application:
 $ cd blog
 </shell>
 
-The 'rails new blog' command we ran above created a folder in your working directory 
+The 'rails new blog' command we ran above created a folder in your working directory
 called <tt>blog</tt>. The <tt>blog</tt> folder has a number of auto-generated folders
 that make up the structure of a Rails application. Most of the work in
 this tutorial will happen in the <tt>app/</tt> folder, but here's a basic
@@ -304,7 +303,7 @@ this file in a new Rails application, you'll see a default database
 configured to use SQLite3. The file contains sections for three different
 environments in which Rails can run by default:
 
-* The +development+ environment is used on your development/local computer as you interact 
+* The +development+ environment is used on your development/local computer as you interact
 manually with the application.
 * The +test+ environment is used when running automated tests.
 * The +production+ environment is used when you deploy your application for the world to use.
@@ -514,8 +513,7 @@ file_ which holds entries in a special DSL (domain-specific language) that tells
 Rails how to connect incoming requests to controllers and actions. This file
 contains many sample routes on commented lines, and one of them actually shows
 you how to connect the root of your site to a specific controller and action.
-Find the line beginning with +root :to+, uncomment it by removing the pound sign
-at the beginning of the line.  It should look something like the following:
+Find the line beginning with +root :to+ and uncomment it. It should look something like the following:
 
 <ruby>
 Blog::Application.routes.draw do
@@ -608,11 +606,11 @@ class CreatePosts < ActiveRecord::Migration
 end
 </ruby>
 
-The above migration has one method named +change+ which will be called when you
+The above migration creates a method named +change+ which will be called when you
 run this migration. The action defined in this method is also reversible, which
 means Rails knows how to reverse the change made by this migration, in case you
-want to reverse it at later date. When you run this migration it will create a 
-+posts+ table with two string columns and a text column. It also creates two 
+want to reverse it later. When you run this migration it will create a
++posts+ table with two string columns and a text column. It also creates two
 timestamp fields to allow Rails to track post creation and update times. More
 information about Rails migrations can be found in the "Rails Database
 Migrations":migrations.html guide.
@@ -704,7 +702,7 @@ end
 These changes will ensure that all posts have a name and a title, and that the
 title is at least five characters long. Rails can validate a variety of
 conditions in a model, including the presence or uniqueness of columns, their
-format, and the existence of associated objects.  Validations are covered in detail
+format, and the existence of associated objects. Validations are covered in detail
 in "Active Record Validations and Callbacks":active_record_validations_callbacks.html#validations-overview
 
 h4. Using the Console
@@ -747,7 +745,7 @@ while the console is open, type +reload!+ at the console prompt to load them.
 h4. Listing All Posts
 
 Let's dive into the Rails code a little deeper to see how the application is
-showing us the list of Posts. Open the file 
+showing us the list of Posts. Open the file
 +app/controllers/posts_controller.rb+ and look at the
 +index+ action:
 
@@ -762,9 +760,8 @@ def index
 end
 </ruby>
 
-+Post.all+ calls the all method on the +Post+ model, which returns all of 
-the posts currently in the database. The result of this call is an array 
-of Post records that we store in an instance variable called +@posts+.
++Post.all+ returns all of the posts currently in the database as an array
+of +Post+ records that we store in an instance variable called +@posts+.
 
 TIP: For more information on finding records with Active Record, see "Active
 Record Query Interface":active_record_querying.html.
-- 
cgit v1.2.3


From 8971cca7d0cef3ce452bf44fb09ae628419d8ea1 Mon Sep 17 00:00:00 2001
From: Jason Noble <github+jasonn@jasonnoble.org>
Date: Sun, 13 Nov 2011 10:20:03 -0700
Subject: Move tooltip on re-running rails new with a different --database
 option

---
 railties/guides/source/getting_started.textile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 8a0a70efad..fde83ae730 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -308,6 +308,14 @@ manually with the application.
 * The +test+ environment is used when running automated tests.
 * The +production+ environment is used when you deploy your application for the world to use.
 
+TIP: You don't have to update the database configurations manually. If you look at the
+options of the application generator, you will see that one of the options
+is named <tt>--database</tt>. This option allows you to choose an adapter from a
+list of the most used relational databases. You can even run the generator
+repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
+ of the +config/database.yml+ file, your application will be configured for MySQL
+instead of SQLite.  Detailed examples of the common database connections are below.
+
 h5. Configuring an SQLite3 Database
 
 Rails comes with built-in support for "SQLite3":http://www.sqlite.org, which is
@@ -411,14 +419,6 @@ development:
 
 Change the username and password in the +development+ section as appropriate.
 
-TIP: You don't have to update the database configurations manually. If you look at the
-options of the application generator, you will see that one of the options
-is named <tt>--database</tt>. This option allows you to choose an adapter from a
-list of the most used relational databases. You can even run the generator
-repeatedly: <tt>cd .. && rails new blog --database=mysql</tt>. When you confirm the overwriting
- of the +config/database.yml+ file, your application will be configured for MySQL
-instead of SQLite.
-
 h4. Creating the Database
 
 Now that you have your database configured, it's time to have Rails create an
-- 
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(-)

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(-)

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(-)

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(-)

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(-)

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 +++++++++++
 activerecord/CHANGELOG.md | 21 +++++++++++++++++++++
 railties/CHANGELOG.md     | 10 ++++++++++
 3 files changed, 42 insertions(+)

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
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index a79f4df570..65578c1dc9 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -67,6 +67,27 @@
 
 ## Rails 3.1.2 (unreleased) ##
 
+*   Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
+    were not being stripped from the schema names after the first.
+
+    *Sean Kirby*
+
+*   Preserve SELECT columns on the COUNT for finder_sql when possible. *GH 3503*
+
+    *Justin Mazzi*
+
+*   Reset prepared statement cache when schema changes impact statement results. *GH 3335*
+
+    *Aaron Patterson*
+
+*   Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
+
+    *Ian Leitch*
+
+*   Prevent QueryCache leaking database connections. *GH 3243*
+
+    *Mark J. Titorenko*
+
 *   Fix bug where building the conditions of a nested through association could potentially
     modify the conditions of the through and/or source association. If you have experienced
     bugs with conditions appearing in the wrong queries when using nested through associations,
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0c59f59917..b05ac21b49 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -30,6 +30,16 @@
     Plugins developers need to special case their initializers that are
     meant to be run in the assets group by adding :group => :assets.
 
+## Rails 3.1.2 (unreleased) ##
+
+*   Engines: don't blow up if db/seeds.rb is missing.
+
+    *Jeremy Kemper*
+
+*   `rails new foo --skip-test-unit` should not add the `:test` task to the rake default task.
+    *GH 2564*
+
+    *José Valim*
 
 ## Rails 3.1.0 (August 30, 2011) ##
 
-- 
cgit v1.2.3


From c7b84689a4d59b9f2c5773b6a8527adb68e04560 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 11:29:57 +0000
Subject: Add note about syncing CHANGELOGs

---
 RELEASING_RAILS.rdoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASING_RAILS.rdoc b/RELEASING_RAILS.rdoc
index cbc9d0e1de..b7ebc4600c 100644
--- a/RELEASING_RAILS.rdoc
+++ b/RELEASING_RAILS.rdoc
@@ -81,6 +81,10 @@ You can review the commits for the 3.0.10 release like this:
 
     [aaron@higgins rails (3-0-10)]$ git log v3.0.9..
 
+If you're doing a stable branch release, you should also ensure that all of
+the CHANGELOG entries in the stable branch are also synced to the master
+branch.
+
 === Update the RAILS_VERSION file to include the RC.
 
 === Release the gem.
-- 
cgit v1.2.3


From 49cd6a0ff7a3f5b0e85707961c952bdc3b0a178f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Mon, 14 Nov 2011 07:07:38 -0500
Subject: Added therubyrhino to default Gemfile under JRuby

---
 railties/lib/rails/generators/app_base.rb      | 1 +
 railties/test/generators/app_generator_test.rb | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 0a79d6e86e..3fbde0d989 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -199,6 +199,7 @@ module Rails
           group :assets do
             gem 'sass-rails',   :git => 'git://github.com/rails/sass-rails.git'
             gem 'coffee-rails', :git => 'git://github.com/rails/coffee-rails.git'
+            #{"gem 'therubyrhino'\n" if defined?(JRUBY_VERSION)}
             gem 'uglifier', '>= 1.0.3'
           end
         GEMFILE
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 955ed09361..a1bd2fbaa5 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -208,6 +208,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "test/performance/browsing_test.rb"
   end
 
+  def test_inclusion_of_therubyrhino_under_jruby
+    if defined?(JRUBY_VERSION)
+      run_generator([destination_root])
+      assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
+    end
+  end
+
   def test_creation_of_a_test_directory
     run_generator
     assert_file 'test'
-- 
cgit v1.2.3


From 4d8081b6e7ffa88b4fc74187fb1599ef9b27e6ed Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 12:08:03 +0000
Subject: Add note about checking postgres tests before release

---
 RELEASING_RAILS.rdoc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/RELEASING_RAILS.rdoc b/RELEASING_RAILS.rdoc
index b7ebc4600c..bd75b36b2a 100644
--- a/RELEASING_RAILS.rdoc
+++ b/RELEASING_RAILS.rdoc
@@ -25,6 +25,12 @@ for Rails.  You can check the status of his tests here:
 
 Do not release with Red AWDwR tests.
 
+=== Are the postgres tests green? If not, make them green
+
+Currently Travis CI doesn't run the Active Record postgres tests. They are
+working to resolve this, but in the mean time, it is crucial to ensure that
+the tests are still green before release.
+
 === Do we have any git dependencies?  If so, contact those authors.
 
 Having git dependencies indicates that we depend on unreleased code.
@@ -60,6 +66,8 @@ for today:
 
 === Is Sam Ruby happy?  If not, make him happy.
 
+=== Are the postgres tests green? If not, make them green
+
 === Contact the security team.  CVE emails must be sent on this day.
 
 === Create a release branch.
-- 
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(+)

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 af64ac4e5ce8406137d5520fa88e8f652ab703e9 Mon Sep 17 00:00:00 2001
From: Oscar Del Ben <info@oscardelben.com>
Date: Mon, 14 Nov 2011 16:56:05 +0100
Subject: use any? instead of !empty?

---
 activemodel/lib/active_model/dirty.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb
index 166cccf161..026f077ee7 100644
--- a/activemodel/lib/active_model/dirty.rb
+++ b/activemodel/lib/active_model/dirty.rb
@@ -98,7 +98,7 @@ module ActiveModel
     #   person.name = 'bob'
     #   person.changed? # => true
     def changed?
-      !changed_attributes.empty?
+      changed_attributes.any?
     end
 
     # List of attributes with unsaved changes.
-- 
cgit v1.2.3


From 156784fef1f66dddcdfb753839f2d37bbee41655 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 16:51:02 +0000
Subject: rake release should push the tag

---
 tasks/release.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tasks/release.rb b/tasks/release.rb
index 33aaee5a4b..191c014f9f 100644
--- a/tasks/release.rb
+++ b/tasks/release.rb
@@ -116,6 +116,7 @@ namespace :all do
 
   task :tag do
     sh "git tag #{tag}"
+    sh "git push --tags"
   end
 
   task :release => %w(ensure_clean_state build commit tag push)
-- 
cgit v1.2.3


From be777b30d581aa3488f1c7be14783b58a1567b82 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Mon, 14 Nov 2011 17:08:24 +0000
Subject: Add a note to REALEASING_RAILS about testing the gem locally before
 releasing

---
 RELEASING_RAILS.rdoc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/RELEASING_RAILS.rdoc b/RELEASING_RAILS.rdoc
index bd75b36b2a..1dfcfe2488 100644
--- a/RELEASING_RAILS.rdoc
+++ b/RELEASING_RAILS.rdoc
@@ -95,6 +95,14 @@ branch.
 
 === Update the RAILS_VERSION file to include the RC.
 
+=== Build and test the gem.
+
+Run `rake install` to generate the gems and install them locally. Then try
+generating a new app and ensure that nothing explodes.
+
+This will stop you looking silly when you push an RC to rubygems.org and then
+realise it is broken.
+
 === Release the gem.
 
 IMPORTANT: Due to YAML parse problems on the rubygems.org server, it is safest
@@ -162,6 +170,7 @@ Today, do this stuff in this order:
 * Apply security patches to the release branch
 * Update CHANGELOG with security fixes.
 * Update RAILS_VERSION to remove the rc
+* Build and test the gem
 * Release the gems
 * Email security lists
 * Email general announcement lists
-- 
cgit v1.2.3


From 9fa329b7544b15cdf5751d518e380abc82468df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 14 Nov 2011 20:12:17 +0100
Subject: Speed up attribute invocation by checking if both name and calls are
 compilable.

---
 activemodel/lib/active_model/attribute_methods.rb  | 59 ++++++++++++----------
 .../lib/active_record/attribute_methods/read.rb    |  2 +-
 .../lib/active_record/attribute_methods/write.rb   |  2 +-
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index ef0b95424e..e69cb5c459 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -57,7 +57,8 @@ module ActiveModel
   module AttributeMethods
     extend ActiveSupport::Concern
 
-    COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?=]?\z/
+    NAME_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?=]?\z/
+    CALL_COMPILABLE_REGEXP = /\A[a-zA-Z_]\w*[!?]?\z/
 
     included do
       class_attribute :attribute_method_matchers, :instance_writer => false
@@ -112,7 +113,7 @@ module ActiveModel
           # If we can compile the method name, do it. Otherwise use define_method.
           # This is an important *optimization*, please don't change it. define_method
           # has slower dispatch and consumes more memory.
-          if name =~ COMPILABLE_REGEXP
+          if name =~ NAME_COMPILABLE_REGEXP
             sing.class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
             RUBY
@@ -240,18 +241,7 @@ module ActiveModel
         attribute_method_matchers.each do |matcher|
           matcher_new = matcher.method_name(new_name).to_s
           matcher_old = matcher.method_name(old_name).to_s
-
-          if matcher_new =~ COMPILABLE_REGEXP && matcher_old =~ COMPILABLE_REGEXP
-            module_eval <<-RUBY, __FILE__, __LINE__ + 1
-              def #{matcher_new}(*args)
-                send(:#{matcher_old}, *args)
-              end
-            RUBY
-          else
-            define_method(matcher_new) do |*args|
-              send(matcher_old, *args)
-            end
-          end
+          define_optimized_call self, matcher_new, matcher_old
         end
       end
 
@@ -293,17 +283,7 @@ module ActiveModel
             if respond_to?(generate_method)
               send(generate_method, attr_name)
             else
-              if method_name =~ COMPILABLE_REGEXP
-                defn = "def #{method_name}(*args)"
-              else
-                defn = "define_method(:'#{method_name}') do |*args|"
-              end
-
-              generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-                #{defn}
-                  send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
-                end
-              RUBY
+              define_optimized_call generated_attribute_methods, method_name, matcher.method_missing_target, attr_name.to_s
             end
           end
         end
@@ -342,11 +322,11 @@ module ActiveModel
         # used to alleviate the GC, which ultimately also speeds up the app
         # significantly (in our case our test suite finishes 10% faster with
         # this cache).
-        def attribute_method_matchers_cache
+        def attribute_method_matchers_cache #:nodoc:
           @attribute_method_matchers_cache ||= {}
         end
 
-        def attribute_method_matcher(method_name)
+        def attribute_method_matcher(method_name) #:nodoc:
           if attribute_method_matchers_cache.key?(method_name)
             attribute_method_matchers_cache[method_name]
           else
@@ -359,6 +339,31 @@ module ActiveModel
           end
         end
 
+        # Define a method `name` in `mod` that dispatches to `send`
+        # using the given `extra` args. This fallbacks `define_method`
+        # and `send` if the given names cannot be compiled.
+        def define_optimized_call(mod, name, send, *extra) #:nodoc:
+          if name =~ NAME_COMPILABLE_REGEXP
+            defn = "def #{name}(*args)"
+          else
+            defn = "define_method(:'#{name}') do |*args|"
+          end
+
+          extra = (extra.map(&:inspect) << "*args").join(", ")
+
+          if send =~ CALL_COMPILABLE_REGEXP
+            target = "#{send}(#{extra})"
+          else
+            target = "send(:'#{send}', #{extra})"
+          end
+
+          mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            #{defn}
+              #{target}
+            end
+          RUBY
+        end
+
         class AttributeMethodMatcher
           attr_reader :prefix, :suffix, :method_missing_target
 
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 4174e4da09..4a5afcd585 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -77,7 +77,7 @@ module ActiveRecord
             #
             # The second, slower, branch is necessary to support instances where the database
             # returns columns with extra stuff in (like 'my_column(omg)').
-            if method_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
+            if method_name =~ ActiveModel::AttributeMethods::NAME_COMPILABLE_REGEXP
               generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
                 def _#{method_name}
                   #{access_code}
diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb
index e9cdb130db..eb585ee906 100644
--- a/activerecord/lib/active_record/attribute_methods/write.rb
+++ b/activerecord/lib/active_record/attribute_methods/write.rb
@@ -10,7 +10,7 @@ module ActiveRecord
       module ClassMethods
         protected
           def define_method_attribute=(attr_name)
-            if attr_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
+            if attr_name =~ ActiveModel::AttributeMethods::NAME_COMPILABLE_REGEXP
               generated_attribute_methods.module_eval("def #{attr_name}=(new_value); write_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__)
             else
               generated_attribute_methods.send(:define_method, "#{attr_name}=") do |new_value|
-- 
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(-)

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(-)

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(-)

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(+)

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(-)

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 e1b79c56bef43d858fc59dbe7506039414c9e4ed Mon Sep 17 00:00:00 2001
From: Gabriel Sobrinho <gabriel.sobrinho@gmail.com>
Date: Tue, 1 Nov 2011 08:40:30 -0200
Subject: Failing test case for issue #3483

---
 activerecord/test/cases/finder_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 69754d23b9..688679f081 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -374,6 +374,10 @@ class FinderTest < ActiveRecord::TestCase
     assert_equal [1], Comment.find(:all, :conditions => { :id => 1..1, :post_id => 1..10 }).map(&:id).sort
   end
 
+  def test_find_on_hash_conditions_with_array_of_integers_and_ranges
+    assert_equal [1,2,3], Comment.find(:all, :conditions => { :post_id => [1..2, 3, 4, 5..10]}).map(&:id).sort
+  end
+
   def test_find_on_multiple_hash_conditions
     assert Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => false })
     assert_raise(ActiveRecord::RecordNotFound) { Topic.find(1, :conditions => { :author_name => "David", :title => "The First Topic", :replies_count => 1, :approved => true }) }
-- 
cgit v1.2.3


From 63a22ca6169f06d10cd843ea3a75df6498fdcf7d Mon Sep 17 00:00:00 2001
From: Ryan Naughton <Ryan.J.Naughton@gmail.com>
Date: Mon, 14 Nov 2011 21:43:27 -0600
Subject: Fixes issue #3483, regarding using a mixture of ranges and discrete
 values in find conditions. Paired with Joey Schoblaska.

---
 .../lib/active_record/relation/predicate_builder.rb        | 14 ++++++++------
 activerecord/test/cases/finder_test.rb                     |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 7e8ddd1b5d..af167dc59b 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -22,21 +22,23 @@ module ActiveRecord
             value = value.select(value.klass.arel_table[value.klass.primary_key]) if value.select_values.empty?
             attribute.in(value.arel.ast)
           when Array, ActiveRecord::Associations::CollectionProxy
-            values = value.to_a.map { |x|
-              x.is_a?(ActiveRecord::Base) ? x.id : x
-            }
+            values = value.to_a.map {|x| x.is_a?(ActiveRecord::Base) ? x.id : x}
+            ranges, values = values.partition {|value| value.is_a?(Range) || value.is_a?(Arel::Relation)}
+
+            array_predicates = ranges.map {|range| attribute.in(range)}
 
             if values.include?(nil)
               values = values.compact
               if values.empty?
-                attribute.eq nil
+                array_predicates << attribute.eq(nil)
               else
-                attribute.in(values.compact).or attribute.eq(nil)
+                array_predicates << attribute.in(values.compact).or(attribute.eq(nil))
               end
             else
-              attribute.in(values)
+              array_predicates << attribute.in(values)
             end
 
+            array_predicates.inject {|composite, predicate| composite.or(predicate)}
           when Range, Arel::Relation
             attribute.in(value)
           when ActiveRecord::Base
diff --git a/activerecord/test/cases/finder_test.rb b/activerecord/test/cases/finder_test.rb
index 688679f081..05c4b15407 100644
--- a/activerecord/test/cases/finder_test.rb
+++ b/activerecord/test/cases/finder_test.rb
@@ -375,7 +375,7 @@ class FinderTest < ActiveRecord::TestCase
   end
 
   def test_find_on_hash_conditions_with_array_of_integers_and_ranges
-    assert_equal [1,2,3], Comment.find(:all, :conditions => { :post_id => [1..2, 3, 4, 5..10]}).map(&:id).sort
+    assert_equal [1,2,3,5,6,7,8,9], Comment.find(:all, :conditions => {:id => [1..2, 3, 5, 6..8, 9]}).map(&:id).sort
   end
 
   def test_find_on_multiple_hash_conditions
-- 
cgit v1.2.3


From 76b6027cd80685617b5bf5ceb986fd5dc8e213b2 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Fri, 11 Nov 2011 15:34:47 +0530
Subject: Unused variable removed

---
 railties/test/application/console_test.rb | 1 -
 railties/test/application/rackup_test.rb  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index b3745f194e..2073c780bf 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -71,7 +71,6 @@ class ConsoleTest < Test::Unit::TestCase
 
     assert !User.new.respond_to?(:age)
     silence_stream(STDOUT) { irb_context.reload! }
-    session = irb_context.new_session
     assert User.new.respond_to?(:age)
   end
 
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index ff9cdcadc7..86e1995def 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -6,7 +6,7 @@ module ApplicationTests
 
     def rackup
       require "rack"
-      app, options = Rack::Builder.parse_file("#{app_path}/config.ru")
+      app, _ = Rack::Builder.parse_file("#{app_path}/config.ru")
       app
     end
 
-- 
cgit v1.2.3


From df08273d1420ee4879931f508fe2953235c707ef Mon Sep 17 00:00:00 2001
From: Sergey Parizhskiy <parizhskiy@gmail.com>
Date: Tue, 15 Nov 2011 13:09:41 +0200
Subject: made url to a github issues a bit shorter - no need in a page param
 when it's a first page

---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 80c3cf6e1a..1cd70404a3 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -215,7 +215,7 @@ TIP: You may want to "put your git branch name in your shell prompt":http://qugs
 
 h3. Helping to Resolve Existing Issues
 
-As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues?sort=created&direction=desc&state=open&page=1 list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
+As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues?sort=created&direction=desc&state=open list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
 
 h4. Verifying Bug Reports
 
-- 
cgit v1.2.3


From 83bf0b626cf2134260903e57d74f67de57384073 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Wed, 16 Nov 2011 02:36:36 +0530
Subject: refactor test_multiple_of

---
 activesupport/test/core_ext/integer_ext_test.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/activesupport/test/core_ext/integer_ext_test.rb b/activesupport/test/core_ext/integer_ext_test.rb
index fe8c7eb224..b1f5f70a70 100644
--- a/activesupport/test/core_ext/integer_ext_test.rb
+++ b/activesupport/test/core_ext/integer_ext_test.rb
@@ -2,6 +2,8 @@ require 'abstract_unit'
 require 'active_support/core_ext/integer'
 
 class IntegerExtTest < Test::Unit::TestCase
+  PRIME = 22953686867719691230002707821868552601124472329079
+
   def test_multiple_of
     [ -7, 0, 7, 14 ].each { |i| assert i.multiple_of?(7) }
     [ -7, 7, 14 ].each { |i| assert ! i.multiple_of?(6) }
@@ -11,10 +13,7 @@ class IntegerExtTest < Test::Unit::TestCase
     assert !5.multiple_of?(0)
 
     # test with a prime
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(2)
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(3)
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(5)
-    assert !22953686867719691230002707821868552601124472329079.multiple_of?(7)
+    [2, 3, 5, 7].each { |i| assert !PRIME.multiple_of?(i) }
   end
 
   def test_ordinalize
-- 
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(-)

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 bc00514b6236d701d3e660c4ec365a767a070a91 Mon Sep 17 00:00:00 2001
From: rpq <rpqpro@hotmail.com>
Date: Tue, 15 Nov 2011 23:20:21 -0500
Subject: added comma

---
 railties/guides/source/asset_pipeline.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/asset_pipeline.textile b/railties/guides/source/asset_pipeline.textile
index 6ff5e87b6d..3681501293 100644
--- a/railties/guides/source/asset_pipeline.textile
+++ b/railties/guides/source/asset_pipeline.textile
@@ -438,7 +438,7 @@ location ~ ^/assets/ {
 }
 </plain>
 
-When files are precompiled, Sprockets also creates a "gzipped":http://en.wikipedia.org/wiki/Gzip (.gz) version of your assets. Web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once Sprockets uses the maximum compression ratio, thus reducing the size of the data transfer to the minimum. On the other hand, web servers can be configured to serve compressed content directly from disk, rather than deflating non-compressed files themselves.
+When files are precompiled, Sprockets also creates a "gzipped":http://en.wikipedia.org/wiki/Gzip (.gz) version of your assets. Web servers are typically configured to use a moderate compression ratio as a compromise, but since precompilation happens once, Sprockets uses the maximum compression ratio, thus reducing the size of the data transfer to the minimum. On the other hand, web servers can be configured to serve compressed content directly from disk, rather than deflating non-compressed files themselves.
 
 Nginx is able to do this automatically enabling +gzip_static+:
 
-- 
cgit v1.2.3


From 21c5a0a104bf04e3e7b63aa5f0104f1c666655c3 Mon Sep 17 00:00:00 2001
From: Daniel Dyba <daniel.dyba@gmail.com>
Date: Sat, 16 Jul 2011 16:54:03 -0700
Subject: Changed Commands module to RailsCommands.

This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.
---
 railties/lib/rails/commands/plugin.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index 4df849447d..aa4551c806 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -274,7 +274,7 @@ end
 
 # load default environment and parse arguments
 require 'optparse'
-module Commands
+module RailsCommands
   class Plugin
     attr_reader :environment, :script_name
     def initialize
@@ -327,7 +327,7 @@ module Commands
 
       command = general.shift
       if command =~ /^(install|remove)$/
-        command = Commands.const_get(command.capitalize).new(self)
+        command = RailsCommands.const_get(command.capitalize).new(self)
         command.parse!(sub)
       else
         puts "Unknown command: #{command}" unless command.blank?
@@ -539,4 +539,4 @@ class RecursiveHTTPFetcher
   end
 end
 
-Commands::Plugin.parse!
+RailsCommands::Plugin.parse!
-- 
cgit v1.2.3


From 325abe9fbad58b6a0e119a678039b195247a57bc Mon Sep 17 00:00:00 2001
From: Daniel Dyba <daniel.dyba@gmail.com>
Date: Sun, 17 Jul 2011 23:09:51 -0700
Subject: Substituted RailsCommands for Rails::Commands

---
 railties/lib/rails/commands/plugin.rb | 320 +++++++++++++++++-----------------
 1 file changed, 161 insertions(+), 159 deletions(-)

diff --git a/railties/lib/rails/commands/plugin.rb b/railties/lib/rails/commands/plugin.rb
index aa4551c806..c99a2e6685 100644
--- a/railties/lib/rails/commands/plugin.rb
+++ b/railties/lib/rails/commands/plugin.rb
@@ -274,198 +274,200 @@ end
 
 # load default environment and parse arguments
 require 'optparse'
-module RailsCommands
-  class Plugin
-    attr_reader :environment, :script_name
-    def initialize
-      @environment = RailsEnvironment.default
-      @rails_root = RailsEnvironment.default.root
-      @script_name = File.basename($0)
-    end
+module Rails
+  module Commands
+    class Plugin
+      attr_reader :environment, :script_name
+      def initialize
+        @environment = RailsEnvironment.default
+        @rails_root = RailsEnvironment.default.root
+        @script_name = File.basename($0)
+      end
 
-    def environment=(value)
-      @environment = value
-      RailsEnvironment.default = value
-    end
+      def environment=(value)
+        @environment = value
+        RailsEnvironment.default = value
+      end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: plugin [OPTIONS] command"
-        o.define_head "Rails plugin manager."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: plugin [OPTIONS] command"
+          o.define_head "Rails plugin manager."
 
-        o.separator ""
-        o.separator "GENERAL OPTIONS"
+          o.separator ""
+          o.separator "GENERAL OPTIONS"
 
-        o.on("-r", "--root=DIR", String,
-             "Set an explicit rails app directory.",
-             "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
+          o.on("-r", "--root=DIR", String,
+               "Set an explicit rails app directory.",
+               "Default: #{@rails_root}") { |rails_root| @rails_root = rails_root; self.environment = RailsEnvironment.new(@rails_root) }
 
-        o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
-        o.on("-h", "--help", "Show this help message.") { puts o; exit }
+          o.on("-v", "--verbose", "Turn on verbose output.") { |verbose| $verbose = verbose }
+          o.on("-h", "--help", "Show this help message.") { puts o; exit }
 
-        o.separator ""
-        o.separator "COMMANDS"
+          o.separator ""
+          o.separator "COMMANDS"
 
-        o.separator "  install    Install plugin(s) from known repositories or URLs."
-        o.separator "  remove     Uninstall plugins."
+          o.separator "  install    Install plugin(s) from known repositories or URLs."
+          o.separator "  remove     Uninstall plugins."
 
-        o.separator ""
-        o.separator "EXAMPLES"
-        o.separator "  Install a plugin from a subversion URL:"
-        o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
-        o.separator "  Install a plugin from a git URL:"
-        o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
-        o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
-        o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
+          o.separator ""
+          o.separator "EXAMPLES"
+          o.separator "  Install a plugin from a subversion URL:"
+          o.separator "    #{@script_name} plugin install http://example.com/my_svn_plugin\n"
+          o.separator "  Install a plugin from a git URL:"
+          o.separator "    #{@script_name} plugin install git://github.com/SomeGuy/my_awesome_plugin.git\n"
+          o.separator "  Install a plugin and add a svn:externals entry to vendor/plugins"
+          o.separator "    #{@script_name} plugin install -x my_svn_plugin\n"
+        end
       end
-    end
 
-    def parse!(args=ARGV)
-      general, sub = split_args(args)
-      options.parse!(general)
+      def parse!(args=ARGV)
+        general, sub = split_args(args)
+        options.parse!(general)
 
-      command = general.shift
-      if command =~ /^(install|remove)$/
-        command = RailsCommands.const_get(command.capitalize).new(self)
-        command.parse!(sub)
-      else
-        puts "Unknown command: #{command}" unless command.blank?
-        puts options
-        exit 1
+        command = general.shift
+        if command =~ /^(install|remove)$/
+          command = Commands.const_get(command.capitalize).new(self)
+          command.parse!(sub)
+        else
+          puts "Unknown command: #{command}" unless command.blank?
+          puts options
+          exit 1
+        end
       end
-    end
 
-    def split_args(args)
-      left = []
-      left << args.shift while args[0] and args[0] =~ /^-/
-      left << args.shift if args[0]
-      [left, args]
-    end
-
-    def self.parse!(args=ARGV)
-      Plugin.new.parse!(args)
-    end
-  end
+      def split_args(args)
+        left = []
+        left << args.shift while args[0] and args[0] =~ /^-/
+        left << args.shift if args[0]
+        [left, args]
+      end
 
-  class Install
-    def initialize(base_command)
-      @base_command = base_command
-      @method = :http
-      @options = { :quiet => false, :revision => nil, :force => false }
+      def self.parse!(args=ARGV)
+        Plugin.new.parse!(args)
+      end
     end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
-        o.define_head "Install one or more plugins."
-        o.separator   ""
-        o.separator   "Options:"
-        o.on(         "-x", "--externals",
-                      "Use svn:externals to grab the plugin.",
-                      "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
-        o.on(         "-o", "--checkout",
-                      "Use svn checkout to grab the plugin.",
-                      "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
-        o.on(         "-e", "--export",
-                      "Use svn export to grab the plugin.",
-                      "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
-        o.on(         "-q", "--quiet",
-                      "Suppresses the output from installation.",
-                      "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
-        o.on(         "-r REVISION", "--revision REVISION",
-                      "Checks out the given revision from subversion or git.",
-                      "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
-        o.on(         "-f", "--force",
-                      "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
-        o.separator   ""
-        o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
-        o.separator   "a plugin repository."
+    class Install
+      def initialize(base_command)
+        @base_command = base_command
+        @method = :http
+        @options = { :quiet => false, :revision => nil, :force => false }
       end
-    end
 
-    def determine_install_method
-      best = @base_command.environment.best_install_method
-      @method = :http if best == :http and @method == :export
-      case
-      when (best == :http and @method != :http)
-        msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
-      when (best == :export and (@method != :export and @method != :http))
-        msg = "Cannot install using #{@method} because this project is not under subversion."
-      when (best != :externals and @method == :externals)
-        msg = "Cannot install using externals because vendor/plugins is not under subversion."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} install PLUGIN [PLUGIN [PLUGIN] ...]"
+          o.define_head "Install one or more plugins."
+          o.separator   ""
+          o.separator   "Options:"
+          o.on(         "-x", "--externals",
+                        "Use svn:externals to grab the plugin.",
+                        "Enables plugin updates and plugin versioning.") { |v| @method = :externals }
+          o.on(         "-o", "--checkout",
+                        "Use svn checkout to grab the plugin.",
+                        "Enables updating but does not add a svn:externals entry.") { |v| @method = :checkout }
+          o.on(         "-e", "--export",
+                        "Use svn export to grab the plugin.",
+                        "Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry.") { |v| @method = :export }
+          o.on(         "-q", "--quiet",
+                        "Suppresses the output from installation.",
+                        "Ignored if -v is passed (rails plugin -v install ...)") { |v| @options[:quiet] = true }
+          o.on(         "-r REVISION", "--revision REVISION",
+                        "Checks out the given revision from subversion or git.",
+                        "Ignored if subversion/git is not used.") { |v| @options[:revision] = v }
+          o.on(         "-f", "--force",
+                        "Reinstalls a plugin if it's already installed.") { |v| @options[:force] = true }
+          o.separator   ""
+          o.separator   "You can specify plugin names as given in 'plugin list' output or absolute URLs to "
+          o.separator   "a plugin repository."
+        end
       end
-      if msg
-        puts msg
-        exit 1
+
+      def determine_install_method
+        best = @base_command.environment.best_install_method
+        @method = :http if best == :http and @method == :export
+        case
+        when (best == :http and @method != :http)
+          msg = "Cannot install using subversion because `svn' cannot be found in your PATH"
+        when (best == :export and (@method != :export and @method != :http))
+          msg = "Cannot install using #{@method} because this project is not under subversion."
+        when (best != :externals and @method == :externals)
+          msg = "Cannot install using externals because vendor/plugins is not under subversion."
+        end
+        if msg
+          puts msg
+          exit 1
+        end
+        @method
       end
-      @method
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
+      def parse!(args)
+        options.parse!(args)
+        if args.blank?
+          puts options
+          exit 1
+        end
+        environment = @base_command.environment
+        install_method = determine_install_method
+        puts "Plugins will be installed using #{install_method}" if $verbose
+        args.each do |name|
+          ::Plugin.find(name).install(install_method, @options)
+        end
+      rescue StandardError => e
+        puts "Plugin not found: #{args.inspect}"
+        puts e.inspect if $verbose
         exit 1
       end
-      environment = @base_command.environment
-      install_method = determine_install_method
-      puts "Plugins will be installed using #{install_method}" if $verbose
-      args.each do |name|
-        ::Plugin.find(name).install(install_method, @options)
-      end
-    rescue StandardError => e
-      puts "Plugin not found: #{args.inspect}"
-      puts e.inspect if $verbose
-      exit 1
-    end
-  end
-
-  class Remove
-    def initialize(base_command)
-      @base_command = base_command
     end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
-        o.define_head "Remove plugins."
+    class Remove
+      def initialize(base_command)
+        @base_command = base_command
       end
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      if args.blank?
-        puts options
-        exit 1
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} remove name [name]..."
+          o.define_head "Remove plugins."
+        end
       end
-      root = @base_command.environment.root
-      args.each do |name|
-        ::Plugin.new(name).uninstall
+
+      def parse!(args)
+        options.parse!(args)
+        if args.blank?
+          puts options
+          exit 1
+        end
+        root = @base_command.environment.root
+        args.each do |name|
+          ::Plugin.new(name).uninstall
+        end
       end
     end
-  end
 
-  class Info
-    def initialize(base_command)
-      @base_command = base_command
-    end
+    class Info
+      def initialize(base_command)
+        @base_command = base_command
+      end
 
-    def options
-      OptionParser.new do |o|
-        o.set_summary_indent('  ')
-        o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
-        o.define_head "Shows plugin info at {url}/about.yml."
+      def options
+        OptionParser.new do |o|
+          o.set_summary_indent('  ')
+          o.banner =    "Usage: #{@base_command.script_name} info name [name]..."
+          o.define_head "Shows plugin info at {url}/about.yml."
+        end
       end
-    end
 
-    def parse!(args)
-      options.parse!(args)
-      args.each do |name|
-        puts ::Plugin.find(name).info
-        puts
+      def parse!(args)
+        options.parse!(args)
+        args.each do |name|
+          puts ::Plugin.find(name).info
+          puts
+        end
       end
     end
   end
@@ -539,4 +541,4 @@ class RecursiveHTTPFetcher
   end
 end
 
-RailsCommands::Plugin.parse!
+Rails::Commands::Plugin.parse!
-- 
cgit v1.2.3


From df5ec41b891bbd0392e9bb9695c17e3821903eed Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 10:42:56 -0800
Subject: bundler treats trunk ruby as ruby 1.9, hack around that for now

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 1b7d478f18..97605e32b5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ platforms :mri_18 do
 end
 
 platforms :mri_19 do
-  gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS']
+  gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] || RUBY_VERSION >= "2.0"
 end
 
 platforms :mri do
-- 
cgit v1.2.3


From 61228e9a0cafb5f0a8e4f2c24da36ef9261840fb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 13:25:55 -0800
Subject: fixing tests on PG

---
 activerecord/test/cases/adapters/postgresql/schema_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 19669bdeb0..467e5d7b86 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -197,7 +197,7 @@ class SchemaTest < ActiveRecord::TestCase
   end
 
   def test_dump_indexes_for_schema_multiple_schemas_in_search_path
-    do_dump_index_tests_for_schema("public, #{SCHEMA_NAME}", INDEX_A_COLUMN, INDEX_B_COLUMN_S1)
+    do_dump_index_tests_for_schema("public, #{SCHEMA_NAME}", INDEX_A_COLUMN, INDEX_B_COLUMN_S1, INDEX_D_COLUMN)
   end
 
   def test_with_uppercase_index_name
-- 
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

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 cef1e14e09e5654895f264a2cff1c0898672b1f0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 14:45:18 -0800
Subject: removing some useless conditionals

---
 activerecord/lib/active_record/railties/databases.rake | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index aea928b443..f3cb2a971e 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -1,8 +1,8 @@
 require 'active_support/core_ext/object/inclusion'
+require 'active_record'
 
 db_namespace = namespace :db do
   task :load_config => :rails_env do
-    require 'active_record'
     ActiveRecord::Base.configurations = Rails.application.config.database_configuration
     ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
 
@@ -279,16 +279,14 @@ db_namespace = namespace :db do
 
   # desc "Raises an error if there are pending migrations"
   task :abort_if_pending_migrations => :environment do
-    if defined? ActiveRecord
-      pending_migrations = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations_paths).pending_migrations
+    pending_migrations = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations_paths).pending_migrations
 
-      if pending_migrations.any?
-        puts "You have #{pending_migrations.size} pending migrations:"
-        pending_migrations.each do |pending_migration|
-          puts '  %4d %s' % [pending_migration.version, pending_migration.name]
-        end
-        abort %{Run `rake db:migrate` to update your database then try again.}
+    if pending_migrations.any?
+      puts "You have #{pending_migrations.size} pending migrations:"
+      pending_migrations.each do |pending_migration|
+        puts '  %4d %s' % [pending_migration.version, pending_migration.name]
       end
+      abort %{Run `rake db:migrate` to update your database then try again.}
     end
   end
 
@@ -498,7 +496,7 @@ db_namespace = namespace :db do
 
     # desc 'Check for pending migrations and load the test schema'
     task :prepare => 'db:abort_if_pending_migrations' do
-      if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
+      unless ActiveRecord::Base.configurations.blank?
         db_namespace[{ :sql  => 'test:clone_structure', :ruby => 'test:load' }[ActiveRecord::Base.schema_format]].invoke
       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(-)

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(-)

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(-)

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 73cb0f98289923c8fa0287bf1cc8857664078d43 Mon Sep 17 00:00:00 2001
From: James Adam <james@lazyatom.com>
Date: Wed, 26 Oct 2011 12:51:38 +0100
Subject: `ActiveRecord::Base#becomes` should retain the errors of the original
 object.

This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.
---
 activerecord/lib/active_record/persistence.rb | 1 +
 activerecord/test/cases/base_test.rb          | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/activerecord/lib/active_record/persistence.rb b/activerecord/lib/active_record/persistence.rb
index 5e65e46a7d..f047a1d9fa 100644
--- a/activerecord/lib/active_record/persistence.rb
+++ b/activerecord/lib/active_record/persistence.rb
@@ -114,6 +114,7 @@ module ActiveRecord
       became.instance_variable_set("@attributes_cache", @attributes_cache)
       became.instance_variable_set("@new_record", new_record?)
       became.instance_variable_set("@destroyed", destroyed?)
+      became.instance_variable_set("@errors", errors)
       became.type = klass.name unless self.class.descends_from_active_record?
       became
     end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index fdb656fe13..997c9e7e9d 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -1761,6 +1761,14 @@ class BasicsTest < ActiveRecord::TestCase
     assert_equal "The First Topic", topics(:first).becomes(Reply).title
   end
 
+  def test_becomes_includes_errors
+    company = Company.new(:name => nil)
+    assert !company.valid?
+    original_errors = company.errors
+    client = company.becomes(Client)
+    assert_equal original_errors, client.errors
+  end
+
   def test_silence_sets_log_level_to_error_in_block
     original_logger = ActiveRecord::Base.logger
     log = StringIO.new
-- 
cgit v1.2.3


From 38d26b0cb56d82093889efa95992a35ba3bb9f29 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 15:01:02 -0800
Subject: Move conditionals to separate tasks so they can be reused.

---
 activerecord/lib/active_record/railties/databases.rake | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index f3cb2a971e..ee611f6a2a 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -291,15 +291,11 @@ db_namespace = namespace :db do
   end
 
   desc 'Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)'
-  task :setup => :environment do
-    db_namespace["create"].invoke
-    db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
-    db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
-    db_namespace["seed"].invoke
-  end
+  task :setup => :seed
 
   desc 'Load the seed data from db/seeds.rb'
-  task :seed => 'db:abort_if_pending_migrations' do
+  task :seed => ['db:schema:load_if_ruby', 'db:structure:load_if_sql'] do
+    db_namespace['abort_if_pending_migrations'].invoke
     Rails.application.load_seed
   end
 
@@ -362,6 +358,10 @@ db_namespace = namespace :db do
         abort %{#{file} doesn't exist yet. Run `rake db:migrate` to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded}
       end
     end
+
+    task :load_if_ruby => 'db:create' do
+      db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
+    end
   end
 
   namespace :structure do
@@ -437,6 +437,10 @@ db_namespace = namespace :db do
         raise "Task not supported by '#{abcs[env]['adapter']}'"
       end
     end
+
+    task :load_if_sql => 'db:create' do
+      db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
+    end
   end
 
   namespace :test do
-- 
cgit v1.2.3


From ca69408b49156f98a76adfc03088b6b067fabc61 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 15:27:47 -0800
Subject: Reduce schema format tests

---
 .../lib/active_record/railties/databases.rake      | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index ee611f6a2a..d19208dd76 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -150,8 +150,16 @@ db_namespace = namespace :db do
   task :migrate => [:environment, :load_config] do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
     ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-    db_namespace["schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-    db_namespace["structure:dump"].invoke if ActiveRecord::Base.schema_format == :sql
+    db_namespace['_dump'].invoke
+  end
+
+  task :_dump do
+    case ActiveRecord::Base.schema_format
+    when :ruby then db_namespace["schema:dump"].invoke
+    when :sql  then db_namespace["structure:dump"].invoke
+    else
+      raise "unknown schema format #{ActiveRecord::Base.schema_format}"
+    end
   end
 
   namespace :migrate do
@@ -174,8 +182,7 @@ db_namespace = namespace :db do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
       ActiveRecord::Migrator.run(:up, ActiveRecord::Migrator.migrations_paths, version)
-      db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
-      db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
+      db_namespace['_dump'].invoke
     end
 
     # desc 'Runs the "down" for a given migration VERSION.'
@@ -183,8 +190,7 @@ db_namespace = namespace :db do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
       ActiveRecord::Migrator.run(:down, ActiveRecord::Migrator.migrations_paths, version)
-      db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
-      db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
+      db_namespace['_dump'].invoke
     end
 
     desc 'Display status of migrations'
@@ -224,16 +230,14 @@ db_namespace = namespace :db do
   task :rollback => [:environment, :load_config] do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
-    db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
-    db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
+    db_namespace['_dump'].invoke
   end
 
   # desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
   task :forward => [:environment, :load_config] do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     ActiveRecord::Migrator.forward(ActiveRecord::Migrator.migrations_paths, step)
-    db_namespace['schema:dump'].invoke if ActiveRecord::Base.schema_format == :ruby
-    db_namespace['structure:dump'].invoke if ActiveRecord::Base.schema_format == :sql
+    db_namespace['_dump'].invoke
   end
 
   # desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
-- 
cgit v1.2.3


From b96aaf8ccbd06986dc489a9f29ea4092dd5cf911 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 15:30:00 -0800
Subject: dbfile isn't supported anymore, so remove

---
 activerecord/lib/active_record/railties/databases.rake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index d19208dd76..ef8f815207 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -388,7 +388,7 @@ db_namespace = namespace :db do
         `pg_dump -i -s -x -O -f db/structure.sql #{search_path} #{abcs[Rails.env]['database']}`
         raise 'Error dumping database' if $?.exitstatus == 1
       when /sqlite/
-        dbfile = abcs[Rails.env]['database'] || abcs[Rails.env]['dbfile']
+        dbfile = abcs[Rails.env]['database']
         `sqlite3 #{dbfile} .schema > db/structure.sql`
       when 'sqlserver'
         `smoscript -s #{abcs[Rails.env]['host']} -d #{abcs[Rails.env]['database']} -u #{abcs[Rails.env]['username']} -p #{abcs[Rails.env]['password']} -f db\\structure.sql -A -U`
@@ -424,7 +424,7 @@ db_namespace = namespace :db do
         ENV['PGUSER']     = abcs[env]['username'].to_s if abcs[env]['username']
         `psql -f "#{Rails.root}/db/structure.sql" #{abcs[env]['database']} #{abcs[env]['template']}`
       when /sqlite/
-        dbfile = abcs[env]['database'] || abcs[env]['dbfile']
+        dbfile = abcs[env]['database']
         `sqlite3 #{dbfile} < "#{Rails.root}/db/structure.sql"`
       when 'sqlserver'
         `sqlcmd -S #{abcs[env]['host']} -d #{abcs[env]['database']} -U #{abcs[env]['username']} -P #{abcs[env]['password']} -i db\\structure.sql`
@@ -481,7 +481,7 @@ db_namespace = namespace :db do
         drop_database(abcs['test'])
         create_database(abcs['test'])
       when /sqlite/
-        dbfile = abcs['test']['database'] || abcs['test']['dbfile']
+        dbfile = abcs['test']['database']
         File.delete(dbfile) if File.exist?(dbfile)
       when 'sqlserver'
         test = abcs.deep_dup['test']
-- 
cgit v1.2.3


From 97ca6358c5fbd5458b684d6d46489b7b68c48225 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 15:40:20 -0800
Subject: Join method uses empty string by default, so remove it

---
 .../lib/active_record/connection_adapters/abstract_mysql_adapter.rb   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index baf4c043c4..e26b10fa97 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -389,11 +389,11 @@ module ActiveRecord
           sql = "SHOW TABLES"
         end
 
-        select_all(sql).map do |table|
+        select_all(sql).map { |table|
           table.delete('Table_type')
           sql = "SHOW CREATE TABLE #{quote_table_name(table.to_a.first.last)}"
           exec_without_stmt(sql).first['Create Table'] + ";\n\n"
-        end.join("")
+        }.join
       end
 
       # Drops the database specified on the +name+ attribute
-- 
cgit v1.2.3


From bb95e815380c85d14afade807ebb2dd227d90b9e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 15:51:25 -0800
Subject: Adding a deprecation warning for use of the schema_info table.

---
 .../lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 11da84e245..7742f32213 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/array/wrap'
+require 'active_support/deprecation/reporting'
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
@@ -445,6 +446,7 @@ module ActiveRecord
           si_table = Base.table_name_prefix + 'schema_info' + Base.table_name_suffix
 
           if table_exists?(si_table)
+            ActiveRecord::Deprecation.warn "Usage of the schema table `#{si_table}` is deprecated. Please switch to using `schema_migrations` table"
 
             old_version = select_value("SELECT version FROM #{quote_table_name(si_table)}").to_i
             assume_migrated_upto_version(old_version)
-- 
cgit v1.2.3


From 64a3175eea3c121f30a5a24034aa1ed400c80b12 Mon Sep 17 00:00:00 2001
From: capps <capps@onedoto.com>
Date: Wed, 16 Nov 2011 15:57:54 -0800
Subject: "denoted" instead of "donated" "parentheses" instead of "use
 brackets"

---
 railties/guides/source/i18n.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile
index 2d4cc13571..e9477e84cf 100644
--- a/railties/guides/source/i18n.textile
+++ b/railties/guides/source/i18n.textile
@@ -231,7 +231,7 @@ end
 
 Now, when you call the +books_path+ method you should get +"/en/books"+ (for the default locale). An URL like +http://localhost:3001/nl/books+ should load the Netherlands locale, then, and following calls to +books_path+ should return +"/nl/books"+ (because the locale changed).
 
-If you don't want to force the use of a locale in your routes you can use an optional path scope (donated by the use brackets) like so:
+If you don't want to force the use of a locale in your routes you can use an optional path scope (denoted by the parentheses) like so:
 
 <ruby>
 # config/routes.rb
-- 
cgit v1.2.3


From 4c1a1933cbc5ab96efe340a3b31ac5fee12c99c8 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 16 Nov 2011 16:18:00 -0800
Subject: No need to `readlines` then `join`, just use `read` :heart:

---
 activerecord/lib/active_record/railties/databases.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index ef8f815207..5964fa9cb0 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -414,7 +414,7 @@ db_namespace = namespace :db do
       when /mysql/
         ActiveRecord::Base.establish_connection(abcs[env])
         ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-        IO.readlines("#{Rails.root}/db/structure.sql").join.split("\n\n").each do |table|
+        IO.read("#{Rails.root}/db/structure.sql").split("\n\n").each do |table|
           ActiveRecord::Base.connection.execute(table)
         end
       when /postgresql/
-- 
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(-)

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(-)

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 5ccd9bcc1a3012573e6ab19ac52abf8917374bea Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Thu, 17 Nov 2011 12:24:40 +0530
Subject: No need to `readlines` then `join`, just use `read` :heart:

same as 4c1a1933cbc5ab96efe340a3b31ac5fee12c99c8
---
 activerecord/lib/active_record/railties/databases.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 5964fa9cb0..4ffcf6dbc1 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -430,7 +430,7 @@ db_namespace = namespace :db do
         `sqlcmd -S #{abcs[env]['host']} -d #{abcs[env]['database']} -U #{abcs[env]['username']} -P #{abcs[env]['password']} -i db\\structure.sql`
       when 'oci', 'oracle'
         ActiveRecord::Base.establish_connection(abcs[env])
-        IO.readlines("#{Rails.root}/db/structure.sql").join.split(";\n\n").each do |ddl|
+        IO.read("#{Rails.root}/db/structure.sql").split(";\n\n").each do |ddl|
           ActiveRecord::Base.connection.execute(ddl)
         end
       when 'firebird'
-- 
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(-)

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 0af93089deaf6dc9428c0f2f7a376cdb6f81daee Mon Sep 17 00:00:00 2001
From: Alex Tambellini <atambellini@gmail.com>
Date: Thu, 17 Nov 2011 09:44:17 -0500
Subject: Move schema_format :sql config setting from test.rb to application.rb

I've moved the schema_format :sql config setting to application.rb because you would
never enable this only for the test environment. If you use database constraints
or database specific data types you would want all of your environments to use them.
---
 railties/guides/code/getting_started/config/application.rb           | 5 +++++
 railties/guides/code/getting_started/config/environments/test.rb     | 5 -----
 .../lib/rails/generators/rails/app/templates/config/application.rb   | 5 +++++
 .../generators/rails/app/templates/config/environments/test.rb.tt    | 5 -----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/railties/guides/code/getting_started/config/application.rb b/railties/guides/code/getting_started/config/application.rb
index e914b5a80e..e16da30f72 100644
--- a/railties/guides/code/getting_started/config/application.rb
+++ b/railties/guides/code/getting_started/config/application.rb
@@ -39,6 +39,11 @@ module Blog
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
     # Enable the asset pipeline
     config.assets.enabled = true
 
diff --git a/railties/guides/code/getting_started/config/environments/test.rb b/railties/guides/code/getting_started/config/environments/test.rb
index 833241ace3..08697cbbc9 100644
--- a/railties/guides/code/getting_started/config/environments/test.rb
+++ b/railties/guides/code/getting_started/config/environments/test.rb
@@ -29,11 +29,6 @@ Blog::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 
diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb
index 13fbe9e526..40fd843b1b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb
@@ -49,6 +49,11 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
 <% unless options.skip_sprockets? -%>
     # Enable the asset pipeline
     config.assets.enabled = true
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 80198cc21e..37a8b81dad 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -29,11 +29,6 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
   <%- unless options.skip_active_record? -%>
   # Raise exception on mass assignment protection for ActiveRecord models
   config.active_record.mass_assignment_sanitizer = :strict
-- 
cgit v1.2.3


From 8d17af23ef5202e7c28bbf701e247bce6011df07 Mon Sep 17 00:00:00 2001
From: Sunny Ripert <sunny@sunfox.org>
Date: Thu, 17 Nov 2011 17:05:53 +0100
Subject: Guides: better example to find the last sent email

---
 railties/guides/source/testing.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/testing.textile b/railties/guides/source/testing.textile
index 2341a3522c..5dbbe2c0f0 100644
--- a/railties/guides/source/testing.textile
+++ b/railties/guides/source/testing.textile
@@ -927,7 +927,7 @@ class UserControllerTest < ActionController::TestCase
     assert_difference 'ActionMailer::Base.deliveries.size', +1 do
       post :invite_friend, :email => 'friend@example.com'
     end
-    invite_email = ActionMailer::Base.deliveries.first
+    invite_email = ActionMailer::Base.deliveries.last
 
     assert_equal "You have been invited by me@example.com", invite_email.subject
     assert_equal 'friend@example.com', invite_email.to[0]
-- 
cgit v1.2.3


From a89fabbb0266e9a5a391a88fd39b97d08879412f Mon Sep 17 00:00:00 2001
From: Oscar Del Ben <info@oscardelben.com>
Date: Thu, 17 Nov 2011 18:49:47 +0100
Subject: Cleanup of databases.rake psql env variables

---
 activerecord/lib/active_record/railties/databases.rake | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 4ffcf6dbc1..589ed3bd11 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -377,10 +377,7 @@ db_namespace = namespace :db do
         ActiveRecord::Base.establish_connection(abcs[Rails.env])
         File.open("#{Rails.root}/db/structure.sql", "w:utf-8") { |f| f << ActiveRecord::Base.connection.structure_dump }
       when /postgresql/
-        ENV['PGHOST']     = abcs[Rails.env]['host'] if abcs[Rails.env]['host']
-        ENV['PGPORT']     = abcs[Rails.env]['port'].to_s if abcs[Rails.env]['port']
-        ENV['PGPASSWORD'] = abcs[Rails.env]['password'].to_s if abcs[Rails.env]['password']
-        ENV['PGUSER']     = abcs[Rails.env]['username'].to_s if abcs[Rails.env]['username']
+        set_psql_env(abcs[Rails.env])
         search_path = abcs[Rails.env]['schema_search_path']
         unless search_path.blank?
           search_path = search_path.split(",").map{|search_path_part| "--schema=#{search_path_part.strip}" }.join(" ")
@@ -418,10 +415,7 @@ db_namespace = namespace :db do
           ActiveRecord::Base.connection.execute(table)
         end
       when /postgresql/
-        ENV['PGHOST']     = abcs[env]['host'] if abcs[env]['host']
-        ENV['PGPORT']     = abcs[env]['port'].to_s if abcs[env]['port']
-        ENV['PGPASSWORD'] = abcs[env]['password'].to_s if abcs[env]['password']
-        ENV['PGUSER']     = abcs[env]['username'].to_s if abcs[env]['username']
+        set_psql_env(abcs[env])
         `psql -f "#{Rails.root}/db/structure.sql" #{abcs[env]['database']} #{abcs[env]['template']}`
       when /sqlite/
         dbfile = abcs[env]['database']
@@ -599,3 +593,10 @@ end
 def firebird_db_string(config)
   FireRuby::Database.db_string_for(config.symbolize_keys)
 end
+
+def set_psql_env(config)
+  ENV['PGHOST']     = config['host']          if config['host'] 
+  ENV['PGPORT']     = config['port'].to_s     if config['port']
+  ENV['PGPASSWORD'] = config['password'].to_s if config['password']
+  ENV['PGUSER']     = config['username'].to_s if config['username']
+end
-- 
cgit v1.2.3


From 649f2513a453cae319be8b63a9de25ae11fb9e8f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Nov 2011 10:00:33 -0800
Subject: Revert "Merge pull request #3603 from
 vijaydev/change_table_without_block_arg"

This reverts commit 81fad6a270ec3cbbb88553c9f2e8200c34fd4d13, reversing
changes made to 23101de283de13517e30c4c3d1ecc65525264886.

Conflicts:

	activerecord/test/cases/migration_test.rb
---
 .../abstract/schema_statements.rb                  | 19 +++-----
 activerecord/test/cases/migration_test.rb          | 54 ----------------------
 2 files changed, 7 insertions(+), 66 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 7742f32213..1d837f29be 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -242,19 +242,14 @@ module ActiveRecord
       #
       # See also Table for details on
       # all of the various column transformation
-      def change_table(table_name, options = {}, &blk)
-        bulk_change = supports_bulk_alter? && options[:bulk]
-        recorder = bulk_change ? ActiveRecord::Migration::CommandRecorder.new(self) : self
-        table = Table.new(table_name, recorder)
-
-        if block_given?
-          if blk.arity == 1
-            yield table
-          else
-            table.instance_eval(&blk)
-          end
+      def change_table(table_name, options = {})
+        if supports_bulk_alter? && options[:bulk]
+          recorder = ActiveRecord::Migration::CommandRecorder.new(self)
+          yield Table.new(table_name, recorder)
+          bulk_change_table(table_name, recorder.commands)
+        else
+          yield Table.new(table_name, self)
         end
-        bulk_change_table(table_name, recorder.commands) if bulk_change
       end
 
       # Renames a table.
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 75eb9c2bce..ae5b2a62b5 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1757,60 +1757,6 @@ if ActiveRecord::Base.connection.supports_migrations?
         end
       end
     end
-
-    def test_change_table_without_block_parameter_no_bulk
-      Person.connection.create_table :testings, :force => true do
-        string :foo
-      end
-      assert Person.connection.column_exists?(:testings, :foo, :string)
-
-      Person.connection.change_table :testings do
-        remove :foo
-        integer :bar
-      end
-
-      assert_equal %w(bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    if ActiveRecord::Base.connection.supports_bulk_alter?
-      def test_change_table_without_block_parameter_with_bulk
-        Person.connection.create_table :testings, :force => true do
-          string :foo
-        end
-        assert Person.connection.column_exists?(:testings, :foo, :string)
-
-        assert_queries(1) do
-          Person.connection.change_table(:testings, :bulk => true) do
-            integer :bar
-            string :foo_bar
-          end
-        end
-
-        assert_equal %w(bar foo foo_bar id), Person.connection.columns(:testings).map { |c| c.name }.sort
-      ensure
-        Person.connection.drop_table :testings rescue nil
-      end
-    end
-
-    def test_change_table_should_not_have_mixed_syntax
-      Person.connection.create_table :testings, :force => true do
-        string :foo
-      end
-      assert_raise(NoMethodError) do
-        Person.connection.change_table :testings do |t|
-          t.remove :foo
-          integer :bar
-        end
-      end
-      assert_raise(NameError) do
-        Person.connection.change_table :testings do
-          t.remove :foo
-          integer :bar
-        end
-      end
-    end
   end # SexierMigrationsTest
 
   class MigrationLoggerTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From a2f14e23441ec016f9643b9054f409006b0e16b3 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Nov 2011 10:28:23 -0800
Subject: Revert "Merge pull request #1163 from amatsuda/sexier_migration_31"

This reverts commit 0e407a90413d8a19002b85508d811ccdf2190783, reversing
changes made to 533a9f84b035756eedf9fdccf0c494dc9701ba72.

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/migration_test.rb
---
 .../abstract/schema_statements.rb                  |  10 +-
 .../connection_adapters/sqlite_adapter.rb          |  18 ++--
 activerecord/lib/active_record/session_store.rb    |   7 +-
 activerecord/test/cases/migration_test.rb          | 120 ---------------------
 4 files changed, 13 insertions(+), 142 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 1d837f29be..faa42e2d19 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -155,17 +155,11 @@ module ActiveRecord
       #  )
       #
       # See also TableDefinition#column for details on how to create columns.
-      def create_table(table_name, options = {}, &blk)
+      def create_table(table_name, options = {})
         td = table_definition
         td.primary_key(options[:primary_key] || Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
 
-        if block_given?
-          if blk.arity == 1
-            yield td
-          else
-            td.instance_eval(&blk)
-          end
-        end
+        yield td if block_given?
 
         if options[:force] && table_exists?(table_name)
           drop_table(table_name)
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index 35df0a1542..bc3804b3d9 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -480,30 +480,28 @@ module ActiveRecord
           drop_table(from)
         end
 
-        def copy_table(from, to, options = {}, &block) #:nodoc:
-          from_columns, from_primary_key = columns(from), primary_key(from)
-          options = options.merge(:id => (!from_columns.detect {|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
-          table_definition = nil
+        def copy_table(from, to, options = {}) #:nodoc:
+          options = options.merge(:id => (!columns(from).detect{|c| c.name == 'id'}.nil? && 'id' == primary_key(from).to_s))
           create_table(to, options) do |definition|
-            table_definition = definition
-            from_columns.each do |column|
+            @definition = definition
+            columns(from).each do |column|
               column_name = options[:rename] ?
                 (options[:rename][column.name] ||
                  options[:rename][column.name.to_sym] ||
                  column.name) : column.name
 
-              table_definition.column(column_name, column.type,
+              @definition.column(column_name, column.type,
                 :limit => column.limit, :default => column.default,
                 :precision => column.precision, :scale => column.scale,
                 :null => column.null)
             end
-            table_definition.primary_key from_primary_key if from_primary_key
-            table_definition.instance_eval(&block) if block
+            @definition.primary_key(primary_key(from)) if primary_key(from)
+            yield @definition if block_given?
           end
 
           copy_table_indexes(from, to, options[:rename] || {})
           copy_table_contents(from, to,
-            table_definition.columns.map {|column| column.name},
+            @definition.columns.map {|column| column.name},
             options[:rename] || {})
         end
 
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 92550c7efc..76c37cc367 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -64,13 +64,12 @@ module ActiveRecord
       end
 
       def create_table!
-        id_col_name, data_col_name = session_id_column, data_column_name
         connection_pool.clear_table_cache!(table_name)
         connection.create_table(table_name) do |t|
-          t.string id_col_name, :limit => 255
-          t.text data_col_name
+          t.string session_id_column, :limit => 255
+          t.text data_column_name
         end
-        connection.add_index table_name, id_col_name, :unique => true
+        connection.add_index table_name, session_id_column, :unique => true
       end
     end
 
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index ae5b2a62b5..3e219f2a49 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -1639,126 +1639,6 @@ if ActiveRecord::Base.connection.supports_migrations?
 
   end
 
-  class SexyMigrationsTest < ActiveRecord::TestCase
-    def test_references_column_type_adds_id
-      with_new_table do |t|
-        t.expects(:column).with('customer_id', :integer, {})
-        t.references :customer
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_adds_type
-      with_new_table do |t|
-        t.expects(:column).with('taggable_type', :string, {})
-        t.expects(:column).with('taggable_id', :integer, {})
-        t.references :taggable, :polymorphic => true
-      end
-    end
-
-    def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
-      with_new_table do |t|
-        t.expects(:column).with('taggable_type', :string, {:null => false})
-        t.expects(:column).with('taggable_id', :integer, {:null => false})
-        t.references :taggable, :polymorphic => true, :null => false
-      end
-    end
-
-    def test_belongs_to_works_like_references
-      with_new_table do |t|
-        t.expects(:column).with('customer_id', :integer, {})
-        t.belongs_to :customer
-      end
-    end
-
-    def test_timestamps_creates_updated_at_and_created_at
-      with_new_table do |t|
-        t.expects(:column).with(:created_at, :datetime, kind_of(Hash))
-        t.expects(:column).with(:updated_at, :datetime, kind_of(Hash))
-        t.timestamps
-      end
-    end
-
-    def test_integer_creates_integer_column
-      with_new_table do |t|
-        t.expects(:column).with(:foo, 'integer', {})
-        t.expects(:column).with(:bar, 'integer', {})
-        t.integer :foo, :bar
-      end
-    end
-
-    def test_string_creates_string_column
-      with_new_table do |t|
-        t.expects(:column).with(:foo, 'string', {})
-        t.expects(:column).with(:bar, 'string', {})
-        t.string :foo, :bar
-      end
-    end
-
-    if current_adapter?(:PostgreSQLAdapter) || current_adapter?(:SQLite3Adapter) || current_adapter?(:MysqlAdapter) || current_adapter?(:Mysql2Adapter)
-      def test_xml_creates_xml_column
-        type = current_adapter?(:PostgreSQLAdapter) ? 'xml' : :text
-
-        with_new_table do |t|
-          t.expects(:column).with(:data, type, {})
-          t.xml :data
-        end
-      end
-    else
-      def test_xml_creates_xml_column
-        with_new_table do |t|
-          assert_raises(NotImplementedError) do
-            t.xml :data
-          end
-        end
-      end
-    end
-
-    protected
-    def with_new_table
-      Person.connection.create_table :delete_me, :force => true do |t|
-        yield t
-      end
-    ensure
-      Person.connection.drop_table :delete_me rescue nil
-    end
-
-  end # SexyMigrationsTest
-
-  class SexierMigrationsTest < ActiveRecord::TestCase
-    def test_create_table_with_column_without_block_parameter
-      Person.connection.create_table :testings, :force => true do
-        column :foo, :string
-      end
-      assert Person.connection.column_exists?(:testings, :foo, :string)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_create_table_with_sexy_column_without_block_parameter
-      Person.connection.create_table :testings, :force => true do
-        integer :bar
-      end
-      assert Person.connection.column_exists?(:testings, :bar, :integer)
-    ensure
-      Person.connection.drop_table :testings rescue nil
-    end
-
-    def test_create_table_should_not_have_mixed_syntax
-      assert_raise(NoMethodError) do
-        Person.connection.create_table :testings, :force => true do |t|
-          t.string :foo
-          integer :bar
-        end
-      end
-      assert_raise(NameError) do
-        Person.connection.create_table :testings, :force => true do
-          t.string :foo
-          integer :bar
-        end
-      end
-    end
-  end # SexierMigrationsTest
-
   class MigrationLoggerTest < ActiveRecord::TestCase
     def test_migration_should_be_run_without_logger
       previous_logger = ActiveRecord::Base.logger
-- 
cgit v1.2.3


From 9b534060bfafbf1db36e73bb3e538b8c412dcc54 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 18 Nov 2011 01:17:21 +0530
Subject: update guide: db:structure:dump produces structure.sql now

---
 railties/guides/source/migrations.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/migrations.textile b/railties/guides/source/migrations.textile
index 23e36b39f9..5b52a93853 100644
--- a/railties/guides/source/migrations.textile
+++ b/railties/guides/source/migrations.textile
@@ -658,7 +658,7 @@ In many ways this is exactly what it is. This file is created by inspecting the
 
 There is however a trade-off: +db/schema.rb+ cannot express database specific items such as foreign key constraints, triggers, or stored procedures. While in a migration you can execute custom SQL statements, the schema dumper cannot reconstitute those statements from the database. If you are using features like this, then you should set the schema format to +:sql+.
 
-Instead of using Active Record's schema dumper, the database's structure will be dumped using a tool specific to the database (via the +db:structure:dump+ Rake task) into +db/#{Rails.env}_structure.sql+. For example, for the PostgreSQL RDBMS, the +pg_dump+ utility is used. For MySQL, this file will contain the output of +SHOW CREATE TABLE+ for the various tables. Loading these schemas is simply a question of executing the SQL statements they contain. By definition, this will create a perfect copy of the database's structure. Using the +:sql+ schema format will, however, prevent loading the schema into a RDBMS other than the one used to create it.
+Instead of using Active Record's schema dumper, the database's structure will be dumped using a tool specific to the database (via the +db:structure:dump+ Rake task) into +db/structure.sql+. For example, for the PostgreSQL RDBMS, the +pg_dump+ utility is used. For MySQL, this file will contain the output of +SHOW CREATE TABLE+ for the various tables. Loading these schemas is simply a question of executing the SQL statements they contain. By definition, this will create a perfect copy of the database's structure. Using the +:sql+ schema format will, however, prevent loading the schema into a RDBMS other than the one used to create it.
 
 h4. Schema Dumps and Source Control
 
-- 
cgit v1.2.3


From 8d83e339fc91bfba51bb30384efc1bca6a099a53 Mon Sep 17 00:00:00 2001
From: gregolsen <anotheroneman@yahoo.com>
Date: Thu, 17 Nov 2011 22:17:33 +0200
Subject: updating API docstring so that user can infer default value

---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 4 ++--
 activesupport/lib/active_support/core_ext/time/calculations.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 26a99658cc..c6d5f29690 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -192,13 +192,13 @@ class Date
   alias :sunday :end_of_week
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Date/DateTime representing the start of the given day in the previous week (default is Monday).
+  # Returns a new Date/DateTime representing the start of the given day in the previous week (default is :monday).
   def prev_week(day = :monday)
     result = (self - 7).beginning_of_week + DAYS_INTO_WEEK[day]
     self.acts_like?(:time) ? result.change(:hour => 0) : result
   end
 
-  # Returns a new Date/DateTime representing the start of the given day in next week (default is Monday).
+  # Returns a new Date/DateTime representing the start of the given day in next week (default is :monday).
   def next_week(day = :monday)
     result = (self + 7).beginning_of_week + DAYS_INTO_WEEK[day]
     self.acts_like?(:time) ? result.change(:hour => 0) : result
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 372dd69212..43cd103481 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -176,12 +176,12 @@ class Time
   end
   alias :at_end_of_week :end_of_week
 
-  # Returns a new Time representing the start of the given day in the previous week (default is Monday).
+  # Returns a new Time representing the start of the given day in the previous week (default is :monday).
   def prev_week(day = :monday)
     ago(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
   end
 
-  # Returns a new Time representing the start of the given day in next week (default is Monday).
+  # Returns a new Time representing the start of the given day in next week (default is :monday).
   def next_week(day = :monday)
     since(1.week).beginning_of_week.since(DAYS_INTO_WEEK[day].day).change(:hour => 0)
   end
-- 
cgit v1.2.3


From e37597072587e24a1daf62191fa22e7dbbeaffea Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Fri, 18 Nov 2011 10:17:16 +1300
Subject: Fixed typo: expect -> expected

---
 activesupport/lib/active_support/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index b3ac271778..db90de4682 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -428,7 +428,7 @@ module ActiveSupport #:nodoc:
     end
 
     # Attempt to autoload the provided module name by searching for a directory
-    # matching the expect path suffix. If found, the module is created and assigned
+    # matching the expected path suffix. If found, the module is created and assigned
     # to +into+'s constants with the name +const_name+. Provided that the directory
     # was loaded from a reloadable base path, it is added to the set of constants
     # that are to be unloaded.
-- 
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 ++
 railties/guides/source/i18n.textile                      | 12 ++++++++++++
 2 files changed, 14 insertions(+)

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)
diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile
index 2d4cc13571..43afa6c9e2 100644
--- a/railties/guides/source/i18n.textile
+++ b/railties/guides/source/i18n.textile
@@ -634,6 +634,18 @@ en:
 
 !images/i18n/demo_html_safe.png(i18n demo html safe)!
 
+Please note that values are interpolated directly into the translation.
+If they need to be escaped you need to pass them already escaped in the +t+ call.
+
+<erb>
+# config/locales/en.yml
+en:
+  welcome_html: <b>Welcome %{name}!</b>
+
+<%# Note the call to h() to avoid injection %>
+<%= t('welcome_html', :name => h(user.name)) %>
+</erb>
+
 h3. How to Store your Custom Translations
 
 The Simple backend shipped with Active Support allows you to store translations in both plain Ruby and YAML format. [2]
-- 
cgit v1.2.3


From a437986f433a775c7c370ad3f0273938015699df Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Thu, 17 Nov 2011 14:41:53 -0800
Subject: allow people to set a local .Gemfile so that things like ruby-debug
 are not required for regular development

---
 .gitignore | 1 +
 Gemfile    | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa14cee911..52a431867c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 # Check out http://help.github.com/ignore-files/ for how to set that up.
 
 debug.log
+.Gemfile
 /.bundle
 /.rbenv-version
 /.rvmrc
diff --git a/Gemfile b/Gemfile
index 97605e32b5..b0fbb3b310 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,13 +36,11 @@ gem "memcache-client", ">= 1.8.5"
 
 platforms :mri_18 do
   gem "system_timer"
-  gem "ruby-debug", ">= 0.10.3" unless ENV['TRAVIS']
   gem "json"
 end
 
-platforms :mri_19 do
-  gem "ruby-debug19", :require => "ruby-debug" unless ENV['TRAVIS'] || RUBY_VERSION >= "2.0"
-end
+# Add your own local bundler stuff
+instance_eval File.read ".Gemfile" if File.exists? ".Gemfile"
 
 platforms :mri do
   group :test do
@@ -69,7 +67,6 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "ruby-debug", ">= 0.10.3"
   gem "json"
   gem "activerecord-jdbcsqlite3-adapter", ">= 1.2.0"
 
-- 
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 --
 railties/guides/source/i18n.textile                      | 12 ------------
 2 files changed, 14 deletions(-)

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)
diff --git a/railties/guides/source/i18n.textile b/railties/guides/source/i18n.textile
index 43afa6c9e2..2d4cc13571 100644
--- a/railties/guides/source/i18n.textile
+++ b/railties/guides/source/i18n.textile
@@ -634,18 +634,6 @@ en:
 
 !images/i18n/demo_html_safe.png(i18n demo html safe)!
 
-Please note that values are interpolated directly into the translation.
-If they need to be escaped you need to pass them already escaped in the +t+ call.
-
-<erb>
-# config/locales/en.yml
-en:
-  welcome_html: <b>Welcome %{name}!</b>
-
-<%# Note the call to h() to avoid injection %>
-<%= t('welcome_html', :name => h(user.name)) %>
-</erb>
-
 h3. How to Store your Custom Translations
 
 The Simple backend shipped with Active Support allows you to store translations in both plain Ruby and YAML format. [2]
-- 
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(-)

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(-)

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 bc9b1e0a10359dcb81288a4076100d69d8573d9e Mon Sep 17 00:00:00 2001
From: Philip Arndt <parndt@gmail.com>
Date: Fri, 18 Nov 2011 23:50:14 +1300
Subject: Fixed typo: expect -> expected

---
 activesupport/lib/active_support/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index b3ac271778..db90de4682 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -428,7 +428,7 @@ module ActiveSupport #:nodoc:
     end
 
     # Attempt to autoload the provided module name by searching for a directory
-    # matching the expect path suffix. If found, the module is created and assigned
+    # matching the expected path suffix. If found, the module is created and assigned
     # to +into+'s constants with the name +const_name+. Provided that the directory
     # was loaded from a reloadable base path, it is added to the set of constants
     # that are to be unloaded.
-- 
cgit v1.2.3


From 307fc122f6b6c38204ffc6040fc8d814a8f01325 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Fri, 18 Nov 2011 13:05:25 +0100
Subject: release instructions: new section about docs generation

---
 RELEASING_RAILS.rdoc | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/RELEASING_RAILS.rdoc b/RELEASING_RAILS.rdoc
index 1dfcfe2488..3f05e97b91 100644
--- a/RELEASING_RAILS.rdoc
+++ b/RELEASING_RAILS.rdoc
@@ -205,3 +205,34 @@ There are two simple steps for fixing the CI:
 2. Fix it
 
 Repeat these steps until the CI is green.
+
+=== Manually trigger docs generation
+
+We have a post-receive hook in GitHub that calls the docs server on pushes.
+Triggers generation and publication of edge docs, updates the contrib app,
+and generates and publishes stable docs if a new stable tag is detected.
+
+The hook unfortunately is not invoked by tag pushing, so once the new stable
+tag has been pushed to origin, please run
+
+    curl -X POST -d '' http://rails-hooks.hashref.com/rails-master-hook
+
+You should see something like this:
+
+    Rails master hook tasks scheduled:
+
+      * updates the local checkout
+      * updates Rails Contributors
+      * generates and publishes edge docs
+
+    If a new stable tag is detected it also
+
+      * generates and publishes stable docs
+
+    This needs typically a few minutes.
+
+Note you do not need to specify the tag, the docs server figures it out.
+
+Also, don't worry if you call that multiple times or the hook is triggered
+again by some immediate regular push, if the scripts are running new calls
+are just queued (in a queue of size 1).
-- 
cgit v1.2.3


From 42954c426b2338bf90f286b8e425b2e192d483ae Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@intertwingly.net>
Date: Fri, 18 Nov 2011 10:05:06 -0500
Subject: Stop db:seed from performing a reload of the db Fix regression
 introduced by 38d26b0cb56d82093889efa95992a35ba3bb9f29

---
 activerecord/lib/active_record/railties/databases.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 589ed3bd11..abd71793fd 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -295,10 +295,10 @@ db_namespace = namespace :db do
   end
 
   desc 'Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)'
-  task :setup => :seed
+  task :setup => ['db:schema:load_if_ruby', 'db:structure:load_if_sql', :seed]
 
   desc 'Load the seed data from db/seeds.rb'
-  task :seed => ['db:schema:load_if_ruby', 'db:structure:load_if_sql'] do
+  task :seed do
     db_namespace['abort_if_pending_migrations'].invoke
     Rails.application.load_seed
   end
-- 
cgit v1.2.3


From 0e2156d33431d2343dca57c54d8ccb3d558dff95 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Fri, 18 Nov 2011 11:51:05 -0500
Subject: Update variable's name in the test case to reflect the class we're
 testing

---
 .../cases/validations/exclusion_validation_test.rb | 12 +++++------
 .../cases/validations/format_validation_test.rb    | 24 +++++++++++-----------
 .../cases/validations/inclusion_validation_test.rb | 12 +++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/activemodel/test/cases/validations/exclusion_validation_test.rb b/activemodel/test/cases/validations/exclusion_validation_test.rb
index 72a383f128..adab8ccb2b 100644
--- a/activemodel/test/cases/validations/exclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/exclusion_validation_test.rb
@@ -46,12 +46,12 @@ class ExclusionValidationTest < ActiveModel::TestCase
   def test_validates_exclusion_of_with_lambda
     Topic.validates_exclusion_of :title, :in => lambda{ |topic| topic.author_name == "sikachu" ? %w( monkey elephant ) : %w( abe wasabi ) }
 
-    p = Topic.new
-    p.title = "elephant"
-    p.author_name = "sikachu"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "elephant"
+    t.author_name = "sikachu"
+    assert t.invalid?
 
-    p.title = "wasabi"
-    assert p.valid?
+    t.title = "wasabi"
+    assert t.valid?
   end
 end
diff --git a/activemodel/test/cases/validations/format_validation_test.rb b/activemodel/test/cases/validations/format_validation_test.rb
index 2ce714fef0..41a1131bcb 100644
--- a/activemodel/test/cases/validations/format_validation_test.rb
+++ b/activemodel/test/cases/validations/format_validation_test.rb
@@ -101,25 +101,25 @@ class PresenceValidationTest < ActiveModel::TestCase
   def test_validates_format_of_with_lambda
     Topic.validates_format_of :content, :with => lambda{ |topic| topic.title == "digit" ? /\A\d+\Z/ : /\A\S+\Z/ }
 
-    p = Topic.new
-    p.title = "digit"
-    p.content = "Pixies"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "digit"
+    t.content = "Pixies"
+    assert t.invalid?
 
-    p.content = "1234"
-    assert p.valid?
+    t.content = "1234"
+    assert t.valid?
   end
 
   def test_validates_format_of_without_lambda
     Topic.validates_format_of :content, :without => lambda{ |topic| topic.title == "characters" ? /\A\d+\Z/ : /\A\S+\Z/ }
 
-    p = Topic.new
-    p.title = "characters"
-    p.content = "1234"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "characters"
+    t.content = "1234"
+    assert t.invalid?
 
-    p.content = "Pixies"
-    assert p.valid?
+    t.content = "Pixies"
+    assert t.valid?
   end
 
   def test_validates_format_of_for_ruby_class
diff --git a/activemodel/test/cases/validations/inclusion_validation_test.rb b/activemodel/test/cases/validations/inclusion_validation_test.rb
index 413da92de4..851d345eab 100644
--- a/activemodel/test/cases/validations/inclusion_validation_test.rb
+++ b/activemodel/test/cases/validations/inclusion_validation_test.rb
@@ -78,12 +78,12 @@ class InclusionValidationTest < ActiveModel::TestCase
   def test_validates_inclusion_of_with_lambda
     Topic.validates_inclusion_of :title, :in => lambda{ |topic| topic.author_name == "sikachu" ? %w( monkey elephant ) : %w( abe wasabi ) }
 
-    p = Topic.new
-    p.title = "wasabi"
-    p.author_name = "sikachu"
-    assert p.invalid?
+    t = Topic.new
+    t.title = "wasabi"
+    t.author_name = "sikachu"
+    assert t.invalid?
 
-    p.title = "elephant"
-    assert p.valid?
+    t.title = "elephant"
+    assert t.valid?
   end
 end
-- 
cgit v1.2.3


From 280b2b725b488ef71556970ee895ccaddc315e0c Mon Sep 17 00:00:00 2001
From: Christos Zisopoulos <christos@me.com>
Date: Fri, 18 Nov 2011 18:29:47 +0100
Subject: Only used detailed schema introspection when doing a schema dump.

Fixes #3678
---
 .../active_record/connection_adapters/abstract_mysql_adapter.rb    | 7 +++++++
 activerecord/lib/active_record/schema_dumper.rb                    | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index e26b10fa97..3e043992e9 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -576,6 +576,13 @@ module ActiveRecord
 
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table)
+        execute_and_free("DESCRIBE #{quote_table_name(table)}", 'SCHEMA') do |result|
+          keys = each_hash(result).select { |row| row[:Key] == 'PRI' }.map { |row| row[:Field] }
+          keys.length == 1 ? [keys.first, nil] : nil
+        end
+      end
+
+      def detailed_pk_and_sequence_for(table)
         sql = <<-SQL
           SELECT t.constraint_type, k.column_name
           FROM information_schema.table_constraints t
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index cdde5cf3b9..f70aa7a0bd 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -86,7 +86,9 @@ HEADER
           tbl = StringIO.new
 
           # first dump primary key column
-          if @connection.respond_to?(:pk_and_sequence_for)
+          if @connection.respond_to?(:detailed_pk_and_sequence_for)
+            pk, _ = @connection.detailed_pk_and_sequence_for(table)
+          elsif @connection.respond_to?(:pk_and_sequence_for)
             pk, _ = @connection.pk_and_sequence_for(table)
           elsif @connection.respond_to?(:primary_key)
             pk = @connection.primary_key(table)
-- 
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(+)

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 9d035292ba39fcb046656ceb28e7a2f10cdb7f9c Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Fri, 18 Nov 2011 23:10:12 +0530
Subject: remove unneeded params from issue tracker url

---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 1cd70404a3..37ead2bff2 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -215,7 +215,7 @@ TIP: You may want to "put your git branch name in your shell prompt":http://qugs
 
 h3. Helping to Resolve Existing Issues
 
-As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues?sort=created&direction=desc&state=open list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
+As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
 
 h4. Verifying Bug Reports
 
-- 
cgit v1.2.3


From dda6787f44a4e9a90cc28b3efee5b63c7d8cd023 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sat, 19 Nov 2011 00:07:50 +0530
Subject: mailer guide - update info about using default host. Fixes #3642

---
 railties/guides/source/action_mailer_basics.textile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/railties/guides/source/action_mailer_basics.textile b/railties/guides/source/action_mailer_basics.textile
index ad5b848d2c..26c95be031 100644
--- a/railties/guides/source/action_mailer_basics.textile
+++ b/railties/guides/source/action_mailer_basics.textile
@@ -362,21 +362,14 @@ When using named routes you only need to supply the +:host+:
 
 Email clients have no web context and so paths have no base URL to form complete web addresses. Thus, when using named routes only the "_url" variant makes sense.
 
-It is also possible to set a default host that will be used in all mailers by setting the +:host+ option in the +ActionMailer::Base.default_url_options+ hash as follows:
+It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt> option as a configuration option in <tt>config/application.rb</tt>:
 
 <ruby>
-class UserMailer < ActionMailer::Base
-  default_url_options[:host] = "example.com"
-
-  def welcome_email(user)
-    @user = user
-    @url  = user_url(@user)
-    mail(:to => user.email,
-         :subject => "Welcome to My Awesome Site")
-  end
-end
+config.action_mailer.default_url_options = { :host => "example.com" }
 </ruby>
 
+If you use this setting, you should pass the <tt>:only_path => false</tt> option when using +url_for+. This will ensure that absolute URLs are generated because the +url_for+ view helper will, by default, generate relative URLs when a <tt>:host</tt> option isn't explicitly provided.
+
 h4. Sending Multipart Emails
 
 Action Mailer will automatically send multipart emails if you have different templates for the same action. So, for our UserMailer example, if you have +welcome_email.text.erb+ and +welcome_email.html.erb+ in +app/views/user_mailer+, Action Mailer will automatically send a multipart email with the HTML and text versions setup as different parts.
-- 
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(-)

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(-)

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(-)

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(-)

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(-)

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(-)

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(-)

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(-)

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(-)

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(-)

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(+)

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(-)

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(-)

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(-)

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(-)

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 f9b917901608cda534d54b83b7d251c1fc73e31b Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sat, 19 Nov 2011 04:11:38 +0900
Subject: Use `show index from`. We could fix `pk_and_sequence_for` method's
 performance problem (GH #3678)

---
 .../connection_adapters/abstract_mysql_adapter.rb    | 20 ++------------------
 activerecord/lib/active_record/schema_dumper.rb      |  4 +---
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 3e043992e9..f72d2974c8 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -576,24 +576,8 @@ module ActiveRecord
 
       # Returns a table's primary key and belonging sequence.
       def pk_and_sequence_for(table)
-        execute_and_free("DESCRIBE #{quote_table_name(table)}", 'SCHEMA') do |result|
-          keys = each_hash(result).select { |row| row[:Key] == 'PRI' }.map { |row| row[:Field] }
-          keys.length == 1 ? [keys.first, nil] : nil
-        end
-      end
-
-      def detailed_pk_and_sequence_for(table)
-        sql = <<-SQL
-          SELECT t.constraint_type, k.column_name
-          FROM information_schema.table_constraints t
-          JOIN information_schema.key_column_usage k
-          USING (constraint_name, table_schema, table_name)
-          WHERE t.table_schema = DATABASE()
-            AND t.table_name   = '#{table}'
-        SQL
-
-        execute_and_free(sql, 'SCHEMA') do |result|
-          keys = each_hash(result).select { |row| row[:constraint_type] == 'PRIMARY KEY' }.map { |row| row[:column_name] }
+        execute_and_free("SHOW INDEX FROM #{quote_table_name(table)} WHERE Key_name = 'PRIMARY'", 'SCHEMA') do |result|
+          keys = each_hash(result).map { |row| row[:Column_name] }
           keys.length == 1 ? [keys.first, nil] : nil
         end
       end
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index f70aa7a0bd..cdde5cf3b9 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -86,9 +86,7 @@ HEADER
           tbl = StringIO.new
 
           # first dump primary key column
-          if @connection.respond_to?(:detailed_pk_and_sequence_for)
-            pk, _ = @connection.detailed_pk_and_sequence_for(table)
-          elsif @connection.respond_to?(:pk_and_sequence_for)
+          if @connection.respond_to?(:pk_and_sequence_for)
             pk, _ = @connection.pk_and_sequence_for(table)
           elsif @connection.respond_to?(:primary_key)
             pk = @connection.primary_key(table)
-- 
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(-)

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 9c37416a3eaa446ec59cde1e7f8a913f62de3265 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 19 Nov 2011 12:34:15 +0000
Subject: Verify that #3690 has been closed by previous changes to the mysql
 adapters.

These tests fail on the v3.1.2 tag.

Closes #3690.
---
 activerecord/CHANGELOG.md                              | 4 ++++
 activerecord/test/cases/adapters/mysql/schema_test.rb  | 6 +++++-
 activerecord/test/cases/adapters/mysql2/schema_test.rb | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 65578c1dc9..ffd476ef5e 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -65,6 +65,10 @@
 
     *Aaron Christy*
 
+## Rails 3.1.3 (unreleased) ##
+
+*   Fix bug with referencing other mysql databases in set_table_name. *GH 3690*
+
 ## Rails 3.1.2 (unreleased) ##
 
 *   Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
diff --git a/activerecord/test/cases/adapters/mysql/schema_test.rb b/activerecord/test/cases/adapters/mysql/schema_test.rb
index a2155d1dd1..1aa034ed53 100644
--- a/activerecord/test/cases/adapters/mysql/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/schema_test.rb
@@ -13,7 +13,7 @@ module ActiveRecord
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(Post) do
+        @omgpost = Class.new(ActiveRecord::Base) do
           set_table_name "#{db}.#{table}"
           def self.name; 'Post'; end
         end
@@ -23,6 +23,10 @@ module ActiveRecord
         assert @omgpost.find(:first)
       end
 
+      def test_primary_key
+        assert_equal 'id', @omgpost.primary_key
+      end
+
       def test_table_exists?
         name = @omgpost.table_name
         assert @connection.table_exists?(name), "#{name} table should exist"
diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb
index 858d1da2dd..49514e1539 100644
--- a/activerecord/test/cases/adapters/mysql2/schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb
@@ -13,7 +13,7 @@ module ActiveRecord
         table       = Post.table_name
         @db_name    = db
 
-        @omgpost = Class.new(Post) do
+        @omgpost = Class.new(ActiveRecord::Base) do
           set_table_name "#{db}.#{table}"
           def self.name; 'Post'; end
         end
@@ -23,6 +23,10 @@ module ActiveRecord
         assert @omgpost.find(:first)
       end
 
+      def test_primary_key
+        assert_equal 'id', @omgpost.primary_key
+      end
+
       def test_table_exists?
         name = @omgpost.table_name
         assert @connection.table_exists?(name), "#{name} table should exist"
-- 
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(-)

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(-)

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(-)

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 2ef4947ab0da304f6e5158cf89059c94e9ce0a4c Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 19 Nov 2011 13:34:50 +0000
Subject: Add missing CHANGELOG entry for #3678. Closes #3678.

---
 activerecord/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index ffd476ef5e..00014f858c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -69,6 +69,10 @@
 
 *   Fix bug with referencing other mysql databases in set_table_name. *GH 3690*
 
+*   Fix performance bug with mysql databases on a server with lots of other databses. *GH 3678*
+
+    *Christos Zisopoulos and Kenny J*
+
 ## Rails 3.1.2 (unreleased) ##
 
 *   Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
-- 
cgit v1.2.3


From fec85cf10d831ab90386a549ea558b0dd58a813f Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sat, 19 Nov 2011 14:10:21 +0000
Subject: Perf fix

If we're deleting all records in an association, don't add a IN(..)
clause to the query.

Fixes #3672.
---
 activerecord/CHANGELOG.md                                         | 5 +++++
 .../lib/active_record/associations/has_many_association.rb        | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 00014f858c..c50229e779 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -67,6 +67,11 @@
 
 ## Rails 3.1.3 (unreleased) ##
 
+*   Perf fix: If we're deleting all records in an association, don't add a IN(..) clause
+    to the query. *GH 3672*
+
+    *Jon Leighton*
+
 *   Fix bug with referencing other mysql databases in set_table_name. *GH 3690*
 
 *   Fix performance bug with mysql databases on a server with lots of other databses. *GH 3678*
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 50ee60284c..3353cdf1ef 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -89,8 +89,12 @@ module ActiveRecord
             records.each { |r| r.destroy }
             update_counter(-records.length) unless inverse_updates_counter_cache?
           else
-            keys  = records.map { |r| r[reflection.association_primary_key] }
-            scope = scoped.where(reflection.association_primary_key => keys)
+            scope = scoped
+
+            unless records == load_target
+              keys  = records.map { |r| r[reflection.association_primary_key] }
+              scope = scoped.where(reflection.association_primary_key => keys)
+            end
 
             if method == :delete_all
               update_counter(-scope.delete_all)
-- 
cgit v1.2.3


From 39d2251d8a3e50bf004b6361e0079679466b2280 Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Sat, 19 Nov 2011 19:03:44 +0200
Subject: fix rails plugin new CamelCasedName bug

refs #3684
---
 .../rails/plugin_new/plugin_new_generator.rb         | 20 ++++++++++++++++----
 .../test/generators/plugin_new_generator_test.rb     |  6 ++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index f5c8ccf940..ff523fc26f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -246,8 +246,20 @@ task :default => :test
         "rails plugin new #{self.arguments.map(&:usage).join(' ')} [options]"
       end
 
+      def original_name
+        @original_name ||= File.basename(destination_root)
+      end
+
       def name
-        @name ||= File.basename(destination_root)
+        unless @name
+          # same as ActiveSupport::Inflector#underscore except not replacing '-'
+          @name = original_name.dup
+          @name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          @name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          @name.downcase!
+        end
+
+        @name
       end
 
       def camelized
@@ -256,11 +268,11 @@ task :default => :test
 
       def valid_const?
         if camelized =~ /^\d/
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not start with numbers."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not start with numbers."
         elsif RESERVED_NAMES.include?(name)
-          raise Error, "Invalid plugin name #{name}. Please give a name which does not match one of the reserved rails words."
+          raise Error, "Invalid plugin name #{original_name}. Please give a name which does not match one of the reserved rails words."
         elsif Object.const_defined?(camelized)
-          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another plugin name."
+          raise Error, "Invalid plugin name #{original_name}, constant #{camelized} is already in use. Please choose another plugin name."
         end
       end
 
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index b70f9f4d9c..826eac904e 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -37,6 +37,12 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_file "things-43/lib/things-43.rb", /module Things43/
   end
 
+  def test_camelcase_plugin_name_underscores_filenames
+    run_generator [File.join(destination_root, "CamelCasedName")]
+    assert_no_file "CamelCasedName/lib/CamelCasedName.rb"
+    assert_file "CamelCasedName/lib/camel_cased_name.rb", /module CamelCasedName/
+  end
+
   def test_generating_without_options
     run_generator
     assert_file "README.rdoc", /Bukkits/
-- 
cgit v1.2.3


From c220b4d833fcefb4f60fd021875c05e07dfff77d Mon Sep 17 00:00:00 2001
From: lest <just.lest@gmail.com>
Date: Sat, 19 Nov 2011 21:51:37 +0300
Subject: fix warning about instance variable in plugin generator

---
 .../generators/rails/plugin_new/plugin_new_generator.rb    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index ff523fc26f..cd7d51e628 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -251,15 +251,15 @@ task :default => :test
       end
 
       def name
-        unless @name
+        @name ||= begin
           # same as ActiveSupport::Inflector#underscore except not replacing '-'
-          @name = original_name.dup
-          @name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-          @name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-          @name.downcase!
-        end
+          underscored = original_name.dup
+          underscored.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+          underscored.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+          underscored.downcase!
 
-        @name
+          underscored
+        end
       end
 
       def camelized
-- 
cgit v1.2.3


From bd2f5c062da011e092c1f122567f24bd5fc6d9b5 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 19 Nov 2011 20:19:53 -0800
Subject: pushing caching and visitors down to the connection

---
 activerecord/lib/active_record/base.rb             |  18 ++--
 .../abstract/connection_pool.rb                    | 108 ++++++---------------
 .../connection_adapters/abstract_adapter.rb        |   3 +
 .../connection_adapters/schema_cache.rb            |  72 ++++++++++++++
 .../connection_adapters/sqlite_adapter.rb          |   5 +-
 .../active_record/relation/predicate_builder.rb    |   2 +-
 activerecord/lib/active_record/session_store.rb    |   4 +-
 .../connection_adapters/fake_adapter.rb            |   7 +-
 activerecord/test/cases/adapter_test.rb            |  10 --
 .../cases/adapters/sqlite3/sqlite3_adapter_test.rb |   1 +
 .../cases/connection_adapters/schema_cache_test.rb |  55 +++++++++++
 activerecord/test/cases/connection_pool_test.rb    |  37 -------
 activerecord/test/cases/pooled_connections_test.rb |  72 --------------
 13 files changed, 181 insertions(+), 213 deletions(-)
 create mode 100644 activerecord/lib/active_record/connection_adapters/schema_cache.rb
 create mode 100644 activerecord/test/cases/connection_adapters/schema_cache_test.rb

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 3558ae3545..7ba67b8540 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -710,21 +710,21 @@ module ActiveRecord #:nodoc:
       # Returns an array of column objects for the table associated with this class.
       def columns
         if defined?(@primary_key)
-          connection_pool.primary_keys[table_name] ||= primary_key
+          connection.schema_cache.primary_keys[table_name] ||= primary_key
         end
 
-        connection_pool.columns[table_name]
+        connection.schema_cache.columns[table_name]
       end
 
       # Returns a hash of column objects for the table associated with this class.
       def columns_hash
-        connection_pool.columns_hash[table_name]
+        connection.schema_cache.columns_hash[table_name]
       end
 
       # Returns a hash where the keys are column names and the values are
       # default values when instantiating the AR object for this table.
       def column_defaults
-        connection_pool.column_defaults[table_name]
+        connection.schema_cache.column_defaults[table_name]
       end
 
       # Returns an array of column names as strings.
@@ -781,14 +781,14 @@ module ActiveRecord #:nodoc:
       def reset_column_information
         connection.clear_cache!
         undefine_attribute_methods
-        connection_pool.clear_table_cache!(table_name) if table_exists?
+        connection.schema_cache.clear_table_cache!(table_name) if table_exists?
 
         @column_names = @content_columns = @dynamic_methods_hash = @inheritance_column = nil
         @arel_engine = @relation = nil
       end
 
       def clear_cache! # :nodoc:
-        connection_pool.clear_cache!
+        connection.schema_cache.clear!
       end
 
       def attribute_method?(attribute)
@@ -1356,9 +1356,9 @@ MSG
           return nil if condition.blank?
 
           case condition
-            when Array; sanitize_sql_array(condition)
-            when Hash;  sanitize_sql_hash_for_conditions(condition, table_name)
-            else        condition
+          when Array; sanitize_sql_array(condition)
+          when Hash;  sanitize_sql_hash_for_conditions(condition, table_name)
+          else        condition
           end
         end
         alias_method :sanitize_sql, :sanitize_sql_for_conditions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 0ec0576795..f1781f057c 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -2,6 +2,7 @@ require 'thread'
 require 'monitor'
 require 'set'
 require 'active_support/core_ext/module/synchronization'
+require 'active_support/core_ext/module/deprecation'
 
 module ActiveRecord
   # Raised when a connection could not be obtained within the connection
@@ -59,8 +60,6 @@ module ActiveRecord
     class ConnectionPool
       attr_accessor :automatic_reconnect
       attr_reader :spec, :connections
-      attr_reader :columns, :columns_hash, :primary_keys, :tables
-      attr_reader :column_defaults
 
       # Creates a new ConnectionPool object. +spec+ is a ConnectionSpecification
       # object which describes database connection information (e.g. adapter,
@@ -85,72 +84,7 @@ module ActiveRecord
         @connections         = []
         @checked_out         = []
         @automatic_reconnect = true
-        @tables              = {}
         @visitor             = nil
-
-        @columns     = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-
-            # Fetch a list of columns
-            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
-
-              # set primary key information
-              columns.each do |column|
-                column.primary = column.name == primary_keys[table_name]
-              end
-            end
-          end
-        end
-
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
-        end
-
-        @column_defaults = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col.default]
-          }]
-        end
-
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-            table_exists?(table_name) ? conn.primary_key(table_name) : 'id'
-          end
-        end
-      end
-
-      # A cached lookup for table existence.
-      def table_exists?(name)
-        return @tables[name] if @tables.key? name
-
-        with_connection do |conn|
-          conn.tables.each { |table| @tables[table] = true }
-          @tables[name] = conn.table_exists?(name) if !@tables.key?(name)
-        end
-
-        @tables[name]
-      end
-
-      # Clears out internal caches:
-      #
-      #   * columns
-      #   * columns_hash
-      #   * tables
-      def clear_cache!
-        @columns.clear
-        @columns_hash.clear
-        @column_defaults.clear
-        @tables.clear
-      end
-
-      # Clear out internal caches for table with +table_name+.
-      def clear_table_cache!(table_name)
-        @columns.delete table_name
-        @columns_hash.delete table_name
-        @column_defaults.delete table_name
-        @primary_keys.delete table_name
       end
 
       # Retrieve the connection associated with the current thread, or call
@@ -227,6 +161,35 @@ module ActiveRecord
         end
       end
 
+      def columns
+        with_connection do |c|
+          c.schema_cache.columns
+        end
+      end
+      deprecate :columns
+
+      def columns_hash
+        with_connection do |c|
+          c.schema_cache.columns_hash
+        end
+      end
+      deprecate :columns_hash
+
+      def primary_keys
+        raise
+        with_connection do |c|
+          c.schema_cache.primary_keys
+        end
+      end
+      deprecate :primary_keys
+
+      def clear_cache!
+        with_connection do |c|
+          c.schema_cache.clear!
+        end
+      end
+      deprecate :clear_cache!
+
       # Return any checked-out connections back to the pool by threads that
       # are no longer alive.
       def clear_stale_cached_connections!
@@ -301,16 +264,7 @@ module ActiveRecord
       private
 
       def new_connection
-        connection = ActiveRecord::Base.send(spec.adapter_method, spec.config)
-
-        # TODO: This is a bit icky, and in the long term we may want to change the method
-        #       signature for connections. Also, if we switch to have one visitor per
-        #       connection (and therefore per thread), we can get rid of the thread-local
-        #       variable in Arel::Visitors::ToSql.
-        @visitor ||= connection.class.visitor_for(self)
-        connection.visitor = @visitor
-
-        connection
+        ActiveRecord::Base.send(spec.adapter_method, spec.config)
       end
 
       def current_connection_id #:nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index c47bcfc406..cbb7423480 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -3,6 +3,7 @@ require 'bigdecimal'
 require 'bigdecimal/util'
 require 'active_support/core_ext/benchmark'
 require 'active_support/deprecation'
+require 'active_record/connection_adapters/schema_cache'
 
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
@@ -51,6 +52,7 @@ module ActiveRecord
       define_callbacks :checkout, :checkin
 
       attr_accessor :visitor
+      attr_reader :schema_cache
 
       def initialize(connection, logger = nil) #:nodoc:
         @active = nil
@@ -60,6 +62,7 @@ module ActiveRecord
         @open_transactions = 0
         @instrumenter = ActiveSupport::Notifications.instrumenter
         @visitor = nil
+        @schema_cache = SchemaCache.new self
       end
 
       # Returns a visitor instance for this adaptor, which conforms to the Arel::ToSql interface
diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
new file mode 100644
index 0000000000..b14b37ce89
--- /dev/null
+++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb
@@ -0,0 +1,72 @@
+module ActiveRecord
+  module ConnectionAdapters
+    class SchemaCache
+      attr_reader :columns, :columns_hash, :primary_keys, :tables
+      attr_reader :column_defaults
+      attr_reader :connection
+
+      def initialize(conn)
+        @connection = conn
+        @tables              = {}
+
+        @columns     = Hash.new do |h, table_name|
+          h[table_name] =
+            # Fetch a list of columns
+            conn.columns(table_name, "#{table_name} Columns").tap do |cs|
+              # set primary key information
+              cs.each do |column|
+                column.primary = column.name == primary_keys[table_name]
+              end
+            end
+        end
+
+        @columns_hash = Hash.new do |h, table_name|
+          h[table_name] = Hash[columns[table_name].map { |col|
+            [col.name, col]
+          }]
+        end
+
+        @column_defaults = Hash.new do |h, table_name|
+          h[table_name] = Hash[columns[table_name].map { |col|
+            [col.name, col.default]
+          }]
+        end
+
+        @primary_keys = Hash.new do |h, table_name|
+          h[table_name] = table_exists?(table_name) ?
+                          conn.primary_key(table_name) : 'id'
+        end
+      end
+
+      # A cached lookup for table existence.
+      def table_exists?(name)
+        return @tables[name] if @tables.key? name
+
+        connection.tables.each { |table| @tables[table] = true }
+        @tables[name] = connection.table_exists?(name) if !@tables.key?(name)
+
+        @tables[name]
+      end
+
+      # Clears out internal caches:
+      #
+      #   * columns
+      #   * columns_hash
+      #   * tables
+      def clear!
+        @columns.clear
+        @columns_hash.clear
+        @column_defaults.clear
+        @tables.clear
+      end
+
+      # Clear out internal caches for table with +table_name+.
+      def clear_table_cache!(table_name)
+        @columns.delete table_name
+        @columns_hash.delete table_name
+        @column_defaults.delete table_name
+        @primary_keys.delete table_name
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index bc3804b3d9..c11f82a33f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -89,10 +89,7 @@ module ActiveRecord
         @statements = StatementPool.new(@connection,
                                         config.fetch(:statement_limit) { 1000 })
         @config = config
-      end
-
-      def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::SQLite.new(pool)
+        @visitor = Arel::Visitors::SQLite.new self
       end
 
       def adapter_name #:nodoc:
diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index af167dc59b..a789f48725 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -23,7 +23,7 @@ module ActiveRecord
             attribute.in(value.arel.ast)
           when Array, ActiveRecord::Associations::CollectionProxy
             values = value.to_a.map {|x| x.is_a?(ActiveRecord::Base) ? x.id : x}
-            ranges, values = values.partition {|value| value.is_a?(Range) || value.is_a?(Arel::Relation)}
+            ranges, values = values.partition {|v| v.is_a?(Range) || v.is_a?(Arel::Relation)}
 
             array_predicates = ranges.map {|range| attribute.in(range)}
 
diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 76c37cc367..e3bbd06f7e 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -59,12 +59,12 @@ module ActiveRecord
       end
 
       def drop_table!
-        connection_pool.clear_table_cache!(table_name)
+        connection.schema_cache.clear_table_cache!(table_name)
         connection.drop_table table_name
       end
 
       def create_table!
-        connection_pool.clear_table_cache!(table_name)
+        connection.schema_cache.clear_table_cache!(table_name)
         connection.create_table(table_name) do |t|
           t.string session_id_column, :limit => 255
           t.text data_column_name
diff --git a/activerecord/test/active_record/connection_adapters/fake_adapter.rb b/activerecord/test/active_record/connection_adapters/fake_adapter.rb
index 1c2942170e..267ea8bb6b 100644
--- a/activerecord/test/active_record/connection_adapters/fake_adapter.rb
+++ b/activerecord/test/active_record/connection_adapters/fake_adapter.rb
@@ -9,11 +9,16 @@ module ActiveRecord
     class FakeAdapter < AbstractAdapter
       attr_accessor :tables, :primary_keys
 
+      @columns = Hash.new { |h,k| h[k] = [] }
+      class << self
+        attr_reader :columns
+      end
+
       def initialize(connection, logger)
         super
         @tables       = []
         @primary_keys = {}
-        @columns      = Hash.new { |h,k| h[k] = [] }
+        @columns      = self.class.columns
       end
 
       def primary_key(table)
diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 94497e37c7..f1023ed7ef 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -157,14 +157,4 @@ class AdapterTest < ActiveRecord::TestCase
       end
     end
   end
-
-  def test_deprecated_visitor_for
-    visitor_klass = Class.new(Arel::Visitors::ToSql)
-    Arel::Visitors::VISITORS['fuuu'] = visitor_klass
-    pool = stub(:spec => stub(:config => { :adapter => 'fuuu' }))
-    visitor = assert_deprecated {
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.visitor_for(pool)
-    }
-    assert visitor.is_a?(visitor_klass)
-  end
 end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index eb6f071dc1..156a8b7b14 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -158,6 +158,7 @@ module ActiveRecord
         binary.save!
         assert_equal str, binary.data
 
+      ensure
         DualEncoding.connection.drop_table('dual_encodings')
       end
 
diff --git a/activerecord/test/cases/connection_adapters/schema_cache_test.rb b/activerecord/test/cases/connection_adapters/schema_cache_test.rb
new file mode 100644
index 0000000000..79e842f5e1
--- /dev/null
+++ b/activerecord/test/cases/connection_adapters/schema_cache_test.rb
@@ -0,0 +1,55 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class SchemaCacheTest < ActiveRecord::TestCase
+      def setup
+        connection = ActiveRecord::Base.connection
+        @cache     = SchemaCache.new connection
+
+        if in_memory_db?
+          connection.create_table :posts do |t|
+            t.integer :cololumn
+          end
+        end
+      end
+
+      def test_primary_key
+        assert_equal 'id', @cache.primary_keys['posts']
+      end
+
+      def test_primary_key_for_non_existent_table
+        assert_equal 'id', @cache.primary_keys['omgponies']
+      end
+
+      def test_primary_key_is_set_on_columns
+        posts_columns = @cache.columns_hash['posts']
+        assert posts_columns['id'].primary
+
+        (posts_columns.keys - ['id']).each do |key|
+          assert !posts_columns[key].primary
+        end
+      end
+
+      def test_caches_columns
+        columns = @cache.columns['posts']
+        assert_equal columns, @cache.columns['posts']
+      end
+
+      def test_caches_columns_hash
+        columns_hash = @cache.columns_hash['posts']
+        assert_equal columns_hash, @cache.columns_hash['posts']
+      end
+
+      def test_clearing_column_cache
+        @cache.columns['posts']
+        @cache.columns_hash['posts']
+
+        @cache.clear!
+
+        assert_equal 0, @cache.columns.size
+        assert_equal 0, @cache.columns_hash.size
+      end
+    end
+  end
+end
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb
index 8a0f453127..1550fa5530 100644
--- a/activerecord/test/cases/connection_pool_test.rb
+++ b/activerecord/test/cases/connection_pool_test.rb
@@ -26,43 +26,6 @@ module ActiveRecord
         assert !@pool.active_connection?
       end
 
-      def test_pool_caches_columns
-        columns = @pool.columns['posts']
-        assert_equal columns, @pool.columns['posts']
-      end
-
-      def test_pool_caches_columns_hash
-        columns_hash = @pool.columns_hash['posts']
-        assert_equal columns_hash, @pool.columns_hash['posts']
-      end
-
-      def test_clearing_column_cache
-        @pool.columns['posts']
-        @pool.columns_hash['posts']
-
-        @pool.clear_cache!
-
-        assert_equal 0, @pool.columns.size
-        assert_equal 0, @pool.columns_hash.size
-      end
-
-      def test_primary_key
-        assert_equal 'id', @pool.primary_keys['posts']
-      end
-
-      def test_primary_key_for_non_existent_table
-        assert_equal 'id', @pool.primary_keys['omgponies']
-      end
-
-      def test_primary_key_is_set_on_columns
-        posts_columns = @pool.columns_hash['posts']
-        assert posts_columns['id'].primary
-
-        (posts_columns.keys - ['id']).each do |key|
-          assert !posts_columns[key].primary
-        end
-      end
-
       def test_clear_stale_cached_connections!
         pool = ConnectionPool.new ActiveRecord::Base.connection_pool.spec
 
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index 434b8a677a..bc3dfb1078 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -66,78 +66,6 @@ class PooledConnectionsTest < ActiveRecord::TestCase
     assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
   end
 
-  def test_pooled_connection_checkin_two
-    checkout_checkin_connections 2, 3
-    assert_equal 3, @connection_count
-    assert_equal 0, @timed_out
-    assert_equal 1, ActiveRecord::Base.connection_pool.connections.size
-  end
-
-  def test_pooled_connection_checkout_existing_first
-    ActiveRecord::Base.establish_connection(@connection.merge({:pool => 1}))
-    conn_pool = ActiveRecord::Base.connection_pool
-    conn = conn_pool.checkout
-    conn_pool.checkin(conn)
-    conn = conn_pool.checkout
-    assert ActiveRecord::ConnectionAdapters::AbstractAdapter === conn
-    conn_pool.checkin(conn)
-  end
-
-  def test_not_connected_defined_connection_returns_false
-    ActiveRecord::Base.establish_connection(@connection)
-    assert ! ActiveRecord::Base.connected?
-  end
-
-  def test_undefined_connection_returns_false
-    old_handler = ActiveRecord::Base.connection_handler
-    ActiveRecord::Base.connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-    assert ! ActiveRecord::Base.connected?
-  ensure
-    ActiveRecord::Base.connection_handler = old_handler
-  end
-
-  def test_connection_config
-    ActiveRecord::Base.establish_connection(@connection)
-    assert_equal @connection, ActiveRecord::Base.connection_config
-  end
-
-  def test_with_connection_nesting_safety
-    ActiveRecord::Base.establish_connection(@connection.merge({:pool => 1, :wait_timeout => 0.1}))
-
-    before_count = Project.count
-
-    add_record('one')
-
-    ActiveRecord::Base.connection.transaction do
-      add_record('two')
-      # Have another thread try to screw up the transaction
-      Thread.new do
-        ActiveRecord::Base.connection.rollback_db_transaction
-        ActiveRecord::Base.connection_pool.release_connection
-      end
-      add_record('three')
-    end
-
-    after_count = Project.count
-    assert_equal 3, after_count - before_count
-  end
-
-  def test_connection_pool_callbacks
-    checked_out, checked_in = false, false
-    ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-      set_callback(:checkout, :after) { checked_out = true }
-      set_callback(:checkin, :before) { checked_in = true }
-    end
-    @per_test_teardown << proc do
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
-        reset_callbacks :checkout
-        reset_callbacks :checkin
-      end
-    end
-    checkout_checkin_connections 1, 1
-    assert checked_out
-    assert checked_in
-  end
 
   private
 
-- 
cgit v1.2.3


From 24fa524cefb64208c424bda9e2fd80a9e4199629 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 19 Nov 2011 20:28:41 -0800
Subject: adding visitors to the respective adapters

---
 .../lib/active_record/connection_adapters/abstract_mysql_adapter.rb      | 1 +
 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index f72d2974c8..18dc73337b 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -127,6 +127,7 @@ module ActiveRecord
         super(connection, logger)
         @connection_options, @config = connection_options, config
         @quoted_column_names, @quoted_table_names = {}, {}
+        @visitor = Arel::Visitors::MySQL.new self
       end
 
       def self.visitor_for(pool) # :nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index b7918c7f07..d98cf5051f 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -307,6 +307,7 @@ module ActiveRecord
       def initialize(connection, logger, connection_parameters, config)
         super(connection, logger)
         @connection_parameters, @config = connection_parameters, config
+        @visitor = Arel::Visitors::PostgreSQL.new self
 
         # @local_tz is initialized as nil to avoid warnings when connect tries to use it
         @local_tz = nil
-- 
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(-)

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 599d7c40a4380c702ae5612983237d084156b7d2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 19 Nov 2011 20:43:04 -0800
Subject: removing deprecated methods

---
 .../connection_adapters/abstract_adapter.rb            | 18 ------------------
 .../connection_adapters/abstract_mysql_adapter.rb      |  4 ----
 .../connection_adapters/postgresql_adapter.rb          |  4 ----
 3 files changed, 26 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index cbb7423480..75e568b557 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -65,24 +65,6 @@ module ActiveRecord
         @schema_cache = SchemaCache.new self
       end
 
-      # Returns a visitor instance for this adaptor, which conforms to the Arel::ToSql interface
-      def self.visitor_for(pool) # :nodoc:
-        adapter = pool.spec.config[:adapter]
-
-        if Arel::Visitors::VISITORS[adapter]
-          ActiveSupport::Deprecation.warn(
-            "Arel::Visitors::VISITORS is deprecated and will be removed. Database adapters " \
-            "should define a visitor_for method which returns the appropriate visitor for " \
-            "the database. For example, MysqlAdapter.visitor_for(pool) returns " \
-            "Arel::Visitors::MySQL.new(pool)."
-          )
-
-          Arel::Visitors::VISITORS[adapter].new(pool)
-        else
-          Arel::Visitors::ToSql.new(pool)
-        end
-      end
-
       # Returns the human-readable name of the adapter. Use mixed case - one
       # can always use downcase if needed.
       def adapter_name
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 18dc73337b..f143fd348e 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -130,10 +130,6 @@ module ActiveRecord
         @visitor = Arel::Visitors::MySQL.new self
       end
 
-      def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::MySQL.new(pool)
-      end
-
       def adapter_name #:nodoc:
         self.class::ADAPTER_NAME
       end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index d98cf5051f..2f01fbb829 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -324,10 +324,6 @@ module ActiveRecord
         @local_tz = execute('SHOW TIME ZONE', 'SCHEMA').first["TimeZone"]
       end
 
-      def self.visitor_for(pool) # :nodoc:
-        Arel::Visitors::PostgreSQL.new(pool)
-      end
-
       # Clears the prepared statements cache.
       def clear_cache!
         @statements.clear
-- 
cgit v1.2.3


From be9d3a20083a610c330eda0f32ce12360f392041 Mon Sep 17 00:00:00 2001
From: Arun Agrawal <arunagw@gmail.com>
Date: Sun, 20 Nov 2011 12:27:25 +0530
Subject: Bump Arel

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

diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index b4622005b4..52a3d4a501 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport', version)
   s.add_dependency('activemodel',   version)
-  s.add_dependency('arel',          '~> 2.2.1')
+  s.add_dependency('arel',          '~> 3.0.0.pre')
   s.add_dependency('tzinfo',        '~> 0.3.29')
 end
-- 
cgit v1.2.3


From 008abd17dcf7a5809650b7a65ad9206d13c95c82 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 20 Nov 2011 15:09:03 -0800
Subject: fixing tests on ruby 1.8

---
 activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 156a8b7b14..97b56d38d7 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -159,7 +159,9 @@ module ActiveRecord
         assert_equal str, binary.data
 
       ensure
-        DualEncoding.connection.drop_table('dual_encodings')
+        if "<3".respond_to?(:encode)
+          DualEncoding.connection.drop_table('dual_encodings')
+        end
       end
 
       def test_execute
-- 
cgit v1.2.3


From 5d704fa152c2f2846b66973cf5572e3120a72792 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 20 Nov 2011 15:11:11 -0800
Subject: oops! I suck! :bomb:

---
 .../lib/active_record/connection_adapters/abstract/connection_pool.rb    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index f1781f057c..e32154780a 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -176,7 +176,6 @@ module ActiveRecord
       deprecate :columns_hash
 
       def primary_keys
-        raise
         with_connection do |c|
           c.schema_cache.primary_keys
         end
-- 
cgit v1.2.3


From 4c872c017b47120b95eb2acf1d3401bd937b0647 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 22 Nov 2011 00:05:46 +0530
Subject: Remove the -h option to dbconsole which is the shorter form of
 --header

This is done since the -h option to dbconsole hides the conventional
-h for help and forces users to use --help to see the usage options for
dbconsole.
---
 railties/lib/rails/commands/dbconsole.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index b0ba76217a..4b0acc9d88 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -33,7 +33,7 @@ module Rails
             options['mode'] = mode
         end
 
-        opt.on("-h", "--header") do |h|
+        opt.on("--header") do |h|
           options['header'] = h
         end
 
-- 
cgit v1.2.3


From 60e3e218c2336a6359b36e17213f31cc35e65bbf Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 22:11:31 +0100
Subject: a couple of spurious spaces I saw in passing

---
 activesupport/lib/active_support/cache.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 6535cc1eb5..ba3064a24e 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -149,7 +149,7 @@ module ActiveSupport
 
       # Create a new cache. The options will be passed to any write method calls except
       # for :namespace which can be used to set the global namespace for the cache.
-      def initialize (options = nil)
+      def initialize(options = nil)
         @options = options ? options.dup : {}
       end
 
@@ -538,7 +538,7 @@ module ActiveSupport
         # Create an entry with internal attributes set. This method is intended to be
         # used by implementations that store cache entries in a native format instead
         # of as serialized Ruby objects.
-        def create (raw_value, created_at, options = {})
+        def create(raw_value, created_at, options = {})
           entry = new(nil)
           entry.instance_variable_set(:@value, raw_value)
           entry.instance_variable_set(:@created_at, created_at.to_f)
-- 
cgit v1.2.3


From 91678a5b29bca29aae4a987615f2503067032802 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 13:53:40 -0800
Subject: adds a comment to clarify an edge case

---
 activesupport/lib/active_support/cache.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index ba3064a24e..97583c9bd9 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -573,6 +573,9 @@ module ActiveSupport
 
       # Get the value stored in the cache.
       def value
+        # If the original value was exactly false @value is still true because
+        # it is marshalled and eventually compressed. Both operations yield
+        # strings.
         if @value
           Marshal.load(compressed? ? Zlib::Inflate.inflate(@value) : @value)
         end
-- 
cgit v1.2.3


From f3554777b2433d9de6b17c277fde071592d6a10d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:01:53 -0800
Subject: cache entry: options[:compressed] is a regular flag, no need for !!

---
 activesupport/lib/active_support/cache.rb | 2 +-
 activesupport/test/caching_test.rb        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 97583c9bd9..2bf24558a6 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -542,7 +542,7 @@ module ActiveSupport
           entry = new(nil)
           entry.instance_variable_set(:@value, raw_value)
           entry.instance_variable_set(:@created_at, created_at.to_f)
-          entry.instance_variable_set(:@compressed, !!options[:compressed])
+          entry.instance_variable_set(:@compressed, options[:compressed])
           entry.instance_variable_set(:@expires_in, options[:expires_in])
           entry
         end
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index cb5362525f..29bc4d8ec6 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -723,7 +723,7 @@ class CacheEntryTest < ActiveSupport::TestCase
     entry = ActiveSupport::Cache::Entry.create("raw", time, :compress => false, :expires_in => 300)
     assert_equal "raw", entry.raw_value
     assert_equal time.to_f, entry.created_at
-    assert_equal false, entry.compressed?
+    assert !entry.compressed?
     assert_equal 300, entry.expires_in
   end
 
@@ -740,7 +740,7 @@ class CacheEntryTest < ActiveSupport::TestCase
   def test_compress_values
     entry = ActiveSupport::Cache::Entry.new("value", :compress => true, :compress_threshold => 1)
     assert_equal "value", entry.value
-    assert_equal true, entry.compressed?
+    assert entry.compressed?
     assert_equal "value", Marshal.load(Zlib::Inflate.inflate(entry.raw_value))
   end
 
@@ -748,6 +748,6 @@ class CacheEntryTest < ActiveSupport::TestCase
     entry = ActiveSupport::Cache::Entry.new("value")
     assert_equal "value", entry.value
     assert_equal "value", Marshal.load(entry.raw_value)
-    assert_equal false, entry.compressed?
+    assert !entry.compressed?
   end
 end
-- 
cgit v1.2.3


From a539a5e3f3be68f027d3dfe43f88dc9f0642c743 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:11:19 -0800
Subject: tests predicates according to the boolean interpretation of their
 return value, not expecting specifically true or false

---
 activesupport/lib/active_support/cache.rb |  8 +--
 activesupport/test/caching_test.rb        | 98 +++++++++++++++----------------
 2 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2bf24558a6..2acc54bbfc 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -365,7 +365,7 @@ module ActiveSupport
         end
       end
 
-      # Deletes an entry in the cache. Returns +true+ if an entry is deleted.
+      # Deletes an entry in the cache. Returns true if an entry is deleted.
       #
       # Options are passed to the underlying cache implementation.
       def delete(name, options = nil)
@@ -382,11 +382,7 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:exist?, name) do |payload|
           entry = read_entry(namespaced_key(name, options), options)
-          if entry && !entry.expired?
-            true
-          else
-            false
-          end
+          entry && !entry.expired?
         end
       end
 
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 29bc4d8ec6..7d56b2a372 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -122,8 +122,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +131,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert_equal true, @cache.write('foo', 'bar')
+    assert @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,23 +174,23 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert_equal true, @cache.write('foo', {:a => "b"})
+    assert @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert_equal true, @cache.write('foo', 1)
+    assert @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert_equal true, @cache.write('foo', nil)
+    assert @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert_equal true, @cache.write('foo', false)
-    assert_equal false, @cache.read('foo')
+    assert @cache.write('foo', false)
+    assert !@cache.read('foo')
   end
 
   def test_read_multi
@@ -262,19 +262,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert_equal true, @cache.exist?('foo')
-    assert_equal false, @cache.exist?('bar')
+    assert @cache.exist?('foo')
+    assert !@cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert_equal true, @cache.exist?('foo')
+    assert @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert_equal true, @cache.delete('foo')
+    assert @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +346,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
+    assert @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert_equal true, @cache.delete(crazy_key)
+    assert @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert_equal true, @cache.write(key, "bar")
+    assert @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert_equal true, @cache.delete(key)
+    assert @cache.delete(key)
   end
 end
 
@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
     Encoding.list.each do |encoding|
       define_method "test_#{encoding.name.underscore}_encoded_values" do
         key = "foo".force_encoding(encoding)
-        assert_equal true, @cache.write(key, "1", :raw => true)
+        assert @cache.write(key, "1", :raw => true)
         assert_equal "1", @cache.read(key)
         assert_equal "1", @cache.fetch(key)
-        assert_equal true, @cache.delete(key)
+        assert @cache.delete(key)
         assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
         assert_equal 3, @cache.increment(key)
         assert_equal 2, @cache.decrement(key)
@@ -387,10 +387,10 @@ module EncodedKeyCacheBehavior
 
     def test_common_utf8_values
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert_equal true, @cache.delete(key)
+      assert @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
@@ -398,7 +398,7 @@ module EncodedKeyCacheBehavior
 
     def test_retains_encoding
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal Encoding::UTF_8, key.encoding
     end
   end
@@ -411,10 +411,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert_equal false, @cache.exist?("foo")
-    assert_equal true, @cache.exist?("fu")
-    assert_equal false, @cache.exist?("foo/bar")
-    assert_equal true, @cache.exist?("fu/baz")
+    assert !@cache.exist?("foo")
+    assert @cache.exist?("fu")
+    assert !@cache.exist?("foo/bar")
+    assert @cache.exist?("fu/baz")
   end
 end
 
@@ -443,7 +443,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert_equal true, retval
+    assert retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -595,11 +595,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +616,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert_equal true, @cache.exist?(11)
-    assert_equal true, @cache.exist?(10)
-    assert_equal true, @cache.exist?(9)
-    assert_equal true, @cache.exist?(8)
-    assert_equal true, @cache.exist?(7)
-    assert_equal false, @cache.exist?(6)
-    assert_equal false, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(11)
+    assert @cache.exist?(10)
+    assert @cache.exist?(9)
+    assert @cache.exist?(8)
+    assert @cache.exist?(7)
+    assert !@cache.exist?(6)
+    assert !@cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal true, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert @cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 end
 
-- 
cgit v1.2.3


From f312e2142b59b39637ab3d668876c3babac22087 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:14:11 -0800
Subject: Revert "tests predicates according to the boolean interpretation of
 their return value, not expecting specifically true or false"

Reason: there were some genuine tests for false when
reading values, going to revise those ones.

This reverts commit a539a5e3f3be68f027d3dfe43f88dc9f0642c743.
---
 activesupport/lib/active_support/cache.rb |  8 ++-
 activesupport/test/caching_test.rb        | 98 +++++++++++++++----------------
 2 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2acc54bbfc..2bf24558a6 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -365,7 +365,7 @@ module ActiveSupport
         end
       end
 
-      # Deletes an entry in the cache. Returns true if an entry is deleted.
+      # Deletes an entry in the cache. Returns +true+ if an entry is deleted.
       #
       # Options are passed to the underlying cache implementation.
       def delete(name, options = nil)
@@ -382,7 +382,11 @@ module ActiveSupport
         options = merged_options(options)
         instrument(:exist?, name) do |payload|
           entry = read_entry(namespaced_key(name, options), options)
-          entry && !entry.expired?
+          if entry && !entry.expired?
+            true
+          else
+            false
+          end
         end
       end
 
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 7d56b2a372..29bc4d8ec6 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -122,8 +122,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert !cache.exist?("foo")
-    assert cache.exist?("fu")
+    assert_equal false, cache.exist?("foo")
+    assert_equal true, cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +131,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert !cache.exist?("foo")
-    assert cache.exist?("fu")
+    assert_equal false, cache.exist?("foo")
+    assert_equal true, cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert @cache.write('foo', 'bar')
+    assert_equal true, @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,23 +174,23 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert @cache.write('foo', {:a => "b"})
+    assert_equal true, @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert @cache.write('foo', 1)
+    assert_equal true, @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert @cache.write('foo', nil)
+    assert_equal true, @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert @cache.write('foo', false)
-    assert !@cache.read('foo')
+    assert_equal true, @cache.write('foo', false)
+    assert_equal false, @cache.read('foo')
   end
 
   def test_read_multi
@@ -262,19 +262,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert @cache.exist?('foo')
-    assert !@cache.exist?('bar')
+    assert_equal true, @cache.exist?('foo')
+    assert_equal false, @cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert @cache.exist?('foo')
+    assert_equal true, @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert @cache.delete('foo')
+    assert_equal true, @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +346,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert @cache.write(crazy_key, "1", :raw => true)
+    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert @cache.delete(crazy_key)
+    assert_equal true, @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert @cache.write(key, "bar")
+    assert_equal true, @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert @cache.delete(key)
+    assert_equal true, @cache.delete(key)
   end
 end
 
@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
     Encoding.list.each do |encoding|
       define_method "test_#{encoding.name.underscore}_encoded_values" do
         key = "foo".force_encoding(encoding)
-        assert @cache.write(key, "1", :raw => true)
+        assert_equal true, @cache.write(key, "1", :raw => true)
         assert_equal "1", @cache.read(key)
         assert_equal "1", @cache.fetch(key)
-        assert @cache.delete(key)
+        assert_equal true, @cache.delete(key)
         assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
         assert_equal 3, @cache.increment(key)
         assert_equal 2, @cache.decrement(key)
@@ -387,10 +387,10 @@ module EncodedKeyCacheBehavior
 
     def test_common_utf8_values
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert @cache.write(key, "1", :raw => true)
+      assert_equal true, @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert @cache.delete(key)
+      assert_equal true, @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
@@ -398,7 +398,7 @@ module EncodedKeyCacheBehavior
 
     def test_retains_encoding
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert @cache.write(key, "1", :raw => true)
+      assert_equal true, @cache.write(key, "1", :raw => true)
       assert_equal Encoding::UTF_8, key.encoding
     end
   end
@@ -411,10 +411,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert !@cache.exist?("foo")
-    assert @cache.exist?("fu")
-    assert !@cache.exist?("foo/bar")
-    assert @cache.exist?("fu/baz")
+    assert_equal false, @cache.exist?("foo")
+    assert_equal true, @cache.exist?("fu")
+    assert_equal false, @cache.exist?("foo/bar")
+    assert_equal true, @cache.exist?("fu/baz")
   end
 end
 
@@ -443,7 +443,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert retval
+    assert_equal true, retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -595,11 +595,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert @cache.exist?(5)
-    assert @cache.exist?(4)
-    assert !@cache.exist?(3)
-    assert @cache.exist?(2)
-    assert !@cache.exist?(1)
+    assert_equal true, @cache.exist?(5)
+    assert_equal true, @cache.exist?(4)
+    assert_equal false, @cache.exist?(3)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +616,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert @cache.exist?(11)
-    assert @cache.exist?(10)
-    assert @cache.exist?(9)
-    assert @cache.exist?(8)
-    assert @cache.exist?(7)
-    assert !@cache.exist?(6)
-    assert !@cache.exist?(5)
-    assert @cache.exist?(4)
-    assert !@cache.exist?(3)
-    assert @cache.exist?(2)
-    assert !@cache.exist?(1)
+    assert_equal true, @cache.exist?(11)
+    assert_equal true, @cache.exist?(10)
+    assert_equal true, @cache.exist?(9)
+    assert_equal true, @cache.exist?(8)
+    assert_equal true, @cache.exist?(7)
+    assert_equal false, @cache.exist?(6)
+    assert_equal false, @cache.exist?(5)
+    assert_equal true, @cache.exist?(4)
+    assert_equal false, @cache.exist?(3)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert @cache.exist?(5)
-    assert @cache.exist?(4)
-    assert @cache.exist?(3)
-    assert @cache.exist?(2)
-    assert !@cache.exist?(1)
+    assert_equal true, @cache.exist?(5)
+    assert_equal true, @cache.exist?(4)
+    assert_equal true, @cache.exist?(3)
+    assert_equal true, @cache.exist?(2)
+    assert_equal false, @cache.exist?(1)
   end
 end
 
-- 
cgit v1.2.3


From 401393b6561adc1ce7101945163c9601257c057a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 21 Nov 2011 22:07:24 +0000
Subject: Deprecate InstanceMethods namespace handling in
 ActiveSupport::Concern.

This avoids the unnecessary "yo dawg, I heard you like include, so I put a module that includes your module when it is included" approach when building extensions.
---
 activesupport/lib/active_support/concern.rb | 15 +++++----------
 activesupport/test/concern_test.rb          |  7 ++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb
index 81fb859334..af3da937c7 100644
--- a/activesupport/lib/active_support/concern.rb
+++ b/activesupport/lib/active_support/concern.rb
@@ -4,17 +4,12 @@ module ActiveSupport
   #   module M
   #     def self.included(base)
   #       base.extend ClassMethods
-  #       base.send(:include, InstanceMethods)
   #       scope :disabled, where(:disabled => true)
   #     end
   #
   #     module ClassMethods
   #       ...
   #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
   #   end
   #
   # By using <tt>ActiveSupport::Concern</tt> the above module could instead be written as:
@@ -31,10 +26,6 @@ module ActiveSupport
   #     module ClassMethods
   #       ...
   #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
   #   end
   #
   # Moreover, it gracefully handles module dependencies. Given a +Foo+ module and a +Bar+
@@ -118,7 +109,11 @@ module ActiveSupport
         @_dependencies.each { |dep| base.send(:include, dep) }
         super
         base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-        base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
+        if const_defined?("InstanceMethods")
+          base.send :include, const_get("InstanceMethods")
+          ActiveSupport::Deprecation.warn "The InstanceMethods module inside ActiveSupport::Concern will be " \
+            "no longer included automatically. Please define instance methods directly in #{base} instead.", caller
+        end
         base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
       end
     end
diff --git a/activesupport/test/concern_test.rb b/activesupport/test/concern_test.rb
index 4cbe56a2d2..0b0920ee03 100644
--- a/activesupport/test/concern_test.rb
+++ b/activesupport/test/concern_test.rb
@@ -19,9 +19,6 @@ class ConcernTest < Test::Unit::TestCase
       end
     end
 
-    module InstanceMethods
-    end
-
     included do
       self.included_ran = true
     end
@@ -74,7 +71,7 @@ class ConcernTest < Test::Unit::TestCase
   def test_instance_methods_are_included
     @klass.send(:include, Baz)
     assert_equal "baz", @klass.new.baz
-    assert @klass.included_modules.include?(ConcernTest::Baz::InstanceMethods)
+    assert @klass.included_modules.include?(ConcernTest::Baz)
   end
 
   def test_included_block_is_ran
@@ -92,6 +89,6 @@ class ConcernTest < Test::Unit::TestCase
 
   def test_dependencies_with_multiple_modules
     @klass.send(:include, Foo)
-    assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz::InstanceMethods, ConcernTest::Baz], @klass.included_modules[0..3]
+    assert_equal [ConcernTest::Foo, ConcernTest::Bar, ConcernTest::Baz], @klass.included_modules[0..2]
   end
 end
-- 
cgit v1.2.3


From 8f57bf207ff4f28fa8da4544ebc573007b65439d Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 21 Nov 2011 14:22:02 -0800
Subject: tests predicates according to the boolean interpretation of their
 return value, not expecting specifically true or false

Respecting Genuine assert_equal false Edition
---
 activesupport/test/caching_test.rb | 96 +++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 29bc4d8ec6..b1b6de0613 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -122,8 +122,8 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/^fo/)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 
   def test_delete_matched_key
@@ -131,15 +131,15 @@ class CacheStoreNamespaceTest < ActiveSupport::TestCase
     cache.write("foo", "bar")
     cache.write("fu", "baz")
     cache.delete_matched(/OO/i)
-    assert_equal false, cache.exist?("foo")
-    assert_equal true, cache.exist?("fu")
+    assert !cache.exist?("foo")
+    assert cache.exist?("fu")
   end
 end
 
 # Tests the base functionality that should be identical across all cache stores.
 module CacheStoreBehavior
   def test_should_read_and_write_strings
-    assert_equal true, @cache.write('foo', 'bar')
+    assert @cache.write('foo', 'bar')
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -174,22 +174,22 @@ module CacheStoreBehavior
   end
 
   def test_should_read_and_write_hash
-    assert_equal true, @cache.write('foo', {:a => "b"})
+    assert @cache.write('foo', {:a => "b"})
     assert_equal({:a => "b"}, @cache.read('foo'))
   end
 
   def test_should_read_and_write_integer
-    assert_equal true, @cache.write('foo', 1)
+    assert @cache.write('foo', 1)
     assert_equal 1, @cache.read('foo')
   end
 
   def test_should_read_and_write_nil
-    assert_equal true, @cache.write('foo', nil)
+    assert @cache.write('foo', nil)
     assert_equal nil, @cache.read('foo')
   end
 
   def test_should_read_and_write_false
-    assert_equal true, @cache.write('foo', false)
+    assert @cache.write('foo', false)
     assert_equal false, @cache.read('foo')
   end
 
@@ -262,19 +262,19 @@ module CacheStoreBehavior
 
   def test_exist
     @cache.write('foo', 'bar')
-    assert_equal true, @cache.exist?('foo')
-    assert_equal false, @cache.exist?('bar')
+    assert @cache.exist?('foo')
+    assert !@cache.exist?('bar')
   end
 
   def test_nil_exist
     @cache.write('foo', nil)
-    assert_equal true, @cache.exist?('foo')
+    assert @cache.exist?('foo')
   end
 
   def test_delete
     @cache.write('foo', 'bar')
     assert @cache.exist?('foo')
-    assert_equal true, @cache.delete('foo')
+    assert @cache.delete('foo')
     assert !@cache.exist?('foo')
   end
 
@@ -346,10 +346,10 @@ module CacheStoreBehavior
 
   def test_crazy_key_characters
     crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
-    assert_equal true, @cache.write(crazy_key, "1", :raw => true)
+    assert @cache.write(crazy_key, "1", :raw => true)
     assert_equal "1", @cache.read(crazy_key)
     assert_equal "1", @cache.fetch(crazy_key)
-    assert_equal true, @cache.delete(crazy_key)
+    assert @cache.delete(crazy_key)
     assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
     assert_equal 3, @cache.increment(crazy_key)
     assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ module CacheStoreBehavior
   def test_really_long_keys
     key = ""
     900.times{key << "x"}
-    assert_equal true, @cache.write(key, "bar")
+    assert @cache.write(key, "bar")
     assert_equal "bar", @cache.read(key)
     assert_equal "bar", @cache.fetch(key)
     assert_nil @cache.read("#{key}x")
     assert_equal({key => "bar"}, @cache.read_multi(key))
-    assert_equal true, @cache.delete(key)
+    assert @cache.delete(key)
   end
 end
 
@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
     Encoding.list.each do |encoding|
       define_method "test_#{encoding.name.underscore}_encoded_values" do
         key = "foo".force_encoding(encoding)
-        assert_equal true, @cache.write(key, "1", :raw => true)
+        assert @cache.write(key, "1", :raw => true)
         assert_equal "1", @cache.read(key)
         assert_equal "1", @cache.fetch(key)
-        assert_equal true, @cache.delete(key)
+        assert @cache.delete(key)
         assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
         assert_equal 3, @cache.increment(key)
         assert_equal 2, @cache.decrement(key)
@@ -387,10 +387,10 @@ module EncodedKeyCacheBehavior
 
     def test_common_utf8_values
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal "1", @cache.read(key)
       assert_equal "1", @cache.fetch(key)
-      assert_equal true, @cache.delete(key)
+      assert @cache.delete(key)
       assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
       assert_equal 3, @cache.increment(key)
       assert_equal 2, @cache.decrement(key)
@@ -398,7 +398,7 @@ module EncodedKeyCacheBehavior
 
     def test_retains_encoding
       key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
-      assert_equal true, @cache.write(key, "1", :raw => true)
+      assert @cache.write(key, "1", :raw => true)
       assert_equal Encoding::UTF_8, key.encoding
     end
   end
@@ -411,10 +411,10 @@ module CacheDeleteMatchedBehavior
     @cache.write("foo/bar", "baz")
     @cache.write("fu/baz", "bar")
     @cache.delete_matched(/oo/)
-    assert_equal false, @cache.exist?("foo")
-    assert_equal true, @cache.exist?("fu")
-    assert_equal false, @cache.exist?("foo/bar")
-    assert_equal true, @cache.exist?("fu/baz")
+    assert !@cache.exist?("foo")
+    assert @cache.exist?("fu")
+    assert !@cache.exist?("foo/bar")
+    assert @cache.exist?("fu/baz")
   end
 end
 
@@ -443,7 +443,7 @@ module LocalCacheBehavior
     retval = @cache.with_local_cache do
       @cache.write('foo', 'bar')
     end
-    assert_equal true, retval
+    assert retval
     assert_equal 'bar', @cache.read('foo')
   end
 
@@ -595,11 +595,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4)
     @cache.prune(@record_size * 3)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_prune_size_on_write
@@ -616,17 +616,17 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.read(2) && sleep(0.001)
     @cache.read(4) && sleep(0.001)
     @cache.write(11, "llllllllll")
-    assert_equal true, @cache.exist?(11)
-    assert_equal true, @cache.exist?(10)
-    assert_equal true, @cache.exist?(9)
-    assert_equal true, @cache.exist?(8)
-    assert_equal true, @cache.exist?(7)
-    assert_equal false, @cache.exist?(6)
-    assert_equal false, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal false, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(11)
+    assert @cache.exist?(10)
+    assert @cache.exist?(9)
+    assert @cache.exist?(8)
+    assert @cache.exist?(7)
+    assert !@cache.exist?(6)
+    assert !@cache.exist?(5)
+    assert @cache.exist?(4)
+    assert !@cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 
   def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ class MemoryStoreTest < ActiveSupport::TestCase
     @cache.write(4, "dddddddddd") && sleep(0.001)
     @cache.write(5, "eeeeeeeeee") && sleep(0.001)
     @cache.prune(30, 0.001)
-    assert_equal true, @cache.exist?(5)
-    assert_equal true, @cache.exist?(4)
-    assert_equal true, @cache.exist?(3)
-    assert_equal true, @cache.exist?(2)
-    assert_equal false, @cache.exist?(1)
+    assert @cache.exist?(5)
+    assert @cache.exist?(4)
+    assert @cache.exist?(3)
+    assert @cache.exist?(2)
+    assert !@cache.exist?(1)
   end
 end
 
-- 
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 +++++++++++++---------
 railties/lib/rails/application.rb                  |  2 +-
 4 files changed, 39 insertions(+), 29 deletions(-)

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
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 82fffe86bb..817fa39cab 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -166,7 +166,7 @@ module Rails
         middleware.use ::Rack::MethodOverride
         middleware.use ::ActionDispatch::RequestId
         middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods
-        middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
+        middleware.use ::ActionDispatch::ShowExceptions
         middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
         if config.action_dispatch.x_sendfile_header.present?
           middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
-- 
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

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(-)

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 8cae31c800f281212c9c5b5ac0ea2be98c4aa611 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 22 Nov 2011 17:12:37 +0530
Subject: remove nodoc on OrderedHash

---
 activesupport/lib/active_support/ordered_hash.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 0264133581..b0d4f2bd86 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -20,7 +20,7 @@ module ActiveSupport
   #   oh.keys # => [:a, :b], this order is guaranteed
   #
   # <tt>ActiveSupport::OrderedHash</tt> is namespaced to prevent conflicts with other implementations.
-  class OrderedHash < ::Hash #:nodoc:
+  class OrderedHash < ::Hash
     def to_yaml_type
       "!tag:yaml.org,2002:omap"
     end
-- 
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(-)

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(-)

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 +++
 .../guides/code/getting_started/app/views/layouts/application.html.erb | 2 +-
 .../rails/app/templates/app/views/layouts/application.html.erb.tt      | 2 +-
 .../templates/app/views/layouts/%name%/application.html.erb.tt         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

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" # =>
diff --git a/railties/guides/code/getting_started/app/views/layouts/application.html.erb b/railties/guides/code/getting_started/app/views/layouts/application.html.erb
index 1e1e4b9a99..7fd6b4f516 100644
--- a/railties/guides/code/getting_started/app/views/layouts/application.html.erb
+++ b/railties/guides/code/getting_started/app/views/layouts/application.html.erb
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Blog</title>
-  <%= stylesheet_link_tag    "application" %>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index c63d1b6ac5..bba96a7431 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "application" %>
+  <%%= stylesheet_link_tag    "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>
   <%%= csrf_meta_tags %>
 </head>
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
index 01550dec2f..bd983fb90f 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/%name%/application.html.erb.tt
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><%= camelized %></title>
-  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= stylesheet_link_tag    "<%= name %>/application", :media => "all" %>
   <%%= javascript_include_tag "<%= name %>/application" %>
   <%%= csrf_meta_tags %>
 </head>
-- 
cgit v1.2.3


From a4912078c7d345a347f023ef28c0986458bdebf5 Mon Sep 17 00:00:00 2001
From: Marc-Andre Lafortune <github@marc-andre.ca>
Date: Tue, 22 Nov 2011 15:37:16 -0500
Subject: Fix inconsistencies with Time{WithZone}#{hash,eql?}

---
 .../lib/active_support/core_ext/time/calculations.rb          | 10 ++++++++++
 activesupport/lib/active_support/time_with_zone.rb            |  7 +++++--
 activesupport/test/core_ext/time_ext_test.rb                  |  6 ++++++
 activesupport/test/core_ext/time_with_zone_test.rb            | 11 +++++++++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 372dd69212..7a55086452 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -312,4 +312,14 @@ class Time
   end
   alias_method :compare_without_coercion, :<=>
   alias_method :<=>, :compare_with_coercion
+
+  # Layers additional behavior on Time#eql? so that ActiveSupport::TimeWithZone instances
+  # can be eql? to an equivalent Time
+  def eql_with_coercion(other)
+    # if other is an ActiveSupport::TimeWithZone, coerce a Time instance from it so we can do eql? comparison
+    other = other.comparable_time if other.respond_to?(:comparable_time)
+    eql_without_coercion(other)
+  end
+  alias_method :eql_without_coercion, :eql?
+  alias_method :eql?, :eql_with_coercion
 end
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 63279d0e6d..d3adf671a0 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -203,7 +203,11 @@ module ActiveSupport
     end
 
     def eql?(other)
-      utc == other
+      utc.eql?(other)
+    end
+
+    def hash
+      utc.hash
     end
 
     def +(other)
@@ -277,7 +281,6 @@ module ActiveSupport
     def to_i
       utc.to_i
     end
-    alias_method :hash, :to_i
     alias_method :tv_sec, :to_i
 
     # A TimeWithZone acts like a Time, so just return +self+.
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index ab9be4b18b..e7090eed08 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -744,6 +744,12 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal(-1, Time.utc(2000) <=> ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 0, 0, 1), ActiveSupport::TimeZone['UTC'] ))
   end
 
+  def test_eql?
+    assert_equal true, Time.utc(2000).eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone['UTC']) )
+    assert_equal true, Time.utc(2000).eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
+    assert_equal false,Time.utc(2000, 1, 1, 0, 0, 1).eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone['UTC']) )
+  end
+
   def test_minus_with_time_with_zone
     assert_equal  86_400.0, Time.utc(2000, 1, 2) - ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['UTC'] )
   end
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index b2309ae806..9d9e411c28 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -200,8 +200,15 @@ class TimeWithZoneTest < Test::Unit::TestCase
   end
 
   def test_eql?
-    assert @twz.eql?(Time.utc(2000))
-    assert @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
+    assert_equal true, @twz.eql?(Time.utc(2000))
+    assert_equal true, @twz.eql?( ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]) )
+    assert_equal false, @twz.eql?( Time.utc(2000, 1, 1, 0, 0, 1) )
+    assert_equal false, @twz.eql?( DateTime.civil(1999, 12, 31, 23, 59, 59) )
+  end
+
+  def test_hash
+    assert_equal Time.utc(2000).hash, @twz.hash
+    assert_equal Time.utc(2000).hash, ActiveSupport::TimeWithZone.new(Time.utc(2000), ActiveSupport::TimeZone["Hawaii"]).hash
   end
 
   def test_plus_with_integer
-- 
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(-)

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 d8e6dc9cf12096908a7a53dec07a397ba23b1088 Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Wed, 23 Nov 2011 18:06:15 +0100
Subject: Fix #3737 AS::expand_cache_key generates wrong key in certain
 situations

`cache_key` method is never called when the argument is a 1-element array
with something that responds to `cache_key`
---
 activesupport/lib/active_support/cache.rb | 14 ++++----------
 activesupport/test/caching_test.rb        | 12 ++++++++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 2bf24558a6..cfd1a6dbe3 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -81,16 +81,10 @@ module ActiveSupport
       end
 
       expanded_cache_key <<
-        if key.respond_to?(:cache_key)
-          key.cache_key
-        elsif key.is_a?(Array)
-          if key.size > 1
-            key.collect { |element| expand_cache_key(element) }.to_param
-          else
-            key.first.to_param
-          end
-        elsif key
-          key.to_param
+        case
+        when key.respond_to?(:cache_key) then key.cache_key
+        when key.is_a?(Array)            then key.map { |element| expand_cache_key(element) }.to_param
+        when key                         then key.to_param
         end.to_s
 
       expanded_cache_key
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index b1b6de0613..5c844b8122 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -12,10 +12,10 @@ class CacheKeyTest < ActiveSupport::TestCase
     begin
       ENV['RAILS_CACHE_ID'] = 'c99'
       assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
-      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
+      assert_equal 'c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
       assert_equal 'c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
       assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
-      assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
+      assert_equal 'nm/c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
       assert_equal 'nm/c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
     ensure
       ENV['RAILS_CACHE_ID'] = nil
@@ -50,6 +50,14 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
   end
 
+  def test_array_with_something_that_responds_to_cache_key
+    key = 'foo'
+    def key.cache_key
+      :foo_key
+    end
+    assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key([key])
+  end
+
 end
 
 class CacheStoreSettingTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From a650dd05f82028e8d1310f1b68b7bc430ea47dcf Mon Sep 17 00:00:00 2001
From: Olek Janiszewski <olek.janiszewski@gmail.com>
Date: Wed, 23 Nov 2011 18:11:36 +0100
Subject: Fix #3737 AS::expand_cache_key generates wrong key in certain
 situations (part 2)

`nil` and `false` both expand to `""` (empty string), while `true` expands to
`"true"`; `false` should expand to `"false"`
---
 activesupport/lib/active_support/cache.rb |  2 +-
 activesupport/test/caching_test.rb        | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index cfd1a6dbe3..12eeff4f4b 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -84,7 +84,7 @@ module ActiveSupport
         case
         when key.respond_to?(:cache_key) then key.cache_key
         when key.is_a?(Array)            then key.map { |element| expand_cache_key(element) }.to_param
-        when key                         then key.to_param
+        else                                  key.to_param
         end.to_s
 
       expanded_cache_key
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 5c844b8122..8871b1b0e9 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -42,7 +42,7 @@ class CacheKeyTest < ActiveSupport::TestCase
     end
   end
 
-  def test_respond_to_cache_key
+  def test_expand_cache_key_respond_to_cache_key
     key = 'foo'
     def key.cache_key
       :foo_key
@@ -50,7 +50,7 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key(key)
   end
 
-  def test_array_with_something_that_responds_to_cache_key
+  def test_expand_cache_key_array_with_something_that_responds_to_cache_key
     key = 'foo'
     def key.cache_key
       :foo_key
@@ -58,6 +58,17 @@ class CacheKeyTest < ActiveSupport::TestCase
     assert_equal 'foo_key', ActiveSupport::Cache.expand_cache_key([key])
   end
 
+  def test_expand_cache_key_of_nil
+    assert_equal '', ActiveSupport::Cache.expand_cache_key(nil)
+  end
+
+  def test_expand_cache_key_of_false
+    assert_equal 'false', ActiveSupport::Cache.expand_cache_key(false)
+  end
+
+  def test_expand_cache_key_of_true
+    assert_equal 'true', ActiveSupport::Cache.expand_cache_key(true)
+  end
 end
 
 class CacheStoreSettingTest < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 3ee0116c949dfc5760d60fe9c77168fb3868a4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 23 Nov 2011 18:22:09 +0000
Subject: Optimize cache expansion by skipping rails cache id in nested keys.

---
 activesupport/lib/active_support/cache.rb | 114 ++++++++++++++++--------------
 activesupport/test/caching_test.rb        |   8 +--
 2 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index 12eeff4f4b..07f5fcdeb3 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -25,69 +25,75 @@ module ActiveSupport
       autoload :LocalCache, 'active_support/cache/strategy/local_cache'
     end
 
-    # Creates a new CacheStore object according to the given options.
-    #
-    # If no arguments are passed to this method, then a new
-    # ActiveSupport::Cache::MemoryStore object will be returned.
-    #
-    # If you pass a Symbol as the first argument, then a corresponding cache
-    # store class under the ActiveSupport::Cache namespace will be created.
-    # For example:
-    #
-    #   ActiveSupport::Cache.lookup_store(:memory_store)
-    #   # => returns a new ActiveSupport::Cache::MemoryStore object
-    #
-    #   ActiveSupport::Cache.lookup_store(:mem_cache_store)
-    #   # => returns a new ActiveSupport::Cache::MemCacheStore object
-    #
-    # Any additional arguments will be passed to the corresponding cache store
-    # class's constructor:
-    #
-    #   ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
-    #   # => same as: ActiveSupport::Cache::FileStore.new("/tmp/cache")
-    #
-    # If the first argument is not a Symbol, then it will simply be returned:
-    #
-    #   ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new)
-    #   # => returns MyOwnCacheStore.new
-    def self.lookup_store(*store_option)
-      store, *parameters = *Array.wrap(store_option).flatten
-
-      case store
-      when Symbol
-        store_class_name = store.to_s.camelize
-        store_class =
-          begin
-            require "active_support/cache/#{store}"
-          rescue LoadError => e
-            raise "Could not find cache store adapter for #{store} (#{e})"
-          else
-            ActiveSupport::Cache.const_get(store_class_name)
-          end
-        store_class.new(*parameters)
-      when nil
-        ActiveSupport::Cache::MemoryStore.new
-      else
-        store
+    class << self
+      # Creates a new CacheStore object according to the given options.
+      #
+      # If no arguments are passed to this method, then a new
+      # ActiveSupport::Cache::MemoryStore object will be returned.
+      #
+      # If you pass a Symbol as the first argument, then a corresponding cache
+      # store class under the ActiveSupport::Cache namespace will be created.
+      # For example:
+      #
+      #   ActiveSupport::Cache.lookup_store(:memory_store)
+      #   # => returns a new ActiveSupport::Cache::MemoryStore object
+      #
+      #   ActiveSupport::Cache.lookup_store(:mem_cache_store)
+      #   # => returns a new ActiveSupport::Cache::MemCacheStore object
+      #
+      # Any additional arguments will be passed to the corresponding cache store
+      # class's constructor:
+      #
+      #   ActiveSupport::Cache.lookup_store(:file_store, "/tmp/cache")
+      #   # => same as: ActiveSupport::Cache::FileStore.new("/tmp/cache")
+      #
+      # If the first argument is not a Symbol, then it will simply be returned:
+      #
+      #   ActiveSupport::Cache.lookup_store(MyOwnCacheStore.new)
+      #   # => returns MyOwnCacheStore.new
+      def lookup_store(*store_option)
+        store, *parameters = *Array.wrap(store_option).flatten
+
+        case store
+        when Symbol
+          store_class_name = store.to_s.camelize
+          store_class =
+            begin
+              require "active_support/cache/#{store}"
+            rescue LoadError => e
+              raise "Could not find cache store adapter for #{store} (#{e})"
+            else
+              ActiveSupport::Cache.const_get(store_class_name)
+            end
+          store_class.new(*parameters)
+        when nil
+          ActiveSupport::Cache::MemoryStore.new
+        else
+          store
+        end
       end
-    end
 
-    def self.expand_cache_key(key, namespace = nil)
-      expanded_cache_key = namespace ? "#{namespace}/" : ""
+      def expand_cache_key(key, namespace = nil)
+        expanded_cache_key = namespace ? "#{namespace}/" : ""
+
+        prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
+        if prefix
+          expanded_cache_key << "#{prefix}/"
+        end
 
-      prefix = ENV["RAILS_CACHE_ID"] || ENV["RAILS_APP_VERSION"]
-      if prefix
-        expanded_cache_key << "#{prefix}/"
+        expanded_cache_key << retrieve_cache_key(key)
+        expanded_cache_key
       end
 
-      expanded_cache_key <<
+      private
+
+      def retrieve_cache_key(key)
         case
         when key.respond_to?(:cache_key) then key.cache_key
-        when key.is_a?(Array)            then key.map { |element| expand_cache_key(element) }.to_param
+        when key.is_a?(Array)            then key.map { |element| retrieve_cache_key(element) }.to_param
         else                                  key.to_param
         end.to_s
-
-      expanded_cache_key
+      end
     end
 
     # An abstract cache store class. There are multiple cache store
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 8871b1b0e9..5d7464c623 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -12,11 +12,11 @@ class CacheKeyTest < ActiveSupport::TestCase
     begin
       ENV['RAILS_CACHE_ID'] = 'c99'
       assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key(:foo)
-      assert_equal 'c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
-      assert_equal 'c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
+      assert_equal 'c99/foo', ActiveSupport::Cache.expand_cache_key([:foo])
+      assert_equal 'c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar])
       assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key(:foo, :nm)
-      assert_equal 'nm/c99/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
-      assert_equal 'nm/c99/c99/foo/c99/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
+      assert_equal 'nm/c99/foo', ActiveSupport::Cache.expand_cache_key([:foo], :nm)
+      assert_equal 'nm/c99/foo/bar', ActiveSupport::Cache.expand_cache_key([:foo, :bar], :nm)
     ensure
       ENV['RAILS_CACHE_ID'] = nil
     end
-- 
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.

---
 .../abstract_controller/railties/routes_helpers.rb |  4 +-
 actionpack/lib/action_controller/railties/paths.rb |  7 ++--
 .../test/activerecord/polymorphic_routes_test.rb   |  6 +--
 actionpack/test/lib/controller/fake_models.rb      |  4 +-
 actionpack/test/template/form_helper_test.rb       |  2 +-
 activemodel/lib/active_model/naming.rb             | 24 ++++++------
 activemodel/test/cases/naming_test.rb              | 38 +++++++++++++++++--
 activemodel/test/models/blog_post.rb               |  8 +---
 railties/lib/rails/application.rb                  |  4 ++
 railties/lib/rails/engine.rb                       | 43 +++++++++++++---------
 railties/lib/rails/railtie.rb                      |  2 +-
 railties/test/railties/engine_test.rb              |  6 +--
 12 files changed, 94 insertions(+), 54 deletions(-)

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')
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index f16459ede2..2566920d63 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -13,18 +13,18 @@ module ActiveModel
     def initialize(klass, namespace = nil, name = nil)
       name ||= klass.name
       super(name)
-      @unnamespaced = self.sub(/^#{namespace.name}::/, '') if namespace
 
-      @klass = klass
-      @singular = _singularize(self).freeze
-      @plural = ActiveSupport::Inflector.pluralize(@singular).freeze
-      @element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
-      @human = ActiveSupport::Inflector.humanize(@element).freeze
-      @collection = ActiveSupport::Inflector.tableize(self).freeze
+      @unnamespaced = self.sub(/^#{namespace.name}::/, '') if namespace
+      @klass        = klass
+      @singular     = _singularize(self).freeze
+      @plural       = ActiveSupport::Inflector.pluralize(@singular).freeze
+      @element      = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self)).freeze
+      @human        = ActiveSupport::Inflector.humanize(@element).freeze
+      @collection   = ActiveSupport::Inflector.tableize(self).freeze
       @partial_path = "#{@collection}/#{@element}".freeze
-      @param_key = (namespace ? _singularize(@unnamespaced) : @singular).freeze
-      @route_key = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
-      @i18n_key = self.underscore.to_sym
+      @param_key    = (namespace ? _singularize(@unnamespaced) : @singular).freeze
+      @route_key    = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
+      @i18n_key     = self.underscore.to_sym
     end
 
     # Transform the model name into a more humane format, using I18n. By default,
@@ -79,7 +79,9 @@ module ActiveModel
     # used to retrieve all kinds of naming-related information.
     def model_name
       @_model_name ||= begin
-        namespace = self.parents.detect { |n| n.respond_to?(:_railtie) }
+        namespace = self.parents.detect do |n|
+          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+        end
         ActiveModel::Name.new(self, namespace)
       end
     end
diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb
index 5f943729dd..a5ee2d6090 100644
--- a/activemodel/test/cases/naming_test.rb
+++ b/activemodel/test/cases/naming_test.rb
@@ -74,10 +74,6 @@ class NamingWithNamespacedModelInIsolatedNamespaceTest < ActiveModel::TestCase
   def test_param_key
     assert_equal 'post', @model_name.param_key
   end
-
-  def test_recognizing_namespace
-    assert_equal 'Post', Blog::Post.model_name.instance_variable_get("@unnamespaced")
-  end
 end
 
 class NamingWithNamespacedModelInSharedNamespaceTest < ActiveModel::TestCase
@@ -160,6 +156,40 @@ class NamingWithSuppliedModelNameTest < ActiveModel::TestCase
   end
 end
 
+class NamingUsingRelativeModelNameTest < ActiveModel::TestCase
+  def setup
+    @model_name = Blog::Post.model_name
+  end
+
+  def test_singular
+    assert_equal 'blog_post', @model_name.singular
+  end
+
+  def test_plural
+    assert_equal 'blog_posts', @model_name.plural
+  end
+
+  def test_element
+    assert_equal 'post', @model_name.element
+  end
+
+  def test_collection
+    assert_equal 'blog/posts', @model_name.collection
+  end
+
+  def test_human
+    assert_equal 'Post', @model_name.human
+  end
+
+  def test_route_key
+    assert_equal 'posts', @model_name.route_key
+  end
+
+  def test_param_key
+    assert_equal 'post', @model_name.param_key
+  end
+end
+
 class NamingHelpersTest < Test::Unit::TestCase
   def setup
     @klass  = Contact
diff --git a/activemodel/test/models/blog_post.rb b/activemodel/test/models/blog_post.rb
index d289177259..46eba857df 100644
--- a/activemodel/test/models/blog_post.rb
+++ b/activemodel/test/models/blog_post.rb
@@ -1,10 +1,6 @@
 module Blog
-  def self._railtie
-    Object.new
-  end
-
-  def self.table_name_prefix
-    "blog_"
+  def self.use_relative_model_naming?
+    true
   end
 
   class Post
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 817fa39cab..0b72a7ed84 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -141,6 +141,10 @@ module Rails
       self
     end
 
+    def helpers_paths
+      config.helpers_paths
+    end
+
   protected
 
     alias :build_middleware_stack :app
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index d652c6b7fe..335a0fb1b5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -371,20 +371,28 @@ module Rails
         self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
         self.isolated = true
 
-        unless mod.respond_to?(:_railtie)
-          name = engine_name
-          _railtie = self
+        unless mod.respond_to?(:railtie_namespace)
+          name, railtie = engine_name, self
+
           mod.singleton_class.instance_eval do
-            define_method(:_railtie) do
-              _railtie
-            end
+            define_method(:railtie_namespace) { railtie }
 
             unless mod.respond_to?(:table_name_prefix)
-              define_method(:table_name_prefix) do
-                "#{name}_"
-              end
+              define_method(:table_name_prefix) { "#{name}_" }
+            end
+
+            unless mod.respond_to?(:use_relative_model_naming?)
+              class_eval "def use_relative_model_naming?; true; end", __FILE__, __LINE__
+            end
+
+            unless mod.respond_to?(:railtie_helpers_paths)
+              define_method(:railtie_helpers_paths) { railtie.helpers_paths }
+            end
+
+            unless mod.respond_to?(:railtie_routes_url_helpers)
+              define_method(:railtie_routes_url_helpers) { railtie.routes_url_helpers }
             end
-         end
+          end
         end
       end
 
@@ -429,13 +437,6 @@ module Rails
     def helpers
       @helpers ||= begin
         helpers = Module.new
-
-        helpers_paths = if config.respond_to?(:helpers_paths)
-          config.helpers_paths
-        else
-          paths["app/helpers"].existent
-        end
-
         all = ActionController::Base.all_helpers_from_path(helpers_paths)
         ActionController::Base.modules_for_helpers(all).each do |mod|
           helpers.send(:include, mod)
@@ -444,6 +445,14 @@ module Rails
       end
     end
 
+    def helpers_paths
+      paths["app/helpers"].existent
+    end
+
+    def routes_url_helpers
+      routes.url_helpers
+    end
+
     def app
       @app ||= begin
         config.middleware = config.middleware.merge_into(default_middleware_stack)
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb
index e8fb1f3d98..f0991b99af 100644
--- a/railties/lib/rails/railtie.rb
+++ b/railties/lib/rails/railtie.rb
@@ -196,7 +196,7 @@ module Rails
     end
 
     def railtie_namespace
-      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:_railtie) }
+      @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:railtie_namespace) }
     end
   end
 end
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 22dbcf9644..e8081c977f 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -323,7 +323,7 @@ module RailtiesTest
 
       assert_equal "bukkits_", Bukkits.table_name_prefix
       assert_equal "bukkits", Bukkits::Engine.engine_name
-      assert_equal Bukkits._railtie, Bukkits::Engine
+      assert_equal Bukkits.railtie_namespace, Bukkits::Engine
       assert ::Bukkits::MyMailer.method_defined?(:foo_path)
       assert !::Bukkits::MyMailer.method_defined?(:bar_path)
 
@@ -467,7 +467,7 @@ module RailtiesTest
       assert_nil Rails.application.load_seed
     end
 
-    test "using namespace more than once on one module should not overwrite _railtie method" do
+    test "using namespace more than once on one module should not overwrite railtie_namespace method" do
       @plugin.write "lib/bukkits.rb", <<-RUBY
         module AppTemplate
           class Engine < ::Rails::Engine
@@ -484,7 +484,7 @@ module RailtiesTest
 
       boot_rails
 
-      assert_equal AppTemplate._railtie, AppTemplate::Engine
+      assert_equal AppTemplate.railtie_namespace, AppTemplate::Engine
     end
 
     test "properly reload routes" do
-- 
cgit v1.2.3