From 8fc54a2e814b5c85ccfd798285a366347fd6a4e9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 25 Feb 2011 14:17:57 -0800
Subject: only take the limit if there is a limit to take

---
 activerecord/lib/active_record/relation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 3c7533ea48..b828cffa77 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -190,7 +190,7 @@ module ActiveRecord
         end
 
         stmt = arel.compile_update(Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates)))
-        stmt.take limit
+        stmt.take limit if limit
         stmt.order(*order)
         stmt.key = table[primary_key]
         @klass.connection.update stmt.to_sql
-- 
cgit v1.2.3


From 54a2bf66019d2694ff53f666765faf5bca927c09 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 25 Feb 2011 15:38:59 -0800
Subject: removing limits and offsets from COUNT queries unless both are
 specified. [#6268 state:resolved]

---
 activerecord/CHANGELOG                             |  9 +++++++
 .../lib/active_record/relation/calculations.rb     | 14 ++++++++++-
 activerecord/lib/active_record/test_case.rb        |  1 +
 activerecord/test/cases/calculations_test.rb       | 28 ++++++++++++++++++++++
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 1f343f690c..92848c8a7d 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,14 @@
 *Rails 3.1.0 (unreleased)*
 
+* 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.
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index abc4c54109..c1842b1a96 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -204,7 +204,19 @@ module ActiveRecord
 
       relation.select_values = [select_value]
 
-      type_cast_calculated_value(@klass.connection.select_value(relation.to_sql), column_for(column_name), operation)
+      query_builder = relation.arel
+
+      if operation == "count"
+        limit  = relation.limit_value
+        offset = relation.offset_value
+
+        unless limit && offset
+          query_builder.limit  = nil
+          query_builder.offset = nil
+        end
+      end
+
+      type_cast_calculated_value(@klass.connection.select_value(query_builder.to_sql), column_for(column_name), operation)
     end
 
     def execute_grouped_calculation(operation, column_name, distinct) #:nodoc:
diff --git a/activerecord/lib/active_record/test_case.rb b/activerecord/lib/active_record/test_case.rb
index 4e711c4884..29efbbcb8c 100644
--- a/activerecord/lib/active_record/test_case.rb
+++ b/activerecord/lib/active_record/test_case.rb
@@ -26,6 +26,7 @@ module ActiveRecord
     def assert_sql(*patterns_to_match)
       $queries_executed = []
       yield
+      $queries_executed
     ensure
       failed_patterns = []
       patterns_to_match.each do |pattern|
diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 3121f1615d..991b1ab181 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -109,6 +109,34 @@ class CalculationsTest < ActiveRecord::TestCase
     assert_equal [2, 6], c.keys.compact
   end
 
+  def test_limit_with_offset_is_kept
+    queries = assert_sql { Account.limit(1).offset(1).count }
+    assert_equal 1, queries.length
+    assert_match(/LIMIT/, queries.first)
+    assert_match(/OFFSET/, queries.first)
+  end
+
+  def test_offset_without_limit_removes_offset
+    queries = assert_sql { Account.offset(1).count }
+    assert_equal 1, queries.length
+    assert_no_match(/LIMIT/, queries.first)
+    assert_no_match(/OFFSET/, queries.first)
+  end
+
+  def test_limit_without_offset_removes_limit
+    queries = assert_sql { Account.limit(1).count }
+    assert_equal 1, queries.length
+    assert_no_match(/LIMIT/, queries.first)
+    assert_no_match(/OFFSET/, queries.first)
+  end
+
+  def test_no_limit_no_offset
+    queries = assert_sql { Account.count }
+    assert_equal 1, queries.length
+    assert_no_match(/LIMIT/, queries.first)
+    assert_no_match(/OFFSET/, queries.first)
+  end
+
   def test_should_group_by_summed_field_having_condition
     c = Account.sum(:credit_limit, :group => :firm_id,
                                    :having => 'sum(credit_limit) > 50')
-- 
cgit v1.2.3


From f3e9cbc6955af8f430e75cf5d61e5940f7f46591 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sat, 26 Feb 2011 16:05:15 -0800
Subject: use an attribute rather than a SQL literal

---
 activerecord/lib/active_record/relation/query_methods.rb | 2 +-
 activerecord/test/cases/base_test.rb                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index f76681e880..4330d850fe 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -284,7 +284,7 @@ module ActiveRecord
         @implicit_readonly = false
         arel.project(*selects)
       else
-        arel.project(Arel.sql(@klass.quoted_table_name + '.*'))
+        arel.project(@klass.arel_table[Arel.star])
       end
     end
 
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 0ad20bb9bc..b62b5003e4 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -134,6 +134,7 @@ class BasicsTest < ActiveRecord::TestCase
     fakepool = Class.new(Struct.new(:spec)) {
       def with_connection; yield self; end
       def connection_pool; self; end
+      def table_exists?(name); false; end
       def quote_table_name(*args); raise "lol quote_table_name"; end
     }
 
-- 
cgit v1.2.3


From 86ad8a6c877636b4df7966233dff7fea377b0790 Mon Sep 17 00:00:00 2001
From: Jeff Kreeftmeijer <jeff@kreeftmeijer.nl>
Date: Mon, 14 Feb 2011 19:38:12 +0100
Subject: Make sure the Thor generator LoadError does not output --dev twice
 [#6431 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 railties/lib/rails/generators/base.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb
index 131eb6ff6f..dfecd2a6e4 100644
--- a/railties/lib/rails/generators/base.rb
+++ b/railties/lib/rails/generators/base.rb
@@ -3,7 +3,7 @@ begin
 rescue LoadError
   puts "Thor is not available.\nIf you ran this command from a git checkout " \
        "of Rails, please make sure thor is installed,\nand run this command " \
-       "as `ruby #{$0} #{ARGV.join(" ")} --dev`"
+       "as `ruby #{$0} #{(ARGV | ['--dev']).join(" ")}`"
   exit
 end
 
-- 
cgit v1.2.3


From acf0688fdd85a6d6ac278446e81f365239acc198 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 27 Feb 2011 21:14:11 -0200
Subject: failing test for i18n key collision with namespaced models

---
 activemodel/test/cases/translation_test.rb | 7 +++++++
 activemodel/test/models/person.rb          | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/activemodel/test/cases/translation_test.rb b/activemodel/test/cases/translation_test.rb
index c299d6eb5e..1b1d972d5c 100644
--- a/activemodel/test/cases/translation_test.rb
+++ b/activemodel/test/cases/translation_test.rb
@@ -49,6 +49,13 @@ class ActiveModelI18nTests < ActiveModel::TestCase
     assert_equal 'person name attribute', Child.human_attribute_name('name')
   end
 
+  def test_translated_model_attributes_with_attribute_matching_namespaced_model_name
+    I18n.backend.store_translations 'en', :activemodel => {:attributes => {:person => {:gender => 'person gender'}, :"person/gender" => {:attribute => 'person gender attribute'}}}
+
+    assert_equal 'person gender', Person.human_attribute_name('gender')
+    assert_equal 'person gender attribute', Person::Gender.human_attribute_name('attribute')
+  end
+
   def test_translated_model_names
     I18n.backend.store_translations 'en', :activemodel => {:models => {:person => 'person model'} }
     assert_equal 'person model', Person.model_name.human
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index eb84f7a27d..7b7e8feebc 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -9,6 +9,10 @@ class Person
   end
 end
 
+class Person::Gender
+  extend ActiveModel::Translation
+end
+
 class Child < Person
 end
 
-- 
cgit v1.2.3


From a00bed0c48f469d1cd2de364bfaddbc724046195 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 27 Feb 2011 21:23:59 -0200
Subject: Revert "Properly interpolate i18n keys in modules [#5572
 state:resolved]"

This breaks #6448, you should use :"module/class" as key for namespacing
[#6448 state:committed]

This reverts commit 8d30193b08bd2321a7a78a1f481bd5e4d4d45557.
---
 activemodel/lib/active_model/errors.rb                |  4 ++--
 activemodel/lib/active_model/naming.rb                | 15 +++++----------
 activemodel/lib/active_model/translation.rb           |  2 +-
 .../test/cases/validations/i18n_validation_test.rb    | 19 -------------------
 activemodel/test/models/person.rb                     |  5 -----
 5 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 5e3cf510b0..c2f0228785 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -295,8 +295,8 @@ module ActiveModel
       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}" ]
+        [ :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.underscore}.attributes.#{attribute}.#{type}",
+          :"#{@base.class.i18n_scope}.errors.models.#{klass.model_name.underscore}.#{type}" ]
       end
 
       defaults << options.delete(:message)
diff --git a/activemodel/lib/active_model/naming.rb b/activemodel/lib/active_model/naming.rb
index 3f430f94a6..eb9b847509 100644
--- a/activemodel/lib/active_model/naming.rb
+++ b/activemodel/lib/active_model/naming.rb
@@ -4,7 +4,7 @@ require 'active_support/core_ext/module/introspection'
 
 module ActiveModel
   class Name < String
-    attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key, :i18n_key
+    attr_reader :singular, :plural, :element, :collection, :partial_path, :route_key, :param_key
     alias_method :cache_key, :collection
 
     def initialize(klass, namespace = nil)
@@ -20,7 +20,6 @@ module ActiveModel
       @partial_path = "#{@collection}/#{@element}".freeze
       @param_key = (namespace ? _singularize(@unnamespaced) : @singular).freeze
       @route_key = (namespace ? ActiveSupport::Inflector.pluralize(@param_key) : @plural).freeze
-      @i18n_key = _singularize(self, '.').to_sym
     end
 
     # Transform the model name into a more humane format, using I18n. By default,
@@ -34,7 +33,7 @@ module ActiveModel
                            @klass.respond_to?(:i18n_scope)
 
       defaults = @klass.lookup_ancestors.map do |klass|
-        klass.model_name.i18n_key
+        klass.model_name.underscore.to_sym
       end
 
       defaults << options[:default] if options[:default]
@@ -45,10 +44,9 @@ module ActiveModel
     end
 
     private
-
-    def _singularize(string, replacement='_')
-      ActiveSupport::Inflector.underscore(string).tr('/', replacement)
-    end
+      def _singularize(str)
+        ActiveSupport::Inflector.underscore(str).tr('/', '_')
+      end
   end
 
   # == Active Model Naming
@@ -64,9 +62,6 @@ module ActiveModel
   #   BookCover.model_name        # => "BookCover"
   #   BookCover.model_name.human  # => "Book cover"
   #
-  #   BookCover.model_name.i18n_key              # => "book_cover"
-  #   BookModule::BookCover.model_name.i18n_key  # => "book_module.book_cover"
-  #
   # Providing the functionality that ActiveModel::Naming provides in your object
   # is required to pass the Active Model Lint test.  So either extending the provided
   # method below, or rolling your own is required.
diff --git a/activemodel/lib/active_model/translation.rb b/activemodel/lib/active_model/translation.rb
index 920a133159..dbb76244e4 100644
--- a/activemodel/lib/active_model/translation.rb
+++ b/activemodel/lib/active_model/translation.rb
@@ -44,7 +44,7 @@ module ActiveModel
     # Specify +options+ with additional translating options.
     def human_attribute_name(attribute, options = {})
       defaults = lookup_ancestors.map do |klass|
-        :"#{self.i18n_scope}.attributes.#{klass.model_name.i18n_key}.#{attribute}"
+        :"#{self.i18n_scope}.attributes.#{klass.model_name.underscore}.#{attribute}"
       end
 
       defaults << :"attributes.#{attribute}"
diff --git a/activemodel/test/cases/validations/i18n_validation_test.rb b/activemodel/test/cases/validations/i18n_validation_test.rb
index 5cb7bff4e7..e9f0e430fe 100644
--- a/activemodel/test/cases/validations/i18n_validation_test.rb
+++ b/activemodel/test/cases/validations/i18n_validation_test.rb
@@ -55,14 +55,6 @@ class I18nValidationTest < ActiveModel::TestCase
     assert_equal ["Person's name not found"], @person.errors.full_messages
   end
 
-  def test_errors_full_messages_translates_human_attribute_name_for_model_in_module_attributes
-    I18n.backend.store_translations('en', :activemodel => {:attributes => {:person_module => {:person => {:name => "Person in Module's name"}}}})
-    person = PersonModule::Person.new
-    person.errors.add(:name, 'not found')
-    PersonModule::Person.expects(:human_attribute_name).with(:name, :default => 'Name').returns("Person in Module's name")
-    assert_equal ["Person in Module's name not found"], person.errors.full_messages
-  end
-
   def test_errors_full_messages_uses_format
     I18n.backend.store_translations('en', :errors => {:format => "Field %{attribute} %{message}"})
     @person.errors.add('name', 'empty')
@@ -371,15 +363,4 @@ class I18nValidationTest < ActiveModel::TestCase
     assert_equal ["I am a custom error"], @person.errors[:title]
   end
 
-  def test_model_with_module_i18n_scope
-      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person_module => {:person => {:blank => 'generic blank'}}}}}
-      PersonModule::Person.validates_presence_of :title
-      person = PersonModule::Person.new
-      person.valid?
-      assert_equal ['generic blank'], person.errors[:title]
-
-      I18n.backend.store_translations 'en', :activemodel => {:errors => {:models => {:person_module => {:person => {:attributes => {:title => {:blank => 'title cannot be blank'}}}}}}}
-      person.valid?
-      assert_equal ['title cannot be blank'], person.errors[:title]
-  end
 end
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index 7b7e8feebc..e896e90f98 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -15,8 +15,3 @@ end
 
 class Child < Person
 end
-
-module PersonModule
-  class Person < ::Person
-  end
-end
-- 
cgit v1.2.3


From 801e314006ca755b94eccc6e7f80b1655168a250 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 28 Feb 2011 11:30:12 -0200
Subject: Add tests for register expansion methods with key = []

---
 actionpack/test/template/asset_tag_helper_test.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index a1a6b5f1d0..f3f628f31b 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -302,11 +302,16 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal  %(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>), javascript_include_tag(:can_merge)
   end
 
-  def test_custom_javascript_expansions_with_undefined_symbol
+  def test_custom_javascript_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => nil
     assert_raise(ArgumentError) { javascript_include_tag('first', :monkey, 'last') }
   end
 
+  def test_custom_javascript_expansions_with_empty_array_value
+    ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => []
+    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
+  end
+
   def test_custom_javascript_and_stylesheet_expansion_with_same_name
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :robbery => ["bank", "robber"]
@@ -379,11 +384,16 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal  %(<link href="/stylesheets/london.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('london', :cities)
   end
 
-  def test_custom_stylesheet_expansions_with_undefined_symbol
+  def test_custom_stylesheet_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => nil
     assert_raise(ArgumentError) { stylesheet_link_tag('first', :monkey, 'last') }
   end
 
+  def test_custom_stylesheet_expansions_with_empty_array_value
+    ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => []
+    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" type="text/css" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
+  end
+
   def test_registering_stylesheet_expansions_merges_with_existing_expansions
     ENV["RAILS_ASSET_ID"] = ""
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :can_merge => ['bank']
-- 
cgit v1.2.3


From 53b17e9ad08ada8709f6610d33d1bf624e5ef2d0 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 28 Feb 2011 11:52:00 -0200
Subject: javascript_include_tag shouldn't raise if you register an expansion
 key with nil value

---
 .../helpers/asset_tag_helpers/javascript_tag_helpers.rb      |  2 +-
 .../helpers/asset_tag_helpers/stylesheet_tag_helpers.rb      |  2 +-
 actionpack/test/template/asset_tag_helper_test.rb            | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 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 b9126af944..82bbfcc7d2 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
@@ -69,7 +69,7 @@ module ActionView
           def register_javascript_expansion(expansions)
             js_expansions = JavascriptIncludeTag.expansions
             expansions.each do |key, values|
-              js_expansions[key] = (js_expansions[key] || []) | Array(values) if values
+              js_expansions[key] = (js_expansions[key] || []) | Array(values)
             end
           end
         end
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 f3e041de95..a48c87b49a 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
@@ -46,7 +46,7 @@ module ActionView
           def register_stylesheet_expansion(expansions)
             style_expansions = StylesheetIncludeTag.expansions
             expansions.each do |key, values|
-              style_expansions[key] = (style_expansions[key] || []) | Array(values) if values
+              style_expansions[key] = (style_expansions[key] || []) | Array(values)
             end
           end
         end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index f3f628f31b..1bf748af14 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -302,9 +302,13 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal  %(<script src="/javascripts/bank.js" type="text/javascript"></script>\n<script src="/javascripts/robber.js" type="text/javascript"></script>), javascript_include_tag(:can_merge)
   end
 
+  def test_custom_javascript_expansions_with_undefined_symbol
+    assert_raise(ArgumentError) { javascript_include_tag('first', :unknown, 'last') }
+  end
+
   def test_custom_javascript_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_javascript_expansion :monkey => nil
-    assert_raise(ArgumentError) { javascript_include_tag('first', :monkey, 'last') }
+    assert_dom_equal  %(<script src="/javascripts/first.js" type="text/javascript"></script>\n<script src="/javascripts/last.js" type="text/javascript"></script>), javascript_include_tag('first', :monkey, 'last')
   end
 
   def test_custom_javascript_expansions_with_empty_array_value
@@ -384,9 +388,13 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_dom_equal  %(<link href="/stylesheets/london.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/wellington.css" media="screen" rel="stylesheet" type="text/css" />\n<link href="/stylesheets/amsterdam.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag('london', :cities)
   end
 
+  def test_custom_stylesheet_expansions_with_unknown_symbol
+    assert_raise(ArgumentError) { stylesheet_link_tag('first', :unknown, 'last') }
+  end
+
   def test_custom_stylesheet_expansions_with_nil_value
     ActionView::Helpers::AssetTagHelper::register_stylesheet_expansion :monkey => nil
-    assert_raise(ArgumentError) { stylesheet_link_tag('first', :monkey, 'last') }
+    assert_dom_equal  %(<link href="/stylesheets/first.css" rel="stylesheet" type="text/css" media="screen" />\n<link href="/stylesheets/last.css" rel="stylesheet" type="text/css" media="screen" />), stylesheet_link_tag('first', :monkey, 'last')
   end
 
   def test_custom_stylesheet_expansions_with_empty_array_value
-- 
cgit v1.2.3


From a0629927b2b615a747eb223eb82e84b208d49188 Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Sun, 27 Feb 2011 22:54:02 -0300
Subject: added activesupport/test/tmp to gitignore

[#6484 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 35402a22f7..8daa1e4dcd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ activerecord/doc
 actionpack/doc
 actionmailer/doc
 activesupport/doc
+activesupport/test/tmp
 activemodel/test/fixtures/fixture_database.sqlite3
 actionpack/test/tmp
 activesupport/test/fixtures/isolation_test
-- 
cgit v1.2.3


From f42562f97bb791a7662fce0106a93eec211b2803 Mon Sep 17 00:00:00 2001
From: "Oriol Gual and Josep M. Bach" <dev+oriol+txus@codegram.com>
Date: Mon, 28 Feb 2011 14:31:29 +0100
Subject: Make ActiveSupport::Configurable work with modules

[#6486 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 activesupport/lib/active_support/configurable.rb | 2 +-
 activesupport/test/configurable_test.rb          | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
index 644db0b205..be19189c04 100644
--- a/activesupport/lib/active_support/configurable.rb
+++ b/activesupport/lib/active_support/configurable.rb
@@ -26,7 +26,7 @@ module ActiveSupport
 
     module ClassMethods
       def config
-        @_config ||= if superclass.respond_to?(:config)
+        @_config ||= if respond_to?(:superclass) && superclass.respond_to?(:config)
           superclass.config.inheritable_copy
         else
           # create a new "anonymous" class that will host the compiled reader methods
diff --git a/activesupport/test/configurable_test.rb b/activesupport/test/configurable_test.rb
index 9c773c1944..2b28e61815 100644
--- a/activesupport/test/configurable_test.rb
+++ b/activesupport/test/configurable_test.rb
@@ -21,6 +21,12 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
     assert_equal({ :foo => :bar }, Parent.config)
   end
 
+  test "adds a configuration hash to a module as well" do
+    mixin = Module.new { include ActiveSupport::Configurable }
+    mixin.config.foo = :bar
+    assert_equal({ :foo => :bar }, mixin.config)
+  end
+
   test "configuration hash is inheritable" do
     assert_equal :bar, Child.config.foo
     assert_equal :bar, Parent.config.foo
@@ -57,4 +63,4 @@ class ConfigurableActiveSupport < ActiveSupport::TestCase
     assert_respond_to child.config, :bar
     assert_respond_to child.new.config, :bar
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From a8dae084c9c1250d7d4a5a70800114b57fbceff6 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 09:15:19 -0800
Subject: skip this on oracle

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

diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb
index 991b1ab181..caf07a7357 100644
--- a/activerecord/test/cases/calculations_test.rb
+++ b/activerecord/test/cases/calculations_test.rb
@@ -110,6 +110,8 @@ class CalculationsTest < ActiveRecord::TestCase
   end
 
   def test_limit_with_offset_is_kept
+    return if current_adapter?(:OracleAdapter)
+
     queries = assert_sql { Account.limit(1).offset(1).count }
     assert_equal 1, queries.length
     assert_match(/LIMIT/, queries.first)
-- 
cgit v1.2.3


From 726599df984daca45afe5b969c74b416fcd6c11a Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Mon, 28 Feb 2011 10:52:09 -0500
Subject: Remove redundant to_sym call.

[#6483 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 activesupport/lib/active_support/ordered_options.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb
index 124e1a74f8..b40cbceb7e 100644
--- a/activesupport/lib/active_support/ordered_options.rb
+++ b/activesupport/lib/active_support/ordered_options.rb
@@ -31,7 +31,7 @@ module ActiveSupport #:nodoc:
 
     def method_missing(name, *args)
       if name.to_s =~ /(.*)=$/
-        self[$1.to_sym] = args.first
+        self[$1] = args.first
       else
         self[name]
       end
-- 
cgit v1.2.3


From de9713186d693652deed22cff121b43317e86ef0 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 28 Feb 2011 19:57:22 +0100
Subject: revises a few details in public/index.html

---
 .../generators/rails/app/templates/public/index.html     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html
index 75d5edd06d..13a203dd08 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/index.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/index.html
@@ -52,7 +52,6 @@
         clear: both;
       }
 
-
       #header, #about, #getting-started {
         padding-left: 75px;
         padding-right: 30px;
@@ -168,6 +167,9 @@
         margin-bottom: 5px;
       }
 
+      .filename {
+        font-style: italic;
+      }
     </style>
     <script type="text/javascript">
       function about() {
@@ -190,10 +192,10 @@
           <li>
             <h3>Browse the documentation</h3>
             <ul class="links">
-              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
-              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
-              <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
               <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
+              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
+              <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
+              <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
             </ul>
           </li>
         </ul>
@@ -221,13 +223,13 @@
             </li>
 
             <li>
-              <h2>Set up a default route and remove or rename this file</h2>
-              <p>Routes are set up in config/routes.rb.</p>
+              <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
+              <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
             </li>
 
             <li>
               <h2>Create your database</h2>
-              <p>Run <code>rake db:migrate</code> to create your database. If you're not using SQLite (the default), edit <code>config/database.yml</code> with your username and password.</p>
+              <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
             </li>
           </ol>
         </div>
-- 
cgit v1.2.3


From 0f8d2794f229175447163d2b5e16d94d2cee5468 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Sun, 27 Feb 2011 20:24:39 +0100
Subject: updated Time, Date and DateTime current methods in AS to use
 Time.zone and not Time.zone_default.

[#6410 state:committed]
---
 actionpack/test/template/date_helper_test.rb       |  4 +--
 .../active_support/core_ext/date/calculations.rb   |  4 +--
 .../lib/active_support/core_ext/date/zones.rb      |  6 ++--
 .../core_ext/date_time/calculations.rb             |  3 +-
 .../active_support/core_ext/time/calculations.rb   |  4 +--
 activesupport/test/core_ext/date_ext_test.rb       | 32 +++++++++++-----------
 activesupport/test/core_ext/date_time_ext_test.rb  |  8 +++---
 activesupport/test/core_ext/duration_test.rb       | 10 +++----
 activesupport/test/core_ext/numeric_ext_test.rb    | 10 +++----
 activesupport/test/core_ext/time_with_zone_test.rb | 15 +++++-----
 10 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 3334f4ffb0..b4eb3f76e1 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1885,7 +1885,7 @@ class DateHelperTest < ActionView::TestCase
     time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
     time_zone = mock()
     time_zone.expects(:now).returns time
-    Time.zone_default = time_zone
+    Time.zone = time_zone
     @post = Post.new
 
     expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
@@ -1912,7 +1912,7 @@ class DateHelperTest < ActionView::TestCase
 
     assert_dom_equal expected, datetime_select("post", "updated_at")
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   def test_datetime_select_with_html_options_within_fields_for
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index f34185f22c..724e076407 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -36,9 +36,9 @@ class Date
       ::Date.current.tomorrow
     end
 
-    # Returns Time.zone.today when config.time_zone is set, otherwise just returns Date.today.
+    # Returns Time.zone.today when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise just returns Date.today.
     def current
-      ::Time.zone_default ? ::Time.zone.today : ::Date.today
+      ::Time.zone ? ::Time.zone.today : ::Date.today
     end
   end
 
diff --git a/activesupport/lib/active_support/core_ext/date/zones.rb b/activesupport/lib/active_support/core_ext/date/zones.rb
index 3a83af6be2..a70b47b7bc 100644
--- a/activesupport/lib/active_support/core_ext/date/zones.rb
+++ b/activesupport/lib/active_support/core_ext/date/zones.rb
@@ -2,10 +2,10 @@ require 'date'
 require 'active_support/core_ext/time/zones'
 
 class Date
-  # Converts Date to a TimeWithZone in the current zone if Time.zone_default is set,
-  # otherwise converts Date to a Time via Date#to_time
+  # Converts Date to a TimeWithZone in the current zone if Time.zone or Time.zone_default
+  # is set, otherwise converts Date to a Time via Date#to_time
   def to_time_in_current_zone
-    if ::Time.zone_default
+    if ::Time.zone
       ::Time.zone.local(year, month, day)
     else
       to_time
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
index 1dc3933e12..8d01376f1d 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -9,8 +9,9 @@ class DateTime
       ::Time.local(2007).utc_offset.to_r / 86400
     end
 
+    # Returns <tt>Time.zone.now.to_datetime</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise returns <tt>Time.now.to_datetime</tt>.
     def current
-      ::Time.zone_default ? ::Time.zone.now.to_datetime : ::Time.now.to_datetime
+      ::Time.zone ? ::Time.zone.now.to_datetime : ::Time.now.to_datetime
     end
   end
 
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index fa052fa86b..6e4b69f681 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -41,9 +41,9 @@ class Time
       time_with_datetime_fallback(:local, *args)
     end
 
-    # Returns <tt>Time.zone.now</tt> when <tt>config.time_zone</tt> is set, otherwise just returns <tt>Time.now</tt>.
+    # Returns <tt>Time.zone.now</tt> when <tt>Time.zone</tt> or <tt>config.time_zone</tt> are set, otherwise just returns <tt>Time.now</tt>.
     def current
-      ::Time.zone_default ? ::Time.zone.now : ::Time.now
+      ::Time.zone ? ::Time.zone.now : ::Time.now
     end
   end
 
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index b4d7633e5f..03b84ae2e5 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -259,7 +259,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Date.current - 1, Date.yesterday
   end
 
-  def test_yesterday_constructor_when_zone_default_is_not_set
+  def test_yesterday_constructor_when_zone_is_not_set
     with_env_tz 'UTC' do
       with_tz_default do
         Time.stubs(:now).returns Time.local(2000, 1, 1)
@@ -268,7 +268,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
-  def test_yesterday_constructor_when_zone_default_is_set
+  def test_yesterday_constructor_when_zone_is_set
     with_env_tz 'UTC' do
       with_tz_default ActiveSupport::TimeZone['Eastern Time (US & Canada)'] do # UTC -5
         Time.stubs(:now).returns Time.local(2000, 1, 1)
@@ -281,7 +281,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Date.current + 1, Date.tomorrow
   end
 
-  def test_tomorrow_constructor_when_zone_default_is_not_set
+  def test_tomorrow_constructor_when_zone_is_not_set
     with_env_tz 'UTC' do
       with_tz_default do
         Time.stubs(:now).returns Time.local(1999, 12, 31)
@@ -290,7 +290,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
-  def test_tomorrow_constructor_when_zone_default_is_set
+  def test_tomorrow_constructor_when_zone_is_set
     with_env_tz 'UTC' do
       with_tz_default ActiveSupport::TimeZone['Europe/Paris'] do # UTC +1
         Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
@@ -303,7 +303,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2005,2,21,0,0,45), Date.new(2005,2,21).since(45)
   end
 
-  def test_since_when_zone_default_is_set
+  def test_since_when_zone_is_set
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'UTC' do
       with_tz_default zone do
@@ -317,7 +317,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2005,2,20,23,59,15), Date.new(2005,2,21).ago(45)
   end
 
-  def test_ago_when_zone_default_is_set
+  def test_ago_when_zone_is_set
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'UTC' do
       with_tz_default zone do
@@ -331,7 +331,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2005,2,21,0,0,0), Date.new(2005,2,21).beginning_of_day
   end
 
-  def test_beginning_of_day_when_zone_default_is_set
+  def test_beginning_of_day_when_zone_is_set
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'UTC' do
       with_tz_default zone do
@@ -345,7 +345,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.local(2005,2,21,23,59,59,999999.999), Date.new(2005,2,21).end_of_day
   end
 
-  def test_end_of_day_when_zone_default_is_set
+  def test_end_of_day_when_zone_is_set
     zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'UTC' do
       with_tz_default zone do
@@ -367,7 +367,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
-  def test_xmlschema_when_zone_default_is_set
+  def test_xmlschema_when_zone_is_set
     with_env_tz 'UTC' do
       with_tz_default ActiveSupport::TimeZone['Eastern Time (US & Canada)'] do # UTC -5
         assert_match(/^1980-02-28T00:00:00-05:?00$/, Date.new(1980, 2, 28).xmlschema)
@@ -407,7 +407,7 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     assert_equal true, Date.new(2000,1,2).future?
   end
 
-  def test_current_returns_date_today_when_zone_default_not_set
+  def test_current_returns_date_today_when_zone_not_set
     with_env_tz 'US/Central' do
       Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
       assert_equal Date.new(1999, 12, 31), Date.today
@@ -415,15 +415,15 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
   end
 
-  def test_current_returns_time_zone_today_when_zone_default_set
-    Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+  def test_current_returns_time_zone_today_when_zone_is_set
+    Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'US/Central' do
       Time.stubs(:now).returns Time.local(1999, 12, 31, 23)
       assert_equal Date.new(1999, 12, 31), Date.today
       assert_equal Date.new(2000, 1, 1), Date.current
     end
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   def test_date_advance_should_not_change_passed_options_hash
@@ -441,11 +441,11 @@ class DateExtCalculationsTest < ActiveSupport::TestCase
     end
 
     def with_tz_default(tz = nil)
-      old_tz = Time.zone_default
-      Time.zone_default = tz
+      old_tz = Time.zone
+      Time.zone = tz
       yield
     ensure
-      Time.zone_default = old_tz
+      Time.zone = old_tz
     end
 end
 
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index 8edb95b63a..456736cbad 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -282,21 +282,21 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
     assert_equal true,  DateTime.civil(2005,2,10,20,30,46).future?
   end
 
-  def test_current_returns_date_today_when_zone_default_not_set
+  def test_current_returns_date_today_when_zone_is_not_set
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(1999, 12, 31, 23, 59, 59)
       assert_equal DateTime.new(1999, 12, 31, 23, 59, 59, Rational(-18000, 86400)), DateTime.current
     end
   end
 
-  def test_current_returns_time_zone_today_when_zone_default_set
-    Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+  def test_current_returns_time_zone_today_when_zone_is_set
+    Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(1999, 12, 31, 23, 59, 59)
       assert_equal DateTime.new(1999, 12, 31, 23, 59, 59, Rational(-18000, 86400)), DateTime.current
     end
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   def test_current_without_time_zone
diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb
index 6a01eeed6b..c0b529d9f8 100644
--- a/activesupport/test/core_ext/duration_test.rb
+++ b/activesupport/test/core_ext/duration_test.rb
@@ -89,8 +89,8 @@ class DurationTest < ActiveSupport::TestCase
     assert_in_delta((7 * 24 * 1.7).hours.ago(t), 1.7.weeks.ago(t), 1)
   end
 
-  def test_since_and_ago_anchored_to_time_now_when_time_zone_default_not_set
-    Time.zone_default = nil
+  def test_since_and_ago_anchored_to_time_now_when_time_zone_is_not_set
+    Time.zone = nil
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
       # since
@@ -102,8 +102,8 @@ class DurationTest < ActiveSupport::TestCase
     end
   end
 
-  def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_default_set
-    Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+  def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_is_set
+    Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
       # since
@@ -116,7 +116,7 @@ class DurationTest < ActiveSupport::TestCase
       assert_equal 'Eastern Time (US & Canada)', 5.seconds.ago.time_zone.name
     end
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   def test_adding_hours_across_dst_boundary
diff --git a/activesupport/test/core_ext/numeric_ext_test.rb b/activesupport/test/core_ext/numeric_ext_test.rb
index 6ef4e37b26..3a2452b4b0 100644
--- a/activesupport/test/core_ext/numeric_ext_test.rb
+++ b/activesupport/test/core_ext/numeric_ext_test.rb
@@ -89,8 +89,8 @@ class NumericExtTimeAndDateTimeTest < Test::Unit::TestCase
     assert_equal DateTime.civil(2005,2,28,15,15,10), DateTime.civil(2004,2,29,15,15,10) + 1.year
   end
 
-  def test_since_and_ago_anchored_to_time_now_when_time_zone_default_not_set
-    Time.zone_default = nil
+  def test_since_and_ago_anchored_to_time_now_when_time_zone_is_not_set
+    Time.zone = nil
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
       # since
@@ -102,8 +102,8 @@ class NumericExtTimeAndDateTimeTest < Test::Unit::TestCase
     end
   end
 
-  def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_default_set
-    Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+  def test_since_and_ago_anchored_to_time_zone_now_when_time_zone_is_set
+    Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
       # since
@@ -116,7 +116,7 @@ class NumericExtTimeAndDateTimeTest < Test::Unit::TestCase
       assert_equal 'Eastern Time (US & Canada)', 5.ago.time_zone.name
     end
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   protected
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 5c226c2d09..bafa335a09 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -768,10 +768,10 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
   end
 
   def test_localtime
-    Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+    Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     assert_equal @dt.in_time_zone.localtime, @dt.in_time_zone.utc.to_time.getlocal
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   def test_use_zone
@@ -801,7 +801,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
     assert_equal nil, Time.zone
   end
 
-  def test_time_zone_getter_and_setter_with_zone_default
+  def test_time_zone_getter_and_setter_with_zone_default_set
     Time.zone_default = ActiveSupport::TimeZone['Alaska']
     assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
     Time.zone = ActiveSupport::TimeZone['Hawaii']
@@ -809,6 +809,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
     Time.zone = nil
     assert_equal ActiveSupport::TimeZone['Alaska'], Time.zone
   ensure
+    Time.zone = nil
     Time.zone_default = nil
   end
 
@@ -849,7 +850,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
     assert_nil Time.zone
   end
 
-  def test_current_returns_time_now_when_zone_default_not_set
+  def test_current_returns_time_now_when_zone_not_set
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
       assert_equal false, Time.current.is_a?(ActiveSupport::TimeWithZone)
@@ -857,8 +858,8 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
     end
   end
 
-  def test_current_returns_time_zone_now_when_zone_default_set
-    Time.zone_default = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
+  def test_current_returns_time_zone_now_when_zone_set
+    Time.zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)']
     with_env_tz 'US/Eastern' do
       Time.stubs(:now).returns Time.local(2000)
       assert_equal true, Time.current.is_a?(ActiveSupport::TimeWithZone)
@@ -866,7 +867,7 @@ class TimeWithZoneMethodsForTimeAndDateTimeTest < Test::Unit::TestCase
       assert_equal Time.utc(2000), Time.current.time
     end
   ensure
-    Time.zone_default = nil
+    Time.zone = nil
   end
 
   protected
-- 
cgit v1.2.3


From 7112cf5e021d8da7c4e073a4e2d2a4afb10671ec Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Sun, 27 Feb 2011 22:58:07 +0100
Subject: Updated the AS guides with some information on the difference between
 Date.today and Date.current.

---
 railties/guides/source/active_support_core_extensions.textile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 788c243d2a..e0b1bf6e83 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -2791,6 +2791,8 @@ h5. +Date.current+
 
 Active Support defines +Date.current+ to be today in the current time zone. That's like +Date.today+, except that it honors the user time zone, if defined. It also defines +Date.yesterday+ and +Date.tomorrow+, and the instance predicates +past?+, +today?+, and +future?+, all of them relative to +Date.current+.
 
+When making Date comparisons using methods which honor the user time zone, make sure to use +Date.current+ and not +Date.today+. There are cases where the user time zone might be in the future compared to the system time zone, which +Date.today+ uses by default. This means +Date.today+ may equal +Date.yesterday+.
+
 h5. Named dates
 
 h6. +prev_year+, +next_year+
@@ -3105,7 +3107,7 @@ h5. Named Datetimes
 
 h6. +DateTime.current+
 
-Active Support defines +DateTime.current+ to be like +Time.now.to_datetime+, except that it honors the user time zone, if defined. It also defines instance predicates +past?+, and +future?+ relative to +DateTime.current+.
+Active Support defines +DateTime.current+ to be like +Time.now.to_datetime+, except that it honors the user time zone, if defined. It also defines +DateTime.yesterday+ and +DateTime.tomorrow+, and the instance predicates +past?+, and +future?+ relative to +DateTime.current+.
 
 h5. Other Extensions
 
@@ -3282,6 +3284,12 @@ t.advance(:seconds => 1)
 
 * If +since+ or +ago+ jump to a time that can't be expressed with +Time+ a +DateTime+ object is returned instead.
 
+h5. +Time.current+
+
+Active Support defines +Time.current+ to be today in the current time zone. That's like +Time.now+, except that it honors the user time zone, if defined. It also defines +Time.yesterday+ and +Time.tomorrow+, and the instance predicates +past?+, +today?+, and +future?+, all of them relative to +Time.current+.
+
+When making Time comparisons using methods which honor the user time zone, make sure to use +Time.current+ and not +Time.now+. There are cases where the user time zone might be in the future compared to the system time zone, which +Time.today+ uses by default. This means +Time.now+ may equal +Time.yesterday+.
+
 h4. Time Constructors
 
 Active Support defines +Time.current+ to be +Time.zone.now+ if there's a user time zone defined, with fallback to +Time.now+:
-- 
cgit v1.2.3


From d90b4e2615e8048fdeffc6dffe3246704adee01f Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Wed, 23 Feb 2011 00:17:01 +0000
Subject: Rewrote AssociationPreload.

---
 activerecord/lib/active_record.rb                  |   1 -
 .../lib/active_record/association_preload.rb       | 433 ---------------------
 activerecord/lib/active_record/associations.rb     |   2 +
 .../lib/active_record/associations/preloader.rb    | 177 +++++++++
 .../associations/preloader/association.rb          | 126 ++++++
 .../associations/preloader/belongs_to.rb           |  17 +
 .../preloader/collection_association.rb            |  24 ++
 .../preloader/has_and_belongs_to_many.rb           |  58 +++
 .../associations/preloader/has_many.rb             |  17 +
 .../associations/preloader/has_many_through.rb     |  15 +
 .../associations/preloader/has_one.rb              |  23 ++
 .../associations/preloader/has_one_through.rb      |   9 +
 .../associations/preloader/singular_association.rb |  21 +
 .../associations/preloader/through_association.rb  |  66 ++++
 activerecord/lib/active_record/base.rb             |   2 +-
 activerecord/lib/active_record/reflection.rb       |  10 +-
 activerecord/lib/active_record/relation.rb         |   4 +-
 activerecord/test/cases/associations/eager_test.rb |  29 +-
 .../test/cases/associations/join_model_test.rb     |   2 +-
 activerecord/test/cases/inheritance_test.rb        |   2 +-
 activerecord/test/models/category.rb               |   3 +-
 21 files changed, 583 insertions(+), 458 deletions(-)
 delete mode 100644 activerecord/lib/active_record/association_preload.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/association.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/belongs_to.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/collection_association.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/has_many.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/has_many_through.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/has_one.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/has_one_through.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/singular_association.rb
 create mode 100644 activerecord/lib/active_record/associations/preloader/through_association.rb

diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 0777f85869..59cf42a377 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -43,7 +43,6 @@ module ActiveRecord
     autoload :ConnectionNotEstablished, 'active_record/errors'
 
     autoload :Aggregations
-    autoload :AssociationPreload
     autoload :Associations
     autoload :AttributeMethods
     autoload :AutosaveAssociation
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb
deleted file mode 100644
index a34a73cf5d..0000000000
--- a/activerecord/lib/active_record/association_preload.rb
+++ /dev/null
@@ -1,433 +0,0 @@
-require 'active_support/core_ext/array/wrap'
-require 'active_support/core_ext/enumerable'
-
-module ActiveRecord
-  # See ActiveRecord::AssociationPreload::ClassMethods for documentation.
-  module AssociationPreload #:nodoc:
-    extend ActiveSupport::Concern
-
-    # Implements the details of eager loading of Active Record associations.
-    # Application developers should not use this module directly.
-    #
-    # <tt>ActiveRecord::Base</tt> is extended with this module. The source code in
-    # <tt>ActiveRecord::Base</tt> references methods defined in this module.
-    #
-    # Note that 'eager loading' and 'preloading' are actually the same thing.
-    # However, there are two different eager loading strategies.
-    #
-    # The first one is by using table joins. This was only strategy available
-    # prior to Rails 2.1. Suppose that you have an Author model with columns
-    # 'name' and 'age', and a Book model with columns 'name' and 'sales'. Using
-    # this strategy, Active Record would try to retrieve all data for an author
-    # and all of its books via a single query:
-    #
-    #   SELECT * FROM authors
-    #   LEFT OUTER JOIN books ON authors.id = books.id
-    #   WHERE authors.name = 'Ken Akamatsu'
-    #
-    # However, this could result in many rows that contain redundant data. After
-    # having received the first row, we already have enough data to instantiate
-    # the Author object. In all subsequent rows, only the data for the joined
-    # 'books' table is useful; the joined 'authors' data is just redundant, and
-    # processing this redundant data takes memory and CPU time. The problem
-    # quickly becomes worse and worse as the level of eager loading increases
-    # (i.e. if Active Record is to eager load the associations' associations as
-    # well).
-    #
-    # The second strategy is to use multiple database queries, one for each
-    # level of association. Since Rails 2.1, this is the default strategy. In
-    # situations where a table join is necessary (e.g. when the +:conditions+
-    # option references an association's column), it will fallback to the table
-    # join strategy.
-    #
-    # See also ActiveRecord::Associations::ClassMethods, which explains eager
-    # loading in a more high-level (application developer-friendly) manner.
-    module ClassMethods
-      protected
-
-      # Eager loads the named associations for the given Active Record record(s).
-      #
-      # In this description, 'association name' shall refer to the name passed
-      # to an association creation method. For example, a model that specifies
-      # <tt>belongs_to :author</tt>, <tt>has_many :buyers</tt> has association
-      # names +:author+ and +:buyers+.
-      #
-      # == Parameters
-      # +records+ is an array of ActiveRecord::Base. This array needs not be flat,
-      # i.e. +records+ itself may also contain arrays of records. In any case,
-      # +preload_associations+ will preload the all associations records by
-      # flattening +records+.
-      #
-      # +associations+ specifies one or more associations that you want to
-      # preload. It may be:
-      # - a Symbol or a String which specifies a single association name. For
-      #   example, specifying +:books+ allows this method to preload all books
-      #   for an Author.
-      # - an Array which specifies multiple association names. This array
-      #   is processed recursively. For example, specifying <tt>[:avatar, :books]</tt>
-      #   allows this method to preload an author's avatar as well as all of his
-      #   books.
-      # - a Hash which specifies multiple association names, as well as
-      #   association names for the to-be-preloaded association objects. For
-      #   example, specifying <tt>{ :author => :avatar }</tt> will preload a
-      #   book's author, as well as that author's avatar.
-      #
-      # +:associations+ has the same format as the +:include+ option for
-      # <tt>ActiveRecord::Base.find</tt>. So +associations+ could look like this:
-      #
-      #   :books
-      #   [ :books, :author ]
-      #   { :author => :avatar }
-      #   [ :books, { :author => :avatar } ]
-      #
-      # +preload_options+ contains options that will be passed to ActiveRecord::Base#find
-      # (which is called under the hood for preloading records). But it is passed
-      # only one level deep in the +associations+ argument, i.e. it's not passed
-      # to the child associations when +associations+ is a Hash.
-      def preload_associations(records, associations, preload_options={})
-        records = Array.wrap(records).compact.uniq
-        return if records.empty?
-        case associations
-        when Array then associations.each {|association| preload_associations(records, association, preload_options)}
-        when Symbol, String then preload_one_association(records, associations.to_sym, preload_options)
-        when Hash then
-          associations.each do |parent, child|
-            raise "parent must be an association name" unless parent.is_a?(String) || parent.is_a?(Symbol)
-            preload_associations(records, parent, preload_options)
-            reflection = reflections[parent]
-            parents = records.sum { |record| Array.wrap(record.send(reflection.name)) }
-            unless parents.empty?
-              parents.first.class.preload_associations(parents, child)
-            end
-          end
-        end
-      end
-
-      private
-
-      # Preloads a specific named association for the given records. This is
-      # called by +preload_associations+ as its base case.
-      def preload_one_association(records, association, preload_options={})
-        class_to_reflection = {}
-        # Not all records have the same class, so group then preload
-        # group on the reflection itself so that if various subclass share the same association then
-        # we do not split them unnecessarily
-        records.group_by { |record| class_to_reflection[record.class] ||= record.class.reflections[association]}.each do |reflection, _records|
-          raise ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?" unless reflection
-
-          # 'reflection.macro' can return 'belongs_to', 'has_many', etc. Thus,
-          # the following could call 'preload_belongs_to_association',
-          # 'preload_has_many_association', etc.
-          send("preload_#{reflection.macro}_association", _records, reflection, preload_options)
-        end
-      end
-
-      def add_preloaded_records_to_collection(parent_records, reflection_name, associated_record)
-        parent_records.each do |parent_record|
-          association = parent_record.association(reflection_name)
-          association.loaded!
-          association.target.concat(Array.wrap(associated_record))
-          association.set_inverse_instance(associated_record)
-        end
-      end
-
-      def add_preloaded_record_to_collection(parent_records, reflection_name, associated_record)
-        parent_records.each do |parent_record|
-          parent_record.association(reflection_name).target = associated_record
-        end
-      end
-
-      def set_association_collection_records(id_to_parent_map, reflection_name, associated_records, key)
-        associated_records.each do |associated_record|
-          parent_records = id_to_parent_map[associated_record[key].to_s]
-          add_preloaded_records_to_collection(parent_records, reflection_name, associated_record)
-        end
-      end
-
-      def set_association_single_records(id_to_record_map, reflection_name, associated_records, key)
-        seen_keys = {}
-        associated_records.each do |associated_record|
-          seen_key = associated_record[key].to_s
-
-          #this is a has_one or belongs_to: there should only be one record.
-          #Unfortunately we can't (in portable way) ask the database for
-          #'all records where foo_id in (x,y,z), but please
-          # only one row per distinct foo_id' so this where we enforce that
-          next if seen_keys.key? seen_key
-
-          seen_keys[seen_key] = true
-          mapped_records = id_to_record_map[seen_key]
-          mapped_records.each do |mapped_record|
-            association_proxy = mapped_record.association(reflection_name)
-            association_proxy.target = associated_record
-            association_proxy.send(:set_inverse_instance, associated_record)
-          end
-        end
-
-        id_to_record_map.each do |id, records|
-          next if seen_keys.include?(id)
-          add_preloaded_record_to_collection(records, reflection_name, nil)
-        end
-      end
-
-      # Given a collection of Active Record objects, constructs a Hash which maps
-      # the objects' IDs to the relevant objects. Returns a 2-tuple
-      # <tt>(id_to_record_map, ids)</tt> where +id_to_record_map+ is the Hash,
-      # and +ids+ is an Array of record IDs.
-      def construct_id_map(records, primary_key=nil)
-        records.group_by do |record|
-          primary_key ||= record.class.primary_key
-          record[primary_key].to_s
-        end
-      end
-
-      def preload_has_and_belongs_to_many_association(records, reflection, preload_options={})
-
-        left = reflection.klass.arel_table
-
-        id_to_record_map = construct_id_map(records)
-
-        records.each { |record| record.association(reflection.name).loaded! }
-        options = reflection.options
-
-        right = Arel::Table.new(options[:join_table]).alias('t0')
-
-        join_condition = left[reflection.klass.primary_key].eq(
-          right[reflection.association_foreign_key])
-
-        join = left.create_join(right, left.create_on(join_condition))
-        select = [
-          # FIXME: options[:select] is always nil in the tests.  Do we really
-          # need it?
-          options[:select] || left[Arel.star],
-          right[reflection.foreign_key].as(
-            Arel.sql('the_parent_record_id'))
-        ]
-
-        associated_records_proxy = reflection.klass.unscoped.
-            includes(options[:include]).
-            order(options[:order])
-
-        associated_records_proxy.joins_values = [join]
-        associated_records_proxy.select_values = select
-
-        custom_conditions = append_conditions(reflection, preload_options)
-
-        klass = associated_records_proxy.klass
-
-        associated_records(id_to_record_map.keys) { |some_ids|
-          method     = in_or_equal(some_ids)
-          conditions = right.create_and(
-            [right[reflection.foreign_key].send(*method)] +
-            custom_conditions)
-
-          relation = associated_records_proxy.where(conditions)
-          klass.connection.select_all(relation.arel.to_sql, 'SQL', relation.bind_values)
-        }.map! { |row|
-          parent_records = id_to_record_map[row['the_parent_record_id'].to_s]
-          associated_record = klass.instantiate row
-          add_preloaded_records_to_collection(
-            parent_records, reflection.name, associated_record)
-          associated_record
-        }
-      end
-
-      def preload_has_one_association(records, reflection, preload_options={})
-        return if records.first.association(reflection.name).loaded?
-        id_to_record_map = construct_id_map(records, reflection.options[:primary_key])
-        options = reflection.options
-
-        add_preloaded_record_to_collection(records, reflection.name, nil)
-
-        if options[:through]
-          through_records = preload_through_records(records, reflection, options[:through])
-
-          unless through_records.empty?
-            through_reflection = reflections[options[:through]]
-            through_primary_key = through_reflection.foreign_key
-            source = reflection.source_reflection.name
-            through_records.first.class.preload_associations(through_records, source)
-            if through_reflection.macro == :belongs_to
-              id_to_record_map    = construct_id_map(records, through_primary_key)
-              through_primary_key = through_reflection.klass.primary_key
-            end
-
-            through_records.each do |through_record|
-              add_preloaded_record_to_collection(id_to_record_map[through_record[through_primary_key].to_s],
-                                                 reflection.name, through_record.send(source))
-            end
-          end
-        else
-          set_association_single_records(id_to_record_map, reflection.name, find_associated_records(id_to_record_map.keys, reflection, preload_options), reflection.foreign_key)
-        end
-      end
-
-      def preload_has_many_association(records, reflection, preload_options={})
-        return if records.first.send(reflection.name).loaded?
-        options = reflection.options
-
-        foreign_key = reflection.through_reflection_foreign_key
-        id_to_record_map = construct_id_map(records, foreign_key || reflection.options[:primary_key])
-        records.each { |record| record.association(reflection.name).loaded! }
-
-        if options[:through]
-          through_records = preload_through_records(records, reflection, options[:through])
-          unless through_records.empty?
-            source = reflection.source_reflection.name
-            through_records.first.class.preload_associations(through_records, source, options)
-            through_records.each do |through_record|
-              through_record_id = through_record[reflection.through_reflection_primary_key].to_s
-              add_preloaded_records_to_collection(id_to_record_map[through_record_id], reflection.name, through_record.send(source))
-            end
-            records.each { |record| record.send(reflection.name).target.uniq! } if options[:uniq]
-          end
-
-        else
-          set_association_collection_records(id_to_record_map, reflection.name, find_associated_records(id_to_record_map.keys, reflection, preload_options),
-                                             reflection.foreign_key)
-        end
-      end
-
-      def preload_through_records(records, reflection, through_association)
-        if reflection.options[:source_type]
-          interface = reflection.source_reflection.foreign_type
-          preload_options = {:conditions => ["#{connection.quote_column_name interface} = ?", reflection.options[:source_type]]}
-
-          records.compact!
-          records.first.class.preload_associations(records, through_association, preload_options)
-
-          # Dont cache the association - we would only be caching a subset
-          records.map { |record|
-            proxy = record.association(through_association)
-
-            if proxy.respond_to?(:target)
-              Array.wrap(proxy.target).tap { proxy.reset }
-            else # this is a has_one :through reflection
-              [proxy].compact
-            end
-          }.flatten(1)
-        else
-          options = {}
-          options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions]
-          options[:order] = reflection.options[:order]
-          options[:conditions] = reflection.options[:conditions]
-          records.first.class.preload_associations(records, through_association, options)
-
-          records.map { |record|
-            Array.wrap(record.send(through_association))
-          }.flatten(1)
-        end
-      end
-
-      def preload_belongs_to_association(records, reflection, preload_options={})
-        return if records.first.association(reflection.name).loaded?
-        options = reflection.options
-
-        klasses_and_ids = {}
-
-        if options[:polymorphic]
-          # Construct a mapping from klass to a list of ids to load and a mapping of those ids back
-          # to their parent_records
-          records.each do |record|
-            if klass = record.send(reflection.foreign_type)
-              klass_id = record.send(reflection.foreign_key)
-              if klass_id
-                id_map = klasses_and_ids[klass.constantize] ||= {}
-                (id_map[klass_id.to_s] ||= []) << record
-              end
-            end
-          end
-        else
-          id_map = records.group_by do |record|
-            key = record.send(reflection.foreign_key)
-            key && key.to_s
-          end
-          klasses_and_ids[reflection.klass] = id_map unless id_map.empty?
-        end
-
-        klasses_and_ids.each do |klass, _id_map|
-          primary_key = (reflection.options[:primary_key] || klass.primary_key).to_s
-          keys        = _id_map.keys.compact
-
-          unless keys.empty?
-            table       = klass.arel_table
-            method      = in_or_equal(keys)
-            conditions  = table[primary_key].send(*method)
-
-            custom_conditions = append_conditions(reflection, preload_options)
-            conditions = custom_conditions.inject(conditions) do |ast, cond|
-              ast.and cond
-            end
-
-            associated_records = klass.unscoped.where(conditions).apply_finder_options(options.slice(:include, :select, :joins, :order)).to_a
-          else
-            associated_records = []
-          end
-
-          set_association_single_records(_id_map, reflection.name, associated_records, primary_key)
-        end
-      end
-
-      def find_associated_records(ids, reflection, preload_options)
-        options    = reflection.options
-        table      = reflection.klass.arel_table
-
-        conditions = []
-
-        key = reflection.foreign_key
-
-        if interface = reflection.options[:as]
-          key = "#{interface}_id"
-          conditions << table["#{interface}_type"].eq(base_class.sti_name)
-        end
-
-        conditions.concat append_conditions(reflection, preload_options)
-
-        find_options = {
-          :select => preload_options[:select] || options[:select] || table[Arel.star],
-          :include => preload_options[:include] || options[:include],
-          :joins => options[:joins],
-          :group => preload_options[:group] || options[:group],
-          :order => preload_options[:order] || options[:order]
-        }
-
-        associated_records(ids) do |some_ids|
-          method = in_or_equal(some_ids)
-          where = table.create_and(conditions + [table[key].send(*method)])
-
-          reflection.klass.scoped.apply_finder_options(find_options.merge(:conditions => where)).to_a
-        end
-      end
-
-      def process_conditions(conditions, klass = self)
-        if conditions.respond_to?(:to_proc)
-          conditions = instance_eval(&conditions)
-        end
-
-        klass.send(:sanitize_sql, conditions)
-      end
-
-      def append_conditions(reflection, preload_options)
-        [
-          ('(' + process_conditions(reflection.options[:conditions], reflection.klass) + ')' if reflection.options[:conditions]),
-          ('(' + process_conditions(preload_options[:conditions]) + ')' if preload_options[:conditions]),
-        ].compact.map { |x| Arel.sql x }
-      end
-
-      def in_or_equal(ids)
-        ids.length == 1 ? ['eq', ids.first] : ['in', ids]
-      end
-
-      # Some databases impose a limit on the number of ids in a list (in Oracle its 1000)
-      # Make several smaller queries if necessary or make one query if the adapter supports it
-      def associated_records(ids)
-        in_clause_length = connection.in_clause_length || ids.size
-        records = []
-        ids.each_slice(in_clause_length) do |some_ids|
-          records.concat yield(some_ids)
-        end
-        records
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index e0b4db498d..0fa9bcd908 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -143,6 +143,8 @@ module ActiveRecord
       autoload :HasAndBelongsToMany, 'active_record/associations/builder/has_and_belongs_to_many'
     end
 
+    autoload :Preloader, 'active_record/associations/preloader'
+
     # Clears out the association cache.
     def clear_association_cache #:nodoc:
       @association_cache.clear if persisted?
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb
new file mode 100644
index 0000000000..fafed94ff2
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader.rb
@@ -0,0 +1,177 @@
+module ActiveRecord
+  module Associations
+    # Implements the details of eager loading of Active Record associations.
+    #
+    # Note that 'eager loading' and 'preloading' are actually the same thing.
+    # However, there are two different eager loading strategies.
+    #
+    # The first one is by using table joins. This was only strategy available
+    # prior to Rails 2.1. Suppose that you have an Author model with columns
+    # 'name' and 'age', and a Book model with columns 'name' and 'sales'. Using
+    # this strategy, Active Record would try to retrieve all data for an author
+    # and all of its books via a single query:
+    #
+    #   SELECT * FROM authors
+    #   LEFT OUTER JOIN books ON authors.id = books.id
+    #   WHERE authors.name = 'Ken Akamatsu'
+    #
+    # However, this could result in many rows that contain redundant data. After
+    # having received the first row, we already have enough data to instantiate
+    # the Author object. In all subsequent rows, only the data for the joined
+    # 'books' table is useful; the joined 'authors' data is just redundant, and
+    # processing this redundant data takes memory and CPU time. The problem
+    # quickly becomes worse and worse as the level of eager loading increases
+    # (i.e. if Active Record is to eager load the associations' associations as
+    # well).
+    #
+    # The second strategy is to use multiple database queries, one for each
+    # level of association. Since Rails 2.1, this is the default strategy. In
+    # situations where a table join is necessary (e.g. when the +:conditions+
+    # option references an association's column), it will fallback to the table
+    # join strategy.
+    class Preloader #:nodoc:
+      autoload :Association,           'active_record/associations/preloader/association'
+      autoload :SingularAssociation,   'active_record/associations/preloader/singular_association'
+      autoload :CollectionAssociation, 'active_record/associations/preloader/collection_association'
+      autoload :ThroughAssociation,    'active_record/associations/preloader/through_association'
+
+      autoload :HasMany,             'active_record/associations/preloader/has_many'
+      autoload :HasManyThrough,      'active_record/associations/preloader/has_many_through'
+      autoload :HasOne,              'active_record/associations/preloader/has_one'
+      autoload :HasOneThrough,       'active_record/associations/preloader/has_one_through'
+      autoload :HasAndBelongsToMany, 'active_record/associations/preloader/has_and_belongs_to_many'
+      autoload :BelongsTo,           'active_record/associations/preloader/belongs_to'
+
+      attr_reader :records, :associations, :options, :model
+
+      # Eager loads the named associations for the given Active Record record(s).
+      #
+      # In this description, 'association name' shall refer to the name passed
+      # to an association creation method. For example, a model that specifies
+      # <tt>belongs_to :author</tt>, <tt>has_many :buyers</tt> has association
+      # names +:author+ and +:buyers+.
+      #
+      # == Parameters
+      # +records+ is an array of ActiveRecord::Base. This array needs not be flat,
+      # i.e. +records+ itself may also contain arrays of records. In any case,
+      # +preload_associations+ will preload the all associations records by
+      # flattening +records+.
+      #
+      # +associations+ specifies one or more associations that you want to
+      # preload. It may be:
+      # - a Symbol or a String which specifies a single association name. For
+      #   example, specifying +:books+ allows this method to preload all books
+      #   for an Author.
+      # - an Array which specifies multiple association names. This array
+      #   is processed recursively. For example, specifying <tt>[:avatar, :books]</tt>
+      #   allows this method to preload an author's avatar as well as all of his
+      #   books.
+      # - a Hash which specifies multiple association names, as well as
+      #   association names for the to-be-preloaded association objects. For
+      #   example, specifying <tt>{ :author => :avatar }</tt> will preload a
+      #   book's author, as well as that author's avatar.
+      #
+      # +:associations+ has the same format as the +:include+ option for
+      # <tt>ActiveRecord::Base.find</tt>. So +associations+ could look like this:
+      #
+      #   :books
+      #   [ :books, :author ]
+      #   { :author => :avatar }
+      #   [ :books, { :author => :avatar } ]
+      #
+      # +options+ contains options that will be passed to ActiveRecord::Base#find
+      # (which is called under the hood for preloading records). But it is passed
+      # only one level deep in the +associations+ argument, i.e. it's not passed
+      # to the child associations when +associations+ is a Hash.
+      def initialize(records, associations, options = {})
+        @records      = Array.wrap(records).compact.uniq
+        @associations = Array.wrap(associations)
+        @options      = options
+      end
+
+      def run
+        unless records.empty?
+          associations.each { |association| preload(association) }
+        end
+      end
+
+      private
+
+      def preload(association)
+        case association
+        when Hash
+          preload_hash(association)
+        when String, Symbol
+          preload_one(association.to_sym)
+        else
+          raise ArgumentError, "#{association.inspect} was not recognised for preload"
+        end
+      end
+
+      def preload_hash(association)
+        association.each do |parent, child|
+          Preloader.new(records, parent, options).run
+          Preloader.new(records.map { |record| record.send(parent) }.flatten, child).run
+        end
+      end
+
+      # Not all records have the same class, so group then preload group on the reflection
+      # itself so that if various subclass share the same association then we do not split
+      # them unnecessarily
+      #
+      # Additionally, polymorphic belongs_to associations can have multiple associated
+      # classes, depending on the polymorphic_type field. So we group by the classes as
+      # well.
+      def preload_one(association)
+        grouped_records(association).each do |reflection, klasses|
+          klasses.each do |klass, records|
+            preloader_for(reflection).new(klass, records, reflection, options).run
+          end
+        end
+      end
+
+      def grouped_records(association)
+        Hash[
+          records_by_reflection(association).map do |reflection, records|
+            [reflection, records.group_by { |record| association_klass(reflection, record) }]
+          end
+        ]
+      end
+
+      def records_by_reflection(association)
+        records.group_by do |record|
+          reflection = record.class.reflections[association]
+
+          unless reflection
+            raise ActiveRecord::ConfigurationError, "Association named '#{association}' was not found; " \
+                                                    "perhaps you misspelled it?"
+          end
+
+          reflection
+        end
+      end
+
+      def association_klass(reflection, record)
+        if reflection.macro == :belongs_to && reflection.options[:polymorphic]
+          klass = record.send(reflection.foreign_type)
+          klass && klass.constantize
+        else
+          reflection.klass
+        end
+      end
+
+      def preloader_for(reflection)
+        case reflection.macro
+        when :has_many
+          reflection.options[:through] ? HasManyThrough : HasMany
+        when :has_one
+          reflection.options[:through] ? HasOneThrough : HasOne
+        when :has_and_belongs_to_many
+          HasAndBelongsToMany
+        when :belongs_to
+          BelongsTo
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
new file mode 100644
index 0000000000..7256dd5288
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -0,0 +1,126 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class Association #:nodoc:
+        attr_reader :owners, :reflection, :preload_options, :model, :klass
+
+        def initialize(klass, owners, reflection, preload_options)
+          @klass           = klass
+          @owners          = owners
+          @reflection      = reflection
+          @preload_options = preload_options || {}
+          @model           = owners.first && owners.first.class
+          @scoped          = nil
+          @owners_by_key   = nil
+        end
+
+        def run
+          unless owners.first.association(reflection.name).loaded?
+            preload
+          end
+        end
+
+        def preload
+          raise NotImplementedError
+        end
+
+        def scoped
+          @scoped ||= build_scope
+        end
+
+        def records_for(ids)
+          scoped.where(association_key.in(ids))
+        end
+
+        def table
+          klass.arel_table
+        end
+
+        # The name of the key on the associated records
+        def association_key_name
+          raise NotImplementedError
+        end
+
+        # This is overridden by HABTM as the condition should be on the foreign_key column in
+        # the join table
+        def association_key
+          table[association_key_name]
+        end
+
+        # The name of the key on the model which declares the association
+        def owner_key_name
+          raise NotImplementedError
+        end
+
+        # We're converting to a string here because postgres will return the aliased association
+        # key in a habtm as a string (for whatever reason)
+        def owners_by_key
+          @owners_by_key ||= owners.group_by do |owner|
+            key = owner[owner_key_name]
+            key && key.to_s
+          end
+        end
+
+        def options
+          reflection.options
+        end
+
+        private
+
+        def associated_records_by_owner
+          owner_keys = owners.map { |owner| owner[owner_key_name] }.compact.uniq
+
+          if klass.nil? || owner_keys.empty?
+            records = []
+          else
+            # Some databases impose a limit on the number of ids in a list (in Oracle it's 1000)
+            # Make several smaller queries if necessary or make one query if the adapter supports it
+            sliced  = owner_keys.each_slice(model.connection.in_clause_length || owner_keys.size)
+            records = sliced.map { |slice| records_for(slice) }.flatten
+          end
+
+          # Each record may have multiple owners, and vice-versa
+          records_by_owner = Hash[owners.map { |owner| [owner, []] }]
+          records.each do |record|
+            owner_key = record[association_key_name].to_s
+
+            owners_by_key[owner_key].each do |owner|
+              records_by_owner[owner] << record
+            end
+          end
+          records_by_owner
+        end
+
+        def build_scope
+          scope = klass.scoped
+
+          scope = scope.where(process_conditions(options[:conditions]))
+          scope = scope.where(process_conditions(preload_options[:conditions]))
+
+          scope = scope.select(preload_options[:select] || options[:select] || table[Arel.star])
+          scope = scope.includes(preload_options[:include] || options[:include])
+
+          if options[:as]
+            scope = scope.where(
+              klass.table_name => {
+                reflection.type => model.base_class.sti_name
+              }
+            )
+          end
+
+          scope
+        end
+
+        def process_conditions(conditions)
+          if conditions.respond_to?(:to_proc)
+            conditions = klass.send(:instance_eval, &conditions)
+          end
+
+          if conditions
+            klass.send(:sanitize_sql, conditions)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/belongs_to.rb b/activerecord/lib/active_record/associations/preloader/belongs_to.rb
new file mode 100644
index 0000000000..5091d4717a
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/belongs_to.rb
@@ -0,0 +1,17 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class BelongsTo < SingularAssociation #:nodoc:
+
+        def association_key_name
+          reflection.options[:primary_key] || klass && klass.primary_key
+        end
+
+        def owner_key_name
+          reflection.foreign_key
+        end
+
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/collection_association.rb b/activerecord/lib/active_record/associations/preloader/collection_association.rb
new file mode 100644
index 0000000000..c248aeaaf6
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/collection_association.rb
@@ -0,0 +1,24 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class CollectionAssociation < Association #:nodoc:
+
+        private
+
+        def build_scope
+          super.order(preload_options[:order] || options[:order])
+        end
+
+        def preload
+          associated_records_by_owner.each do |owner, records|
+            association = owner.association(reflection.name)
+            association.loaded!
+            association.target.concat(records)
+            records.each { |record| association.set_inverse_instance(record) }
+          end
+        end
+
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
new file mode 100644
index 0000000000..e794f05340
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
@@ -0,0 +1,58 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class HasAndBelongsToMany < CollectionAssociation #:nodoc:
+        attr_reader :join_table
+
+        def initialize(klass, records, reflection, preload_options)
+          super
+          @join_table = Arel::Table.new(options[:join_table]).alias('t0')
+        end
+
+        # Unlike the other associations, we want to get a raw array of rows so that we can
+        # access the aliased column on the join table
+        def records_for(ids)
+          scope = super
+          klass.connection.select_all(scope.arel.to_sql, 'SQL', scope.bind_values)
+        end
+
+        def owner_key_name
+          reflection.active_record_primary_key
+        end
+
+        def association_key_name
+          'ar_association_key_name'
+        end
+
+        def association_key
+          join_table[reflection.foreign_key]
+        end
+
+        private
+
+        # Once we have used the join table column (in super), we manually instantiate the
+        # actual records
+        def associated_records_by_owner
+          super.each do |owner_key, rows|
+            rows.map! { |row| klass.instantiate(row) }
+          end
+        end
+
+        def build_scope
+          super.joins(join).select(join_select)
+        end
+
+        def join_select
+          association_key.as(Arel.sql(association_key_name))
+        end
+
+        def join
+          condition = table[reflection.association_primary_key].eq(
+            join_table[reflection.association_foreign_key])
+
+          table.create_join(join_table, table.create_on(condition))
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/has_many.rb b/activerecord/lib/active_record/associations/preloader/has_many.rb
new file mode 100644
index 0000000000..3ea91a8c11
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/has_many.rb
@@ -0,0 +1,17 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class HasMany < CollectionAssociation #:nodoc:
+
+        def association_key_name
+          reflection.foreign_key
+        end
+
+        def owner_key_name
+          reflection.active_record_primary_key
+        end
+
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/has_many_through.rb b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
new file mode 100644
index 0000000000..c6e9ede356
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
@@ -0,0 +1,15 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class HasManyThrough < CollectionAssociation #:nodoc:
+        include ThroughAssociation
+
+        def associated_records_by_owner
+          super.each do |owner, records|
+            records.uniq! if options[:uniq]
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/has_one.rb b/activerecord/lib/active_record/associations/preloader/has_one.rb
new file mode 100644
index 0000000000..848448bb48
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/has_one.rb
@@ -0,0 +1,23 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class HasOne < SingularAssociation #:nodoc:
+
+        def association_key_name
+          reflection.foreign_key
+        end
+
+        def owner_key_name
+          reflection.active_record_primary_key
+        end
+
+        private
+
+        def build_scope
+          super.order(preload_options[:order] || options[:order])
+        end
+
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/has_one_through.rb b/activerecord/lib/active_record/associations/preloader/has_one_through.rb
new file mode 100644
index 0000000000..f063f85574
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/has_one_through.rb
@@ -0,0 +1,9 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class HasOneThrough < SingularAssociation #:nodoc:
+        include ThroughAssociation
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/singular_association.rb b/activerecord/lib/active_record/associations/preloader/singular_association.rb
new file mode 100644
index 0000000000..44e804d785
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/singular_association.rb
@@ -0,0 +1,21 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      class SingularAssociation < Association #:nodoc:
+
+        private
+
+        def preload
+          associated_records_by_owner.each do |owner, associated_records|
+            record = associated_records.first
+
+            association = owner.association(reflection.name)
+            association.target = record
+            association.set_inverse_instance(record)
+          end
+        end
+
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb
new file mode 100644
index 0000000000..d630fc4c63
--- /dev/null
+++ b/activerecord/lib/active_record/associations/preloader/through_association.rb
@@ -0,0 +1,66 @@
+module ActiveRecord
+  module Associations
+    class Preloader
+      module ThroughAssociation #:nodoc:
+
+        def through_reflection
+          reflection.through_reflection
+        end
+
+        def source_reflection
+          reflection.source_reflection
+        end
+
+        def associated_records_by_owner
+          through_records = through_records_by_owner
+
+          ActiveRecord::Associations::Preloader.new(
+            through_records.values.flatten,
+            source_reflection.name, options
+          ).run
+
+          through_records.each do |owner, owner_through_records|
+            owner_through_records.map! { |r| r.send(source_reflection.name) }.flatten!
+          end
+        end
+
+        private
+
+        def through_records_by_owner
+          ActiveRecord::Associations::Preloader.new(
+            owners, through_reflection.name,
+            through_options
+          ).run
+
+          Hash[owners.map do |owner|
+            through_records = Array.wrap(owner.send(through_reflection.name))
+
+            # Dont cache the association - we would only be caching a subset
+            if reflection.options[:source_type] && through_reflection.collection?
+              owner.association(through_reflection.name).reset
+            end
+
+            [owner, through_records]
+          end]
+        end
+
+        def through_options
+          through_options = {}
+
+          if options[:source_type]
+            through_options[:conditions] = { reflection.foreign_type => options[:source_type] }
+          else
+            if options[:conditions]
+              through_options[:include]    = options[:include] || options[:source]
+              through_options[:conditions] = options[:conditions]
+            end
+
+            through_options[:order] = options[:order]
+          end
+
+          through_options
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 5c4998806b..b3204b2bda 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1950,7 +1950,7 @@ MSG
     include AttributeMethods::Dirty
     include ActiveModel::MassAssignmentSecurity
     include Callbacks, ActiveModel::Observing, Timestamp
-    include Associations, AssociationPreload, NamedScope
+    include Associations, NamedScope
     include IdentityMap
     include ActiveModel::SecurePassword
 
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 49659b3aa5..5de08953f9 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -210,6 +210,10 @@ module ActiveRecord
         @foreign_type ||= options[:foreign_type] || "#{name}_type"
       end
 
+      def type
+        @type ||= "#{options[:as]}_type"
+      end
+
       def primary_key_column
         @primary_key_column ||= klass.columns.find { |c| c.name == klass.primary_key }
       end
@@ -359,6 +363,8 @@ module ActiveRecord
     # Holds all the meta-data about a :through association as it was specified
     # in the Active Record class.
     class ThroughReflection < AssociationReflection #:nodoc:
+      delegate :association_primary_key, :foreign_type, :to => :source_reflection
+
       # Gets the source of the through reflection.  It checks both a singularized
       # and pluralized form for <tt>:belongs_to</tt> or <tt>:has_many</tt>.
       #
@@ -402,10 +408,6 @@ module ActiveRecord
         through_reflection.options
       end
 
-      def association_primary_key
-        source_reflection.association_primary_key
-      end
-
       def check_validity!
         if through_reflection.nil?
           raise HasManyThroughAssociationNotFoundError.new(active_record.name, self)
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index b828cffa77..f939bedc81 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -86,7 +86,9 @@ module ActiveRecord
 
       preload = @preload_values
       preload +=  @includes_values unless eager_loading?
-      preload.each {|associations| @klass.send(:preload_associations, @records, associations) }
+      preload.each do |associations|
+        ActiveRecord::Associations::Preloader.new(@records, associations).run
+      end
 
       # @readonly_value is true only if set explicitly. @implicit_readonly is true if there
       # are JOINS and no explicit SELECT.
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index ca71cd8ed3..26808ae931 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -120,30 +120,29 @@ class EagerAssociationTest < ActiveRecord::TestCase
 
   def test_load_associated_records_in_one_query_when_adapter_has_no_limit
     Post.connection.expects(:in_clause_length).at_least_once.returns(nil)
-    Post.expects(:i_was_called).with([1,2,3,4,5,6,7]).returns([1])
-    associated_records = Post.send(:associated_records, [1,2,3,4,5,6,7]) do |some_ids|
-      Post.i_was_called(some_ids)
+
+    post = posts(:welcome)
+    assert_queries(2) do
+      Post.includes(:comments).where(:id => post.id).to_a
     end
-    assert_equal [1], associated_records
   end
 
   def test_load_associated_records_in_several_queries_when_many_ids_passed
-    Post.connection.expects(:in_clause_length).at_least_once.returns(5)
-    Post.expects(:i_was_called).with([1,2,3,4,5]).returns([1])
-    Post.expects(:i_was_called).with([6,7]).returns([6])
-    associated_records = Post.send(:associated_records, [1,2,3,4,5,6,7]) do |some_ids|
-      Post.i_was_called(some_ids)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(1)
+
+    post1, post2 = posts(:welcome), posts(:thinking)
+    assert_queries(3) do
+      Post.includes(:comments).where(:id => [post1.id, post2.id]).to_a
     end
-    assert_equal [1,6], associated_records
   end
 
   def test_load_associated_records_in_one_query_when_a_few_ids_passed
-    Post.connection.expects(:in_clause_length).at_least_once.returns(5)
-    Post.expects(:i_was_called).with([1,2,3]).returns([1])
-    associated_records = Post.send(:associated_records, [1,2,3]) do |some_ids|
-      Post.i_was_called(some_ids)
+    Post.connection.expects(:in_clause_length).at_least_once.returns(3)
+
+    post = posts(:welcome)
+    assert_queries(2) do
+      Post.includes(:comments).where(:id => post.id).to_a
     end
-    assert_equal [1], associated_records
   end
 
   def test_including_duplicate_objects_from_belongs_to
diff --git a/activerecord/test/cases/associations/join_model_test.rb b/activerecord/test/cases/associations/join_model_test.rb
index 6d7f905dc5..19303fef9f 100644
--- a/activerecord/test/cases/associations/join_model_test.rb
+++ b/activerecord/test/cases/associations/join_model_test.rb
@@ -214,7 +214,7 @@ class AssociationsJoinModelTest < ActiveRecord::TestCase
   end
 
   def test_has_many_with_piggyback
-    assert_equal "2", categories(:sti_test).authors.first.post_id.to_s
+    assert_equal "2", categories(:sti_test).authors_with_select.first.post_id.to_s
   end
 
   def test_include_has_many_through
diff --git a/activerecord/test/cases/inheritance_test.rb b/activerecord/test/cases/inheritance_test.rb
index 680d4ca5dd..b5d8314541 100644
--- a/activerecord/test/cases/inheritance_test.rb
+++ b/activerecord/test/cases/inheritance_test.rb
@@ -208,7 +208,7 @@ class InheritanceTest < ActiveRecord::TestCase
 
   def test_eager_load_belongs_to_primary_key_quoting
     con = Account.connection
-    assert_sql(/#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} = 1/) do
+    assert_sql(/#{con.quote_table_name('companies')}.#{con.quote_column_name('id')} IN \(1\)/) do
       Account.find(1, :include => :firm)
     end
   end
diff --git a/activerecord/test/models/category.rb b/activerecord/test/models/category.rb
index 06908ea85e..8f37433ec6 100644
--- a/activerecord/test/models/category.rb
+++ b/activerecord/test/models/category.rb
@@ -22,7 +22,8 @@ class Category < ActiveRecord::Base
   end
 
   has_many :categorizations
-  has_many :authors, :through => :categorizations, :select => 'authors.*, categorizations.post_id'
+  has_many :authors, :through => :categorizations
+  has_many :authors_with_select, :through => :categorizations, :source => :author, :select => 'authors.*, categorizations.post_id'
 
   scope :general, :conditions => { :name => 'General' }
 end
-- 
cgit v1.2.3


From b171b9e73dcc6a89b1da652da61c5127fe605b51 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Sun, 27 Feb 2011 18:17:14 +0000
Subject: Move JoinDependency and friends from
 ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations

---
 activerecord/lib/active_record/associations.rb     |   4 +-
 .../associations/class_methods/join_dependency.rb  | 233 -----------------
 .../join_dependency/join_association.rb            | 281 ---------------------
 .../class_methods/join_dependency/join_base.rb     |  26 --
 .../class_methods/join_dependency/join_part.rb     |  80 ------
 .../active_record/associations/join_dependency.rb  | 231 +++++++++++++++++
 .../join_dependency/join_association.rb            | 279 ++++++++++++++++++++
 .../associations/join_dependency/join_base.rb      |  24 ++
 .../associations/join_dependency/join_part.rb      |  78 ++++++
 .../lib/active_record/relation/finder_methods.rb   |   4 +-
 .../lib/active_record/relation/query_methods.rb    |   4 +-
 11 files changed, 618 insertions(+), 626 deletions(-)
 delete mode 100644 activerecord/lib/active_record/associations/class_methods/join_dependency.rb
 delete mode 100644 activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
 delete mode 100644 activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
 delete mode 100644 activerecord/lib/active_record/associations/class_methods/join_dependency/join_part.rb
 create mode 100644 activerecord/lib/active_record/associations/join_dependency.rb
 create mode 100644 activerecord/lib/active_record/associations/join_dependency/join_association.rb
 create mode 100644 activerecord/lib/active_record/associations/join_dependency/join_base.rb
 create mode 100644 activerecord/lib/active_record/associations/join_dependency/join_part.rb

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 0fa9bcd908..e91cbd7f33 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -5,7 +5,6 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/class/attribute'
-require 'active_record/associations/class_methods/join_dependency'
 
 module ActiveRecord
   class InverseOfAssociationNotFoundError < ActiveRecordError #:nodoc:
@@ -143,7 +142,8 @@ module ActiveRecord
       autoload :HasAndBelongsToMany, 'active_record/associations/builder/has_and_belongs_to_many'
     end
 
-    autoload :Preloader, 'active_record/associations/preloader'
+    autoload :Preloader,      'active_record/associations/preloader'
+    autoload :JoinDependency, 'active_record/associations/join_dependency'
 
     # Clears out the association cache.
     def clear_association_cache #:nodoc:
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
deleted file mode 100644
index b711ff35ca..0000000000
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb
+++ /dev/null
@@ -1,233 +0,0 @@
-require 'active_record/associations/class_methods/join_dependency/join_part'
-require 'active_record/associations/class_methods/join_dependency/join_base'
-require 'active_record/associations/class_methods/join_dependency/join_association'
-
-module ActiveRecord
-  module Associations
-    module ClassMethods
-      class JoinDependency # :nodoc:
-        attr_reader :join_parts, :reflections, :table_aliases, :active_record
-
-        def initialize(base, associations, joins)
-          @active_record         = base
-          @table_joins           = joins
-          @join_parts            = [JoinBase.new(base)]
-          @associations          = {}
-          @reflections           = []
-          @table_aliases         = Hash.new do |h,name|
-            h[name] = count_aliases_from_table_joins(name.downcase)
-          end
-          @table_aliases[base.table_name] = 1
-          build(associations)
-        end
-
-        def graft(*associations)
-          associations.each do |association|
-            join_associations.detect {|a| association == a} ||
-              build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type)
-          end
-          self
-        end
-
-        def join_associations
-          join_parts.last(join_parts.length - 1)
-        end
-
-        def join_base
-          join_parts.first
-        end
-
-        def columns
-          join_parts.collect { |join_part|
-            table = join_part.aliased_table
-            join_part.column_names_with_alias.collect{ |column_name, aliased_name|
-              table[column_name].as Arel.sql(aliased_name)
-            }
-          }.flatten
-        end
-
-        def count_aliases_from_table_joins(name)
-          return 0 if Arel::Table === @table_joins
-
-          # quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase
-          quoted_name = active_record.connection.quote_table_name(name).downcase
-
-          @table_joins.map { |join|
-            # Table names + table aliases
-            join.left.downcase.scan(
-              /join(?:\s+\w+)?\s+(\S+\s+)?#{quoted_name}\son/
-            ).size
-          }.sum
-        end
-
-        def instantiate(rows)
-          primary_key = join_base.aliased_primary_key
-          parents = {}
-
-          records = rows.map { |model|
-            primary_id = model[primary_key]
-            parent = parents[primary_id] ||= join_base.instantiate(model)
-            construct(parent, @associations, join_associations, model)
-            parent
-          }.uniq
-
-          remove_duplicate_results!(active_record, records, @associations)
-          records
-        end
-
-        def remove_duplicate_results!(base, records, associations)
-          case associations
-          when Symbol, String
-            reflection = base.reflections[associations]
-            remove_uniq_by_reflection(reflection, records)
-          when Array
-            associations.each do |association|
-              remove_duplicate_results!(base, records, association)
-            end
-          when Hash
-            associations.keys.each do |name|
-              reflection = base.reflections[name]
-              remove_uniq_by_reflection(reflection, records)
-
-              parent_records = []
-              records.each do |record|
-                if descendant = record.send(reflection.name)
-                  if reflection.collection?
-                    parent_records.concat descendant.target.uniq
-                  else
-                    parent_records << descendant
-                  end
-                end
-              end
-
-              remove_duplicate_results!(reflection.klass, parent_records, associations[name]) unless parent_records.empty?
-            end
-          end
-        end
-
-        protected
-
-        def cache_joined_association(association)
-          associations = []
-          parent = association.parent
-          while parent != join_base
-            associations.unshift(parent.reflection.name)
-            parent = parent.parent
-          end
-          ref = @associations
-          associations.each do |key|
-            ref = ref[key]
-          end
-          ref[association.reflection.name] ||= {}
-        end
-
-        def build(associations, parent = nil, join_type = Arel::InnerJoin)
-          parent ||= join_parts.last
-          case associations
-          when Symbol, String
-            reflection = parent.reflections[associations.to_s.intern] or
-            raise ConfigurationError, "Association named '#{ associations }' was not found; perhaps you misspelled it?"
-            unless join_association = find_join_association(reflection, parent)
-              @reflections << reflection
-              join_association = build_join_association(reflection, parent)
-              join_association.join_type = join_type
-              @join_parts << join_association
-              cache_joined_association(join_association)
-            end
-            join_association
-          when Array
-            associations.each do |association|
-              build(association, parent, join_type)
-            end
-          when Hash
-            associations.keys.sort_by { |a| a.to_s }.each do |name|
-              join_association = build(name, parent, join_type)
-              build(associations[name], join_association, join_type)
-            end
-          else
-            raise ConfigurationError, associations.inspect
-          end
-        end
-
-        def find_join_association(name_or_reflection, parent)
-          if String === name_or_reflection
-            name_or_reflection = name_or_reflection.to_sym
-          end
-
-          join_associations.detect { |j|
-            j.reflection == name_or_reflection && j.parent == parent
-          }
-        end
-
-        def remove_uniq_by_reflection(reflection, records)
-          if reflection && reflection.collection?
-            records.each { |record| record.send(reflection.name).target.uniq! }
-          end
-        end
-
-        def build_join_association(reflection, parent)
-          JoinAssociation.new(reflection, self, parent)
-        end
-
-        def construct(parent, associations, join_parts, row)
-          case associations
-          when Symbol, String
-            name = associations.to_s
-
-            join_part = join_parts.detect { |j|
-              j.reflection.name.to_s == name &&
-                j.parent_table_name == parent.class.table_name }
-
-              raise(ConfigurationError, "No such association") unless join_part
-
-              join_parts.delete(join_part)
-              construct_association(parent, join_part, row)
-          when Array
-            associations.each do |association|
-              construct(parent, association, join_parts, row)
-            end
-          when Hash
-            associations.sort_by { |k,_| k.to_s }.each do |association_name, assoc|
-              association = construct(parent, association_name, join_parts, row)
-              construct(association, assoc, join_parts, row) if association
-            end
-          else
-            raise ConfigurationError, associations.inspect
-          end
-        end
-
-        def construct_association(record, join_part, row)
-          return if record.id.to_s != join_part.parent.record_id(row).to_s
-
-          macro = join_part.reflection.macro
-          if macro == :has_one
-            return if record.association_cache.key?(join_part.reflection.name)
-            association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
-            set_target_and_inverse(join_part, association, record)
-          else
-            return if row[join_part.aliased_primary_key].nil?
-            association = join_part.instantiate(row)
-            case macro
-            when :has_many, :has_and_belongs_to_many
-              other = record.association(join_part.reflection.name)
-              other.loaded!
-              other.target.push(association)
-              other.set_inverse_instance(association)
-            when :belongs_to
-              set_target_and_inverse(join_part, association, record)
-            else
-              raise ConfigurationError, "unknown macro: #{join_part.reflection.macro}"
-            end
-          end
-          association
-        end
-
-        def set_target_and_inverse(join_part, association, record)
-          other = record.association(join_part.reflection.name)
-          other.target = association
-          other.set_inverse_instance(association)
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
deleted file mode 100644
index aaa475109e..0000000000
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
+++ /dev/null
@@ -1,281 +0,0 @@
-module ActiveRecord
-  module Associations
-    module ClassMethods
-      class JoinDependency # :nodoc:
-        class JoinAssociation < JoinPart # :nodoc:
-          # The reflection of the association represented
-          attr_reader :reflection
-
-          # The JoinDependency object which this JoinAssociation exists within. This is mainly
-          # relevant for generating aliases which do not conflict with other joins which are
-          # part of the query.
-          attr_reader :join_dependency
-
-          # A JoinBase instance representing the active record we are joining onto.
-          # (So in Author.has_many :posts, the Author would be that base record.)
-          attr_reader :parent
-
-          # What type of join will be generated, either Arel::InnerJoin (default) or Arel::OuterJoin
-          attr_accessor :join_type
-
-          # These implement abstract methods from the superclass
-          attr_reader :aliased_prefix, :aliased_table_name
-
-          delegate :options, :through_reflection, :source_reflection, :to => :reflection
-          delegate :table, :table_name, :to => :parent, :prefix => :parent
-
-          def initialize(reflection, join_dependency, parent = nil)
-            reflection.check_validity!
-
-            if reflection.options[:polymorphic]
-              raise EagerLoadPolymorphicError.new(reflection)
-            end
-
-            super(reflection.klass)
-
-            @reflection      = reflection
-            @join_dependency = join_dependency
-            @parent          = parent
-            @join_type       = Arel::InnerJoin
-            @aliased_prefix  = "t#{ join_dependency.join_parts.size }"
-
-            # This must be done eagerly upon initialisation because the alias which is produced
-            # depends on the state of the join dependency, but we want it to work the same way
-            # every time.
-            allocate_aliases
-            @table = Arel::Table.new(
-              table_name, :as => aliased_table_name, :engine => arel_engine
-            )
-          end
-
-          def ==(other)
-            other.class == self.class &&
-              other.reflection == reflection &&
-              other.parent == parent
-          end
-
-          def find_parent_in(other_join_dependency)
-            other_join_dependency.join_parts.detect do |join_part|
-              parent == join_part
-            end
-          end
-
-          def join_to(relation)
-            send("join_#{reflection.macro}_to", relation)
-          end
-
-          def join_relation(joining_relation)
-            self.join_type = Arel::OuterJoin
-            joining_relation.joins(self)
-          end
-
-          attr_reader :table
-          # More semantic name given we are talking about associations
-          alias_method :target_table, :table
-
-          protected
-
-          def aliased_table_name_for(name, suffix = nil)
-            aliases = @join_dependency.table_aliases
-
-            if aliases[name] != 0 # We need an alias
-              connection = active_record.connection
-
-              name = connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}#{suffix}"
-              aliases[name] += 1
-              name = name[0, connection.table_alias_length-3] + "_#{aliases[name]}" if aliases[name] > 1
-            else
-              aliases[name] += 1
-            end
-
-            name
-          end
-
-          def pluralize(table_name)
-            ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
-          end
-
-          private
-
-          def allocate_aliases
-            @aliased_table_name = aliased_table_name_for(table_name)
-
-            if reflection.macro == :has_and_belongs_to_many
-              @aliased_join_table_name = aliased_table_name_for(reflection.options[:join_table], "_join")
-            elsif [:has_many, :has_one].include?(reflection.macro) && reflection.options[:through]
-              @aliased_join_table_name = aliased_table_name_for(reflection.through_reflection.klass.table_name, "_join")
-            end
-          end
-
-          def process_conditions(conditions, table_name)
-            if conditions.respond_to?(:to_proc)
-              conditions = instance_eval(&conditions)
-            end
-
-            Arel.sql(sanitize_sql(conditions, table_name))
-          end
-
-          def sanitize_sql(condition, table_name)
-            active_record.send(:sanitize_sql, condition, table_name)
-          end
-
-          def join_target_table(relation, condition)
-            conditions = [condition]
-
-            # If the target table is an STI model then we must be sure to only include records of
-            # its type and its sub-types.
-            unless active_record.descends_from_active_record?
-              sti_column    = target_table[active_record.inheritance_column]
-              subclasses    = active_record.descendants
-              sti_condition = sti_column.eq(active_record.sti_name)
-
-              conditions << subclasses.inject(sti_condition) { |attr,subclass|
-                attr.or(sti_column.eq(subclass.sti_name))
-              }
-            end
-
-            # If the reflection has conditions, add them
-            if options[:conditions]
-              conditions << process_conditions(options[:conditions], aliased_table_name)
-            end
-
-            ands = relation.create_and(conditions)
-
-            join = relation.create_join(
-              target_table,
-              relation.create_on(ands),
-              join_type)
-
-            relation.from join
-          end
-
-          def join_has_and_belongs_to_many_to(relation)
-            join_table = Arel::Table.new(
-              options[:join_table]
-            ).alias(@aliased_join_table_name)
-
-            fk       = options[:foreign_key]             || reflection.active_record.to_s.foreign_key
-            klass_fk = options[:association_foreign_key] || reflection.klass.to_s.foreign_key
-
-            relation = relation.join(join_table, join_type)
-            relation = relation.on(
-              join_table[fk].
-              eq(parent_table[reflection.active_record.primary_key])
-            )
-
-            join_target_table(
-              relation,
-              target_table[reflection.klass.primary_key].
-              eq(join_table[klass_fk])
-            )
-          end
-
-          def join_has_many_to(relation)
-            if reflection.options[:through]
-              join_has_many_through_to(relation)
-            elsif reflection.options[:as]
-              join_has_many_polymorphic_to(relation)
-            else
-              foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
-              primary_key = options[:primary_key] || parent.primary_key
-
-              join_target_table(
-                relation,
-                target_table[foreign_key].
-                eq(parent_table[primary_key])
-              )
-            end
-          end
-          alias :join_has_one_to :join_has_many_to
-
-          def join_has_many_through_to(relation)
-            join_table = Arel::Table.new(
-              through_reflection.klass.table_name
-            ).alias @aliased_join_table_name
-
-            jt_conditions = []
-            first_key = second_key = nil
-
-            if through_reflection.macro == :belongs_to
-              jt_primary_key = through_reflection.foreign_key
-              jt_foreign_key = through_reflection.association_primary_key
-            else
-              jt_primary_key = through_reflection.active_record_primary_key
-              jt_foreign_key = through_reflection.foreign_key
-
-              if through_reflection.options[:as] # has_many :through against a polymorphic join
-                jt_conditions <<
-                join_table["#{through_reflection.options[:as]}_type"].
-                  eq(parent.active_record.base_class.name)
-              end
-            end
-
-            case source_reflection.macro
-            when :has_many
-              second_key = options[:foreign_key] || primary_key
-
-              if source_reflection.options[:as]
-                first_key = "#{source_reflection.options[:as]}_id"
-              else
-                first_key = through_reflection.klass.base_class.to_s.foreign_key
-              end
-
-              unless through_reflection.klass.descends_from_active_record?
-                jt_conditions <<
-                join_table[through_reflection.active_record.inheritance_column].
-                  eq(through_reflection.klass.sti_name)
-              end
-            when :belongs_to
-              first_key = primary_key
-
-              if reflection.options[:source_type]
-                second_key = source_reflection.association_foreign_key
-
-                jt_conditions <<
-                join_table[reflection.source_reflection.foreign_type].
-                  eq(reflection.options[:source_type])
-              else
-                second_key = source_reflection.foreign_key
-              end
-            end
-
-            jt_conditions <<
-            parent_table[jt_primary_key].
-              eq(join_table[jt_foreign_key])
-
-            if through_reflection.options[:conditions]
-              jt_conditions << process_conditions(through_reflection.options[:conditions], aliased_table_name)
-            end
-
-            relation = relation.join(join_table, join_type).on(*jt_conditions)
-
-            join_target_table(
-              relation,
-              target_table[first_key].eq(join_table[second_key])
-            )
-          end
-
-          def join_has_many_polymorphic_to(relation)
-            join_target_table(
-              relation,
-              target_table["#{reflection.options[:as]}_id"].
-              eq(parent_table[parent.primary_key]).and(
-              target_table["#{reflection.options[:as]}_type"].
-              eq(parent.active_record.base_class.name))
-            )
-          end
-
-          def join_belongs_to_to(relation)
-            foreign_key = options[:foreign_key] || reflection.foreign_key
-            primary_key = options[:primary_key] || reflection.klass.primary_key
-
-            join_target_table(
-              relation,
-              target_table[primary_key].eq(parent_table[foreign_key])
-            )
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
deleted file mode 100644
index 67567f06df..0000000000
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_base.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module ActiveRecord
-  module Associations
-    module ClassMethods
-      class JoinDependency # :nodoc:
-        class JoinBase < JoinPart # :nodoc:
-          def ==(other)
-            other.class == self.class &&
-              other.active_record == active_record
-          end
-
-          def aliased_prefix
-            "t0"
-          end
-
-          def table
-            Arel::Table.new(table_name, arel_engine)
-          end
-
-          def aliased_table_name
-            active_record.table_name
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_part.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency/join_part.rb
deleted file mode 100644
index cd16ae5a8b..0000000000
--- a/activerecord/lib/active_record/associations/class_methods/join_dependency/join_part.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-module ActiveRecord
-  module Associations
-    module ClassMethods
-      class JoinDependency # :nodoc:
-        # A JoinPart represents a part of a JoinDependency. It is an abstract class, inherited
-        # by JoinBase and JoinAssociation. A JoinBase represents the Active Record which
-        # everything else is being joined onto. A JoinAssociation represents an association which
-        # is joining to the base. A JoinAssociation may result in more than one actual join
-        # operations (for example a has_and_belongs_to_many JoinAssociation would result in
-        # two; one for the join table and one for the target table).
-        class JoinPart # :nodoc:
-          # The Active Record class which this join part is associated 'about'; for a JoinBase
-          # this is the actual base model, for a JoinAssociation this is the target model of the
-          # association.
-          attr_reader :active_record
-
-          delegate :table_name, :column_names, :primary_key, :reflections, :arel_engine, :to => :active_record
-
-          def initialize(active_record)
-            @active_record = active_record
-            @cached_record = {}
-            @column_names_with_alias = nil
-          end
-
-          def aliased_table
-            Arel::Nodes::TableAlias.new aliased_table_name, table
-          end
-
-          def ==(other)
-            raise NotImplementedError
-          end
-
-          # An Arel::Table for the active_record
-          def table
-            raise NotImplementedError
-          end
-
-          # The prefix to be used when aliasing columns in the active_record's table
-          def aliased_prefix
-            raise NotImplementedError
-          end
-
-          # The alias for the active_record's table
-          def aliased_table_name
-            raise NotImplementedError
-          end
-
-          # The alias for the primary key of the active_record's table
-          def aliased_primary_key
-            "#{aliased_prefix}_r0"
-          end
-
-          # An array of [column_name, alias] pairs for the table
-          def column_names_with_alias
-            unless @column_names_with_alias
-              @column_names_with_alias = []
-
-              ([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
-                @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"]
-              end
-            end
-            @column_names_with_alias
-          end
-
-          def extract_record(row)
-            Hash[column_names_with_alias.map{|cn, an| [cn, row[an]]}]
-          end
-
-          def record_id(row)
-            row[aliased_primary_key]
-          end
-
-          def instantiate(row)
-            @cached_record[record_id(row)] ||= active_record.send(:instantiate, extract_record(row))
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
new file mode 100644
index 0000000000..c7c3cf521c
--- /dev/null
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -0,0 +1,231 @@
+module ActiveRecord
+  module Associations
+    class JoinDependency # :nodoc:
+      autoload :JoinPart,        'active_record/associations/join_dependency/join_part'
+      autoload :JoinBase,        'active_record/associations/join_dependency/join_base'
+      autoload :JoinAssociation, 'active_record/associations/join_dependency/join_association'
+
+      attr_reader :join_parts, :reflections, :table_aliases, :active_record
+
+      def initialize(base, associations, joins)
+        @active_record         = base
+        @table_joins           = joins
+        @join_parts            = [JoinBase.new(base)]
+        @associations          = {}
+        @reflections           = []
+        @table_aliases         = Hash.new do |h,name|
+          h[name] = count_aliases_from_table_joins(name.downcase)
+        end
+        @table_aliases[base.table_name] = 1
+        build(associations)
+      end
+
+      def graft(*associations)
+        associations.each do |association|
+          join_associations.detect {|a| association == a} ||
+            build(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type)
+        end
+        self
+      end
+
+      def join_associations
+        join_parts.last(join_parts.length - 1)
+      end
+
+      def join_base
+        join_parts.first
+      end
+
+      def columns
+        join_parts.collect { |join_part|
+          table = join_part.aliased_table
+          join_part.column_names_with_alias.collect{ |column_name, aliased_name|
+            table[column_name].as Arel.sql(aliased_name)
+          }
+        }.flatten
+      end
+
+      def count_aliases_from_table_joins(name)
+        return 0 if Arel::Table === @table_joins
+
+        # quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase
+        quoted_name = active_record.connection.quote_table_name(name).downcase
+
+        @table_joins.map { |join|
+          # Table names + table aliases
+          join.left.downcase.scan(
+            /join(?:\s+\w+)?\s+(\S+\s+)?#{quoted_name}\son/
+          ).size
+        }.sum
+      end
+
+      def instantiate(rows)
+        primary_key = join_base.aliased_primary_key
+        parents = {}
+
+        records = rows.map { |model|
+          primary_id = model[primary_key]
+          parent = parents[primary_id] ||= join_base.instantiate(model)
+          construct(parent, @associations, join_associations, model)
+          parent
+        }.uniq
+
+        remove_duplicate_results!(active_record, records, @associations)
+        records
+      end
+
+      def remove_duplicate_results!(base, records, associations)
+        case associations
+        when Symbol, String
+          reflection = base.reflections[associations]
+          remove_uniq_by_reflection(reflection, records)
+        when Array
+          associations.each do |association|
+            remove_duplicate_results!(base, records, association)
+          end
+        when Hash
+          associations.keys.each do |name|
+            reflection = base.reflections[name]
+            remove_uniq_by_reflection(reflection, records)
+
+            parent_records = []
+            records.each do |record|
+              if descendant = record.send(reflection.name)
+                if reflection.collection?
+                  parent_records.concat descendant.target.uniq
+                else
+                  parent_records << descendant
+                end
+              end
+            end
+
+            remove_duplicate_results!(reflection.klass, parent_records, associations[name]) unless parent_records.empty?
+          end
+        end
+      end
+
+      protected
+
+      def cache_joined_association(association)
+        associations = []
+        parent = association.parent
+        while parent != join_base
+          associations.unshift(parent.reflection.name)
+          parent = parent.parent
+        end
+        ref = @associations
+        associations.each do |key|
+          ref = ref[key]
+        end
+        ref[association.reflection.name] ||= {}
+      end
+
+      def build(associations, parent = nil, join_type = Arel::InnerJoin)
+        parent ||= join_parts.last
+        case associations
+        when Symbol, String
+          reflection = parent.reflections[associations.to_s.intern] or
+          raise ConfigurationError, "Association named '#{ associations }' was not found; perhaps you misspelled it?"
+          unless join_association = find_join_association(reflection, parent)
+            @reflections << reflection
+            join_association = build_join_association(reflection, parent)
+            join_association.join_type = join_type
+            @join_parts << join_association
+            cache_joined_association(join_association)
+          end
+          join_association
+        when Array
+          associations.each do |association|
+            build(association, parent, join_type)
+          end
+        when Hash
+          associations.keys.sort_by { |a| a.to_s }.each do |name|
+            join_association = build(name, parent, join_type)
+            build(associations[name], join_association, join_type)
+          end
+        else
+          raise ConfigurationError, associations.inspect
+        end
+      end
+
+      def find_join_association(name_or_reflection, parent)
+        if String === name_or_reflection
+          name_or_reflection = name_or_reflection.to_sym
+        end
+
+        join_associations.detect { |j|
+          j.reflection == name_or_reflection && j.parent == parent
+        }
+      end
+
+      def remove_uniq_by_reflection(reflection, records)
+        if reflection && reflection.collection?
+          records.each { |record| record.send(reflection.name).target.uniq! }
+        end
+      end
+
+      def build_join_association(reflection, parent)
+        JoinAssociation.new(reflection, self, parent)
+      end
+
+      def construct(parent, associations, join_parts, row)
+        case associations
+        when Symbol, String
+          name = associations.to_s
+
+          join_part = join_parts.detect { |j|
+            j.reflection.name.to_s == name &&
+              j.parent_table_name == parent.class.table_name }
+
+            raise(ConfigurationError, "No such association") unless join_part
+
+            join_parts.delete(join_part)
+            construct_association(parent, join_part, row)
+        when Array
+          associations.each do |association|
+            construct(parent, association, join_parts, row)
+          end
+        when Hash
+          associations.sort_by { |k,_| k.to_s }.each do |association_name, assoc|
+            association = construct(parent, association_name, join_parts, row)
+            construct(association, assoc, join_parts, row) if association
+          end
+        else
+          raise ConfigurationError, associations.inspect
+        end
+      end
+
+      def construct_association(record, join_part, row)
+        return if record.id.to_s != join_part.parent.record_id(row).to_s
+
+        macro = join_part.reflection.macro
+        if macro == :has_one
+          return if record.association_cache.key?(join_part.reflection.name)
+          association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
+          set_target_and_inverse(join_part, association, record)
+        else
+          return if row[join_part.aliased_primary_key].nil?
+          association = join_part.instantiate(row)
+          case macro
+          when :has_many, :has_and_belongs_to_many
+            other = record.association(join_part.reflection.name)
+            other.loaded!
+            other.target.push(association)
+            other.set_inverse_instance(association)
+          when :belongs_to
+            set_target_and_inverse(join_part, association, record)
+          else
+            raise ConfigurationError, "unknown macro: #{join_part.reflection.macro}"
+          end
+        end
+        association
+      end
+
+      def set_target_and_inverse(join_part, association, record)
+        other = record.association(join_part.reflection.name)
+        other.target = association
+        other.set_inverse_instance(association)
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
new file mode 100644
index 0000000000..ebe39c35fe
--- /dev/null
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -0,0 +1,279 @@
+module ActiveRecord
+  module Associations
+    class JoinDependency # :nodoc:
+      class JoinAssociation < JoinPart # :nodoc:
+        # The reflection of the association represented
+        attr_reader :reflection
+
+        # The JoinDependency object which this JoinAssociation exists within. This is mainly
+        # relevant for generating aliases which do not conflict with other joins which are
+        # part of the query.
+        attr_reader :join_dependency
+
+        # A JoinBase instance representing the active record we are joining onto.
+        # (So in Author.has_many :posts, the Author would be that base record.)
+        attr_reader :parent
+
+        # What type of join will be generated, either Arel::InnerJoin (default) or Arel::OuterJoin
+        attr_accessor :join_type
+
+        # These implement abstract methods from the superclass
+        attr_reader :aliased_prefix, :aliased_table_name
+
+        delegate :options, :through_reflection, :source_reflection, :to => :reflection
+        delegate :table, :table_name, :to => :parent, :prefix => :parent
+
+        def initialize(reflection, join_dependency, parent = nil)
+          reflection.check_validity!
+
+          if reflection.options[:polymorphic]
+            raise EagerLoadPolymorphicError.new(reflection)
+          end
+
+          super(reflection.klass)
+
+          @reflection      = reflection
+          @join_dependency = join_dependency
+          @parent          = parent
+          @join_type       = Arel::InnerJoin
+          @aliased_prefix  = "t#{ join_dependency.join_parts.size }"
+
+          # This must be done eagerly upon initialisation because the alias which is produced
+          # depends on the state of the join dependency, but we want it to work the same way
+          # every time.
+          allocate_aliases
+          @table = Arel::Table.new(
+            table_name, :as => aliased_table_name, :engine => arel_engine
+          )
+        end
+
+        def ==(other)
+          other.class == self.class &&
+            other.reflection == reflection &&
+            other.parent == parent
+        end
+
+        def find_parent_in(other_join_dependency)
+          other_join_dependency.join_parts.detect do |join_part|
+            parent == join_part
+          end
+        end
+
+        def join_to(relation)
+          send("join_#{reflection.macro}_to", relation)
+        end
+
+        def join_relation(joining_relation)
+          self.join_type = Arel::OuterJoin
+          joining_relation.joins(self)
+        end
+
+        attr_reader :table
+        # More semantic name given we are talking about associations
+        alias_method :target_table, :table
+
+        protected
+
+        def aliased_table_name_for(name, suffix = nil)
+          aliases = @join_dependency.table_aliases
+
+          if aliases[name] != 0 # We need an alias
+            connection = active_record.connection
+
+            name = connection.table_alias_for "#{pluralize(reflection.name)}_#{parent_table_name}#{suffix}"
+            aliases[name] += 1
+            name = name[0, connection.table_alias_length-3] + "_#{aliases[name]}" if aliases[name] > 1
+          else
+            aliases[name] += 1
+          end
+
+          name
+        end
+
+        def pluralize(table_name)
+          ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
+        end
+
+        private
+
+        def allocate_aliases
+          @aliased_table_name = aliased_table_name_for(table_name)
+
+          if reflection.macro == :has_and_belongs_to_many
+            @aliased_join_table_name = aliased_table_name_for(reflection.options[:join_table], "_join")
+          elsif [:has_many, :has_one].include?(reflection.macro) && reflection.options[:through]
+            @aliased_join_table_name = aliased_table_name_for(reflection.through_reflection.klass.table_name, "_join")
+          end
+        end
+
+        def process_conditions(conditions, table_name)
+          if conditions.respond_to?(:to_proc)
+            conditions = instance_eval(&conditions)
+          end
+
+          Arel.sql(sanitize_sql(conditions, table_name))
+        end
+
+        def sanitize_sql(condition, table_name)
+          active_record.send(:sanitize_sql, condition, table_name)
+        end
+
+        def join_target_table(relation, condition)
+          conditions = [condition]
+
+          # If the target table is an STI model then we must be sure to only include records of
+          # its type and its sub-types.
+          unless active_record.descends_from_active_record?
+            sti_column    = target_table[active_record.inheritance_column]
+            subclasses    = active_record.descendants
+            sti_condition = sti_column.eq(active_record.sti_name)
+
+            conditions << subclasses.inject(sti_condition) { |attr,subclass|
+              attr.or(sti_column.eq(subclass.sti_name))
+            }
+          end
+
+          # If the reflection has conditions, add them
+          if options[:conditions]
+            conditions << process_conditions(options[:conditions], aliased_table_name)
+          end
+
+          ands = relation.create_and(conditions)
+
+          join = relation.create_join(
+            target_table,
+            relation.create_on(ands),
+            join_type)
+
+          relation.from join
+        end
+
+        def join_has_and_belongs_to_many_to(relation)
+          join_table = Arel::Table.new(
+            options[:join_table]
+          ).alias(@aliased_join_table_name)
+
+          fk       = options[:foreign_key]             || reflection.active_record.to_s.foreign_key
+          klass_fk = options[:association_foreign_key] || reflection.klass.to_s.foreign_key
+
+          relation = relation.join(join_table, join_type)
+          relation = relation.on(
+            join_table[fk].
+            eq(parent_table[reflection.active_record.primary_key])
+          )
+
+          join_target_table(
+            relation,
+            target_table[reflection.klass.primary_key].
+            eq(join_table[klass_fk])
+          )
+        end
+
+        def join_has_many_to(relation)
+          if reflection.options[:through]
+            join_has_many_through_to(relation)
+          elsif reflection.options[:as]
+            join_has_many_polymorphic_to(relation)
+          else
+            foreign_key = options[:foreign_key] || reflection.active_record.name.foreign_key
+            primary_key = options[:primary_key] || parent.primary_key
+
+            join_target_table(
+              relation,
+              target_table[foreign_key].
+              eq(parent_table[primary_key])
+            )
+          end
+        end
+        alias :join_has_one_to :join_has_many_to
+
+        def join_has_many_through_to(relation)
+          join_table = Arel::Table.new(
+            through_reflection.klass.table_name
+          ).alias @aliased_join_table_name
+
+          jt_conditions = []
+          first_key = second_key = nil
+
+          if through_reflection.macro == :belongs_to
+            jt_primary_key = through_reflection.foreign_key
+            jt_foreign_key = through_reflection.association_primary_key
+          else
+            jt_primary_key = through_reflection.active_record_primary_key
+            jt_foreign_key = through_reflection.foreign_key
+
+            if through_reflection.options[:as] # has_many :through against a polymorphic join
+              jt_conditions <<
+              join_table["#{through_reflection.options[:as]}_type"].
+                eq(parent.active_record.base_class.name)
+            end
+          end
+
+          case source_reflection.macro
+          when :has_many
+            second_key = options[:foreign_key] || primary_key
+
+            if source_reflection.options[:as]
+              first_key = "#{source_reflection.options[:as]}_id"
+            else
+              first_key = through_reflection.klass.base_class.to_s.foreign_key
+            end
+
+            unless through_reflection.klass.descends_from_active_record?
+              jt_conditions <<
+              join_table[through_reflection.active_record.inheritance_column].
+                eq(through_reflection.klass.sti_name)
+            end
+          when :belongs_to
+            first_key = primary_key
+
+            if reflection.options[:source_type]
+              second_key = source_reflection.association_foreign_key
+
+              jt_conditions <<
+              join_table[reflection.source_reflection.foreign_type].
+                eq(reflection.options[:source_type])
+            else
+              second_key = source_reflection.foreign_key
+            end
+          end
+
+          jt_conditions <<
+          parent_table[jt_primary_key].
+            eq(join_table[jt_foreign_key])
+
+          if through_reflection.options[:conditions]
+            jt_conditions << process_conditions(through_reflection.options[:conditions], aliased_table_name)
+          end
+
+          relation = relation.join(join_table, join_type).on(*jt_conditions)
+
+          join_target_table(
+            relation,
+            target_table[first_key].eq(join_table[second_key])
+          )
+        end
+
+        def join_has_many_polymorphic_to(relation)
+          join_target_table(
+            relation,
+            target_table["#{reflection.options[:as]}_id"].
+            eq(parent_table[parent.primary_key]).and(
+            target_table["#{reflection.options[:as]}_type"].
+            eq(parent.active_record.base_class.name))
+          )
+        end
+
+        def join_belongs_to_to(relation)
+          foreign_key = options[:foreign_key] || reflection.foreign_key
+          primary_key = options[:primary_key] || reflection.klass.primary_key
+
+          join_target_table(
+            relation,
+            target_table[primary_key].eq(parent_table[foreign_key])
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_base.rb b/activerecord/lib/active_record/associations/join_dependency/join_base.rb
new file mode 100644
index 0000000000..3920e84976
--- /dev/null
+++ b/activerecord/lib/active_record/associations/join_dependency/join_base.rb
@@ -0,0 +1,24 @@
+module ActiveRecord
+  module Associations
+    class JoinDependency # :nodoc:
+      class JoinBase < JoinPart # :nodoc:
+        def ==(other)
+          other.class == self.class &&
+            other.active_record == active_record
+        end
+
+        def aliased_prefix
+          "t0"
+        end
+
+        def table
+          Arel::Table.new(table_name, arel_engine)
+        end
+
+        def aliased_table_name
+          active_record.table_name
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_part.rb b/activerecord/lib/active_record/associations/join_dependency/join_part.rb
new file mode 100644
index 0000000000..3279e56e7d
--- /dev/null
+++ b/activerecord/lib/active_record/associations/join_dependency/join_part.rb
@@ -0,0 +1,78 @@
+module ActiveRecord
+  module Associations
+    class JoinDependency # :nodoc:
+      # A JoinPart represents a part of a JoinDependency. It is an abstract class, inherited
+      # by JoinBase and JoinAssociation. A JoinBase represents the Active Record which
+      # everything else is being joined onto. A JoinAssociation represents an association which
+      # is joining to the base. A JoinAssociation may result in more than one actual join
+      # operations (for example a has_and_belongs_to_many JoinAssociation would result in
+      # two; one for the join table and one for the target table).
+      class JoinPart # :nodoc:
+        # The Active Record class which this join part is associated 'about'; for a JoinBase
+        # this is the actual base model, for a JoinAssociation this is the target model of the
+        # association.
+        attr_reader :active_record
+
+        delegate :table_name, :column_names, :primary_key, :reflections, :arel_engine, :to => :active_record
+
+        def initialize(active_record)
+          @active_record = active_record
+          @cached_record = {}
+          @column_names_with_alias = nil
+        end
+
+        def aliased_table
+          Arel::Nodes::TableAlias.new aliased_table_name, table
+        end
+
+        def ==(other)
+          raise NotImplementedError
+        end
+
+        # An Arel::Table for the active_record
+        def table
+          raise NotImplementedError
+        end
+
+        # The prefix to be used when aliasing columns in the active_record's table
+        def aliased_prefix
+          raise NotImplementedError
+        end
+
+        # The alias for the active_record's table
+        def aliased_table_name
+          raise NotImplementedError
+        end
+
+        # The alias for the primary key of the active_record's table
+        def aliased_primary_key
+          "#{aliased_prefix}_r0"
+        end
+
+        # An array of [column_name, alias] pairs for the table
+        def column_names_with_alias
+          unless @column_names_with_alias
+            @column_names_with_alias = []
+
+            ([primary_key] + (column_names - [primary_key])).each_with_index do |column_name, i|
+              @column_names_with_alias << [column_name, "#{aliased_prefix}_r#{i}"]
+            end
+          end
+          @column_names_with_alias
+        end
+
+        def extract_record(row)
+          Hash[column_names_with_alias.map{|cn, an| [cn, row[an]]}]
+        end
+
+        def record_id(row)
+          row[aliased_primary_key]
+        end
+
+        def instantiate(row)
+          @cached_record[record_id(row)] ||= active_record.send(:instantiate, extract_record(row))
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 7f32e5538e..426000fde1 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -187,7 +187,7 @@ module ActiveRecord
 
     def find_with_associations
       including = (@eager_load_values + @includes_values).uniq
-      join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, [])
+      join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, including, [])
       relation = construct_relation_for_association_find(join_dependency)
       rows = connection.select_all(relation.to_sql, 'SQL', relation.bind_values)
       join_dependency.instantiate(rows)
@@ -197,7 +197,7 @@ module ActiveRecord
 
     def construct_relation_for_association_calculations
       including = (@eager_load_values + @includes_values).uniq
-      join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, including, arel.froms.first)
+      join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, including, arel.froms.first)
       relation = except(:includes, :eager_load, :preload)
       apply_join_dependency(relation, join_dependency)
     end
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 4330d850fe..cd1d7108b3 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -236,7 +236,7 @@ module ActiveRecord
           'string_join'
         when Hash, Symbol, Array
           'association_join'
-        when ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
+        when ActiveRecord::Associations::JoinDependency::JoinAssociation
           'stashed_join'
         when Arel::Nodes::Join
           'join_node'
@@ -254,7 +254,7 @@ module ActiveRecord
 
       join_list = custom_join_ast(manager, string_joins)
 
-      join_dependency = ActiveRecord::Associations::ClassMethods::JoinDependency.new(
+      join_dependency = ActiveRecord::Associations::JoinDependency.new(
         @klass,
         association_joins,
         join_list
-- 
cgit v1.2.3


From 19c763f7831e08606e6b4fa516f5ad3b00c6428f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 15:47:03 -0800
Subject: reduce two method calls per request, 1 to method_missing and one to
 send

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

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index c3927b6613..e447209242 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -42,6 +42,10 @@ module Rails
       set_environment
     end
 
+    def app
+      @app ||= super.instance
+    end
+
     def opt_parser
       Options.new
     end
-- 
cgit v1.2.3


From 54fdd33f33e6d42cf034a19cf64c6c52426de872 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 16:30:14 -0800
Subject: use a subclass of AS::TZ for testing html output

---
 actionpack/test/template/date_helper_test.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index b4eb3f76e1..aca2fef170 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1882,10 +1882,17 @@ class DateHelperTest < ActionView::TestCase
   end
 
   def test_datetime_select_defaults_to_time_zone_now_when_config_time_zone_is_set
-    time = stub(:year => 2004, :month => 6, :day => 15, :hour => 16, :min => 35, :sec => 0)
-    time_zone = mock()
-    time_zone.expects(:now).returns time
-    Time.zone = time_zone
+    # The love zone is UTC+0
+    mytz = Class.new(ActiveSupport::TimeZone) {
+      attr_accessor :now
+    }.create('tenderlove', 0)
+
+    now       = Time.mktime(2004, 6, 15, 16, 35, 0)
+    mytz.now  = now
+    Time.zone = mytz
+
+    assert_equal mytz, Time.zone
+
     @post = Post.new
 
     expected = %{<select id="post_updated_at_1i" name="post[updated_at(1i)]">\n}
-- 
cgit v1.2.3


From 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 17:54:00 -0800
Subject: compute ext in initialize, and use an attr_reader

---
 actionpack/lib/action_dispatch/middleware/static.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 913b899e20..40c85d420a 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -2,11 +2,16 @@ require 'rack/utils'
 
 module ActionDispatch
   class FileHandler
+    attr_reader :ext
+
     def initialize(at, root)
       @at, @root = at.chomp('/'), root.chomp('/')
       @compiled_at = (Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?)
       @compiled_root = Regexp.compile(/^#{Regexp.escape(root)}/)
       @file_server = ::Rack::File.new(@root)
+
+      ext = ::ActionController::Base.page_cache_extension
+      @ext = "{,#{ext},/index#{ext}}"
     end
 
     def match?(path)
@@ -27,13 +32,6 @@ module ActionDispatch
     def call(env)
       @file_server.call(env)
     end
-
-    def ext
-      @ext ||= begin
-        ext = ::ActionController::Base.page_cache_extension
-        "{,#{ext},/index#{ext}}"
-      end
-    end
   end
 
   class Static
-- 
cgit v1.2.3


From f279422e3346314ebec6b2156534c0fa5ebd5a98 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 18:03:06 -0800
Subject: no need to pass a regex to Regexp.compile

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

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 40c85d420a..c5598f3e56 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -5,10 +5,10 @@ module ActionDispatch
     attr_reader :ext
 
     def initialize(at, root)
-      @at, @root = at.chomp('/'), root.chomp('/')
-      @compiled_at = (Regexp.compile(/^#{Regexp.escape(at)}/) unless @at.blank?)
-      @compiled_root = Regexp.compile(/^#{Regexp.escape(root)}/)
-      @file_server = ::Rack::File.new(@root)
+      @at, @root     = at.chomp('/'), root.chomp('/')
+      @compiled_at   = /^#{Regexp.escape(at)}/ unless @at.blank?
+      @compiled_root = /^#{Regexp.escape(root)}/
+      @file_server   = ::Rack::File.new(@root)
 
       ext = ::ActionController::Base.page_cache_extension
       @ext = "{,#{ext},/index#{ext}}"
-- 
cgit v1.2.3


From 46bb4242874fe716268e3bb7b1ce3bb3c2d883e4 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 28 Feb 2011 19:47:09 -0800
Subject: Revert "compute ext in initialize, and use an attr_reader"

This reverts commit 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9.

Conflicts:

	actionpack/lib/action_dispatch/middleware/static.rb
---
 actionpack/lib/action_dispatch/middleware/static.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index c5598f3e56..5076567bd4 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -2,16 +2,11 @@ require 'rack/utils'
 
 module ActionDispatch
   class FileHandler
-    attr_reader :ext
-
     def initialize(at, root)
       @at, @root     = at.chomp('/'), root.chomp('/')
       @compiled_at   = /^#{Regexp.escape(at)}/ unless @at.blank?
       @compiled_root = /^#{Regexp.escape(root)}/
       @file_server   = ::Rack::File.new(@root)
-
-      ext = ::ActionController::Base.page_cache_extension
-      @ext = "{,#{ext},/index#{ext}}"
     end
 
     def match?(path)
@@ -32,6 +27,13 @@ module ActionDispatch
     def call(env)
       @file_server.call(env)
     end
+
+    def ext
+      @ext ||= begin
+        ext = ::ActionController::Base.page_cache_extension
+        "{,#{ext},/index#{ext}}"
+      end
+    end
   end
 
   class Static
-- 
cgit v1.2.3


From 9cf3b1f6719e1fe917f5abe56be6fee157bc3c13 Mon Sep 17 00:00:00 2001
From: Sam Elliott <sam@lenary.co.uk>
Date: Mon, 28 Feb 2011 22:17:38 +0000
Subject: Remove warnings about redefined test methods

[#6490 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 activesupport/test/inflector_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index f55116dfab..1670d9ee7d 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -51,21 +51,21 @@ class InflectorTest < Test::Unit::TestCase
   end
 
   SingularToPlural.each do |singular, plural|
-    define_method "test_pluralize_#{singular}" do
+    define_method "test_pluralize_singular_#{singular}" do
       assert_equal(plural, ActiveSupport::Inflector.pluralize(singular))
       assert_equal(plural.capitalize, ActiveSupport::Inflector.pluralize(singular.capitalize))
     end
   end
 
   SingularToPlural.each do |singular, plural|
-    define_method "test_singularize_#{plural}" do
+    define_method "test_singularize_plural_#{plural}" do
       assert_equal(singular, ActiveSupport::Inflector.singularize(plural))
       assert_equal(singular.capitalize, ActiveSupport::Inflector.singularize(plural.capitalize))
     end
   end
-  
+
   SingularToPlural.each do |singular, plural|
-    define_method "test_pluralize_#{plural}" do
+    define_method "test_pluralize_plural_#{plural}" do
       assert_equal(plural, ActiveSupport::Inflector.pluralize(plural))
       assert_equal(plural.capitalize, ActiveSupport::Inflector.pluralize(plural.capitalize))
     end
-- 
cgit v1.2.3


From e477fc1147b4bfe83a26d4ce818167a1b561b8fc Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Mar 2011 10:11:32 -0800
Subject: fixing test case test on 1.9.3dev

---
 activesupport/test/test_case_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 7e65c63062..756d21b3e4 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -12,6 +12,10 @@ module ActiveSupport
       def puke(klass, name, e)
         @puked << [klass, name, e]
       end
+
+      def options
+        nil
+      end
     end
 
     if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-- 
cgit v1.2.3


From 648fd60ecf72e77c6326aac63244d9305611ed0c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Mar 2011 10:14:01 -0800
Subject: prefer composition over inheritance with AD::MS

---
 actionpack/CHANGELOG                               |  4 ++
 actionpack/lib/action_controller/metal.rb          |  2 +-
 actionpack/lib/action_dispatch/middleware/stack.rb | 45 ++++++++++++++++++----
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index ee9d30e1fb..fc3410ba6e 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,9 @@
 *Rails 3.1.0 (unreleased)*
 
+* 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]
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index b2c8053584..e5db31061b 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -36,7 +36,7 @@ module ActionController
       action = action.to_s
       raise "MiddlewareStack#build requires an app" unless app
 
-      reverse.inject(app) do |a, middleware|
+      middlewares.reverse.inject(app) do |a, middleware|
         middleware.valid?(action) ?
           middleware.build(a) : a
       end
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index e3cd779756..852f697d91 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -2,7 +2,7 @@ require "active_support/inflector/methods"
 require "active_support/dependencies"
 
 module ActionDispatch
-  class MiddlewareStack < Array
+  class MiddlewareStack
     class Middleware
       attr_reader :args, :block
 
@@ -41,18 +41,43 @@ module ActionDispatch
       end
     end
 
-    # Use this instead of super to work around a warning.
-    alias :array_initialize :initialize
+    include Enumerable
+
+    attr_accessor :middlewares
 
     def initialize(*args)
-      array_initialize(*args)
+      @middlewares = []
       yield(self) if block_given?
     end
 
+    def each
+      @middlewares.each { |x| yield x }
+    end
+
+    def size
+      middlewares.size
+    end
+
+    def last
+      middlewares.last
+    end
+
+    def [](i)
+      middlewares[i]
+    end
+
+    def include?(item)
+      middlewares.include? item
+    end
+
+    def initialize_copy(other)
+      self.middlewares = other.middlewares.dup
+    end
+
     def insert(index, *args, &block)
       index = assert_index(index, :before)
       middleware = self.class::Middleware.new(*args, &block)
-      super(index, middleware)
+      middlewares.insert(index, middleware)
     end
 
     alias_method :insert_before, :insert
@@ -67,21 +92,25 @@ module ActionDispatch
       delete(target)
     end
 
+    def delete(target)
+      middlewares.delete target
+    end
+
     def use(*args, &block)
       middleware = self.class::Middleware.new(*args, &block)
-      push(middleware)
+      middlewares.push(middleware)
     end
 
     def build(app = nil, &block)
       app ||= block
       raise "MiddlewareStack#build requires an app" unless app
-      reverse.inject(app) { |a, e| e.build(a) }
+      middlewares.reverse.inject(app) { |a, e| e.build(a) }
     end
 
   protected
 
     def assert_index(index, where)
-      i = index.is_a?(Integer) ? index : self.index(index)
+      i = index.is_a?(Integer) ? index : middlewares.index(index)
       raise "No such middleware to insert #{where}: #{index.inspect}" unless i
       i
     end
-- 
cgit v1.2.3


From fd26afc93be89df62584f6b28bd26ec9eea7ff00 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Mar 2011 10:21:44 -0800
Subject: Enumerable gives us include?, so remove include?

---
 actionpack/lib/action_dispatch/middleware/stack.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index 852f697d91..a5f651297a 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -66,10 +66,6 @@ module ActionDispatch
       middlewares[i]
     end
 
-    def include?(item)
-      middlewares.include? item
-    end
-
     def initialize_copy(other)
       self.middlewares = other.middlewares.dup
     end
-- 
cgit v1.2.3


From 24faddd60c5fd148c8264898aeca2d5f36b25a4b Mon Sep 17 00:00:00 2001
From: Alexander Uvarov <alexander.uvarov@gmail.com>
Date: Sun, 13 Feb 2011 22:27:33 +0500
Subject: Move ActiveModel::AttributeMethods#attribute_methods_generated? to
 ActiveRecord, so it's flexible now
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[#6428 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activemodel/CHANGELOG                              |  2 +
 activemodel/lib/active_model/attribute_methods.rb  | 44 ++++++++++------------
 activemodel/test/cases/attribute_methods_test.rb   | 10 +++--
 .../lib/active_record/attribute_methods.rb         | 11 ++++++
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 9dd5e03685..3082c7186a 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -2,6 +2,8 @@
 
 * 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]
+
 
 *Rails 3.0.2 (unreleased)*
 
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 8f3782eb48..2a99450a3d 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -260,30 +260,30 @@ module ActiveModel
       #     end
       #   end
       def define_attribute_methods(attr_names)
-        return if attribute_methods_generated?
-        attr_names.each do |attr_name|
-          attribute_method_matchers.each do |matcher|
-            unless instance_method_already_implemented?(matcher.method_name(attr_name))
-              generate_method = "define_method_#{matcher.prefix}attribute#{matcher.suffix}"
+        attr_names.each { |attr_name| define_attribute_method(attr_name) }
+      end
+
+      def define_attribute_method(attr_name)
+        attribute_method_matchers.each do |matcher|
+          unless instance_method_already_implemented?(matcher.method_name(attr_name))
+            generate_method = "define_method_#{matcher.prefix}attribute#{matcher.suffix}"
 
-              if respond_to?(generate_method)
-                send(generate_method, attr_name)
-              else
-                method_name = matcher.method_name(attr_name)
+            if respond_to?(generate_method)
+              send(generate_method, attr_name)
+            else
+              method_name = matcher.method_name(attr_name)
 
-                generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
-                  if method_defined?('#{method_name}')
-                    undef :'#{method_name}'
-                  end
-                  define_method('#{method_name}') do |*args|
-                    send('#{matcher.method_missing_target}', '#{attr_name}', *args)
-                  end
-                STR
-              end
+              generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+                if method_defined?('#{method_name}')
+                  undef :'#{method_name}'
+                end
+                define_method('#{method_name}') do |*args|
+                  send('#{matcher.method_missing_target}', '#{attr_name}', *args)
+                end
+              STR
             end
           end
         end
-        @attribute_methods_generated = true
       end
 
       # Removes all the previously dynamically defined methods from the class
@@ -291,7 +291,6 @@ module ActiveModel
         generated_attribute_methods.module_eval do
           instance_methods.each { |m| undef_method(m) }
         end
-        @attribute_methods_generated = nil
       end
 
       # Returns true if the attribute methods defined have been generated.
@@ -303,11 +302,6 @@ module ActiveModel
         end
       end
 
-      # Returns true if the attribute methods defined have been generated.
-      def attribute_methods_generated?
-        @attribute_methods_generated ||= nil
-      end
-
       protected
         def instance_method_already_implemented?(method_name)
           method_defined?(method_name)
diff --git a/activemodel/test/cases/attribute_methods_test.rb b/activemodel/test/cases/attribute_methods_test.rb
index 422aa25668..b001adb35a 100644
--- a/activemodel/test/cases/attribute_methods_test.rb
+++ b/activemodel/test/cases/attribute_methods_test.rb
@@ -42,10 +42,16 @@ class AttributeMethodsTest < ActiveModel::TestCase
                      ModelWithAttributes2.send(:attribute_method_matchers)
   end
 
+  test '#define_attribute_method generates attribute method' do
+    ModelWithAttributes.define_attribute_method(:foo)
+
+    assert_respond_to ModelWithAttributes.new, :foo
+    assert_equal "value of foo", ModelWithAttributes.new.foo
+  end
+
   test '#define_attribute_methods generates attribute methods' do
     ModelWithAttributes.define_attribute_methods([:foo])
 
-    assert ModelWithAttributes.attribute_methods_generated?
     assert_respond_to ModelWithAttributes.new, :foo
     assert_equal "value of foo", ModelWithAttributes.new.foo
   end
@@ -53,7 +59,6 @@ class AttributeMethodsTest < ActiveModel::TestCase
   test '#define_attribute_methods generates attribute methods with spaces in their names' do
     ModelWithAttributesWithSpaces.define_attribute_methods([:'foo bar'])
   
-    assert ModelWithAttributesWithSpaces.attribute_methods_generated?
     assert_respond_to ModelWithAttributesWithSpaces.new, :'foo bar'
     assert_equal "value of foo bar", ModelWithAttributesWithSpaces.new.send(:'foo bar')
   end
@@ -69,7 +74,6 @@ class AttributeMethodsTest < ActiveModel::TestCase
     ModelWithAttributes.define_attribute_methods([:foo])
     ModelWithAttributes.undefine_attribute_methods
 
-    assert !ModelWithAttributes.attribute_methods_generated?
     assert !ModelWithAttributes.new.respond_to?(:foo)
     assert_raises(NoMethodError) { ModelWithAttributes.new.foo }
   end
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 284ae2bebc..5833c65893 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -10,7 +10,18 @@ module ActiveRecord
       # Generates all the attribute related methods for columns in the database
       # accessors, mutators and query methods.
       def define_attribute_methods
+        return if attribute_methods_generated?
         super(column_names)
+        @attribute_methods_generated = true
+      end
+
+      def attribute_methods_generated?
+        @attribute_methods_generated ||= false
+      end
+
+      def undefine_attribute_methods(*args)
+        super
+        @attribute_methods_generated = false
       end
 
       # Checks whether the method is defined in the model or any of its subclasses
-- 
cgit v1.2.3


From 50ed1a25a4e496a7a67861b1a04d667bd3445bb6 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Mar 2011 13:28:59 -0800
Subject: initialize ivars

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

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 5076567bd4..c57f694c4d 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -4,7 +4,7 @@ module ActionDispatch
   class FileHandler
     def initialize(at, root)
       @at, @root     = at.chomp('/'), root.chomp('/')
-      @compiled_at   = /^#{Regexp.escape(at)}/ unless @at.blank?
+      @compiled_at   = @at.blank? ? nil : /^#{Regexp.escape(at)}/
       @compiled_root = /^#{Regexp.escape(root)}/
       @file_server   = ::Rack::File.new(@root)
     end
-- 
cgit v1.2.3


From 7b6bfe84f332a3c99656f73cf0251bce0a16ba88 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Mar 2011 17:20:10 -0800
Subject: refactor Reference to a ClassCache object, fix lazy lookup in
 Middleware so that anonymous classes are supported

---
 actionpack/lib/action_dispatch/middleware/stack.rb | 13 +++-
 .../lib/action_dispatch/routing/route_set.rb       |  5 +-
 .../dispatch/middleware_stack/middleware_test.rb   | 50 +++++++++++++
 activesupport/CHANGELOG                            |  6 ++
 activesupport/lib/active_support/dependencies.rb   | 43 +++++++++---
 activesupport/test/class_cache_test.rb             | 81 ++++++++++++++++++++++
 activesupport/test/dependencies_test.rb            |  6 +-
 7 files changed, 185 insertions(+), 19 deletions(-)
 create mode 100644 actionpack/test/dispatch/middleware_stack/middleware_test.rb
 create mode 100644 activesupport/test/class_cache_test.rb

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index a5f651297a..fe87abb4d0 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -7,12 +7,19 @@ module ActionDispatch
       attr_reader :args, :block
 
       def initialize(klass_or_name, *args, &block)
-        @ref = ActiveSupport::Dependencies::Reference.new(klass_or_name)
+        @klass = nil
+        @name  = klass_or_name
+
+        if klass_or_name.respond_to?(:name)
+          @klass = klass_or_name
+          @name  = @klass.name
+        end
+
         @args, @block = args, block
       end
 
       def klass
-        @ref.get
+        @klass ||= ActiveSupport::Inflector.constantize(@name)
       end
 
       def ==(middleware)
@@ -22,7 +29,7 @@ module ActionDispatch
         when Class
           klass == middleware
         else
-          normalize(@ref.name) == normalize(middleware)
+          normalize(@name) == normalize(middleware)
         end
       end
 
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 4b4e9da173..2f764f88dc 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -50,12 +50,13 @@ module ActionDispatch
       private
 
         def controller_reference(controller_param)
+          controller_name = "#{controller_param.camelize}Controller"
+
           unless controller = @controllers[controller_param]
-            controller_name = "#{controller_param.camelize}Controller"
             controller = @controllers[controller_param] =
               ActiveSupport::Dependencies.ref(controller_name)
           end
-          controller.get
+          controller.get(controller_name)
         end
 
         def dispatch(controller, action, env)
diff --git a/actionpack/test/dispatch/middleware_stack/middleware_test.rb b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
new file mode 100644
index 0000000000..aedd5feb38
--- /dev/null
+++ b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
@@ -0,0 +1,50 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/stack'
+
+module ActionDispatch
+  class MiddlewareStack
+    class MiddlewareTest < ActiveSupport::TestCase
+      class Omg; end
+
+      {
+        'concrete'  => Omg,
+        'anonymous' => Class.new
+      }.each do |name, klass|
+
+        define_method("test_#{name}_klass") do
+          mw = Middleware.new klass
+          assert_equal klass, mw.klass
+        end
+
+        define_method("test_#{name}_==") do
+          mw1 = Middleware.new klass
+          mw2 = Middleware.new klass
+          assert_equal mw1, mw2
+        end
+
+      end
+
+      def test_string_class
+        mw = Middleware.new Omg.name
+        assert_equal Omg, mw.klass
+      end
+
+      def test_double_equal_works_with_classes
+        k = Class.new
+        mw = Middleware.new k
+        assert_operator mw, :==, k
+        assert_operator mw, :!=, Class.new
+      end
+
+      def test_double_equal_works_with_strings
+        mw = Middleware.new Omg
+        assert_operator mw, :==, Omg.name
+      end
+
+      def test_double_equal_normalizes_strings
+        mw = Middleware.new Omg
+        assert_operator mw, :==, "::#{Omg.name}"
+      end
+    end
+  end
+end
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 1b8bcf649c..99cea2586b 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,11 @@
 *Rails 3.1.0 (unreleased)*
 
+* 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]
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index dab6fdbac6..94a8608aeb 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -524,31 +524,52 @@ module ActiveSupport #:nodoc:
       explicitly_unloadable_constants.each { |const| remove_constant const }
     end
 
-    class Reference
-      @@constants = Hash.new { |h, k| h[k] = Inflector.constantize(k) }
+    class ClassCache
+      def initialize
+        @store = Hash.new { |h, k| h[k] = Inflector.constantize(k) }
+      end
+
+      def empty?
+        @store.empty?
+      end
+
+      def key?(key)
+        @store.key?(key)
+      end
 
-      attr_reader :name
+      def []=(key, value)
+        return unless key.respond_to?(:name)
 
-      def initialize(name)
-        @name = name.to_s
-        @@constants[@name] = name if name.respond_to?(:name)
+        raise(ArgumentError, 'anonymous classes cannot be cached') unless key.name
+
+        @store[key.name] = value
+      end
+
+      def [](key)
+        key = key.name if key.respond_to?(:name)
+
+        @store[key]
       end
+      alias :get :[]
 
-      def get
-        @@constants[@name]
+      def new(name)
+        self[name] = name
+        self
       end
 
-      def self.clear!
-        @@constants.clear
+      def clear!
+        @store.clear
       end
     end
 
+    Reference = ClassCache.new
+
     def ref(name)
       references[name] ||= Reference.new(name)
     end
 
     def constantize(name)
-      ref(name).get
+      ref(name).get(name)
     end
 
     # Determine if the given constant has been automatically loaded.
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
new file mode 100644
index 0000000000..3d3ae559e5
--- /dev/null
+++ b/activesupport/test/class_cache_test.rb
@@ -0,0 +1,81 @@
+require 'abstract_unit'
+require 'active_support/dependencies'
+
+module ActiveSupport
+  module Dependencies
+    class ClassCacheTest < ActiveSupport::TestCase
+      def setup
+        @cache = ClassCache.new
+      end
+
+      def test_empty?
+        assert @cache.empty?
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert !@cache.empty?
+      end
+
+      def test_clear!
+        assert @cache.empty?
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert !@cache.empty?
+        @cache.clear!
+        assert @cache.empty?
+      end
+
+      def test_set_key
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert @cache.key?(ClassCacheTest.name)
+      end
+
+      def test_set_rejects_strings
+        @cache[ClassCacheTest.name] = ClassCacheTest
+        assert @cache.empty?
+      end
+
+      def test_get_with_class
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert_equal ClassCacheTest, @cache[ClassCacheTest]
+      end
+
+      def test_get_with_name
+        @cache[ClassCacheTest] = ClassCacheTest
+        assert_equal ClassCacheTest, @cache[ClassCacheTest.name]
+      end
+
+      def test_get_constantizes
+        assert @cache.empty?
+        assert_equal ClassCacheTest, @cache[ClassCacheTest.name]
+      end
+
+      def test_get_is_an_alias
+        assert_equal @cache[ClassCacheTest], @cache.get(ClassCacheTest.name)
+      end
+
+      def test_new
+        @cache.new ClassCacheTest
+        assert @cache.key?(ClassCacheTest.name)
+      end
+
+      def test_new_rejects_strings
+        @cache.new ClassCacheTest.name
+        assert !@cache.key?(ClassCacheTest.name)
+      end
+
+      def test_new_returns_self
+        v = @cache.new ClassCacheTest.name
+        assert_equal @cache, v
+      end
+
+      def test_anonymous_class_fail
+        assert_raises(ArgumentError) do
+          @cache.new Class.new
+        end
+
+        assert_raises(ArgumentError) do
+          x = Class.new
+          @cache[x] = x
+        end
+      end
+    end
+  end
+end
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index bc7f597f1d..b3ada53497 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -479,13 +479,13 @@ class DependenciesTest < Test::Unit::TestCase
     with_loading 'dependencies' do
       c = ActiveSupport::Dependencies.ref("ServiceOne")
       service_one_first = ServiceOne
-      assert_equal service_one_first, c.get
+      assert_equal service_one_first, c.get("ServiceOne")
       ActiveSupport::Dependencies.clear
       assert ! defined?(ServiceOne)
 
       service_one_second = ServiceOne
-      assert_not_equal service_one_first, c.get
-      assert_equal service_one_second, c.get
+      assert_not_equal service_one_first, c.get("ServiceOne")
+      assert_equal service_one_second, c.get("ServiceOne")
     end
   end
 
-- 
cgit v1.2.3


From f345e2380cac2560f3bbd80defe1ef485e0d564e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Tue, 1 Mar 2011 17:43:45 -0800
Subject: yo dawg, directly use the class cache rather than the cache of the
 cache

---
 actionpack/lib/action_dispatch/middleware/stack.rb | 3 ++-
 activesupport/lib/active_support/dependencies.rb   | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index fe87abb4d0..d9bfd3d573 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -8,11 +8,12 @@ module ActionDispatch
 
       def initialize(klass_or_name, *args, &block)
         @klass = nil
-        @name  = klass_or_name
 
         if klass_or_name.respond_to?(:name)
           @klass = klass_or_name
           @name  = @klass.name
+        else
+          @name  = klass_or_name.to_s
         end
 
         @args, @block = args, block
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 94a8608aeb..d5c51ca417 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -47,9 +47,6 @@ module ActiveSupport #:nodoc:
     mattr_accessor :autoloaded_constants
     self.autoloaded_constants = []
 
-    mattr_accessor :references
-    self.references = {}
-
     # An array of constant names that need to be unloaded on every request. Used
     # to allow arbitrary constants to be marked for unloading.
     mattr_accessor :explicitly_unloadable_constants
@@ -565,11 +562,11 @@ module ActiveSupport #:nodoc:
     Reference = ClassCache.new
 
     def ref(name)
-      references[name] ||= Reference.new(name)
+      Reference.new(name)
     end
 
     def constantize(name)
-      ref(name).get(name)
+      Reference.get(name)
     end
 
     # Determine if the given constant has been automatically loaded.
-- 
cgit v1.2.3


From e4cf28f3a0491620787d8e06d3a47918c5accc9b Mon Sep 17 00:00:00 2001
From: Dalibor Nasevic <dalibor.nasevic@gmail.com>
Date: Wed, 2 Mar 2011 01:18:32 +0100
Subject: Fixed typos in asset_host_test

[#6501 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 actionmailer/test/asset_host_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actionmailer/test/asset_host_test.rb b/actionmailer/test/asset_host_test.rb
index 069860ff06..b24eca5fbb 100644
--- a/actionmailer/test/asset_host_test.rb
+++ b/actionmailer/test/asset_host_test.rb
@@ -29,7 +29,7 @@ class AssetHostTest < Test::Unit::TestCase
     assert_equal %Q{<img alt="Somelogo" src="http://www.example.com/images/somelogo.png" />}, mail.body.to_s.strip
   end
 
-  def test_asset_host_as_one_arguement_proc
+  def test_asset_host_as_one_argument_proc
     AssetHostMailer.config.asset_host = Proc.new { |source|
       if source.starts_with?('/images')
         "http://images.example.com"
@@ -41,7 +41,7 @@ class AssetHostTest < Test::Unit::TestCase
     assert_equal %Q{<img alt="Somelogo" src="http://images.example.com/images/somelogo.png" />}, mail.body.to_s.strip
   end
 
-  def test_asset_host_as_two_arguement_proc
+  def test_asset_host_as_two_argument_proc
     ActionController::Base.config.asset_host = Proc.new {|source,request|
       if request && request.ssl?
         "https://www.example.com"
-- 
cgit v1.2.3


From 2ee55557440a644453482a678e4ff08a4b5ebd3e Mon Sep 17 00:00:00 2001
From: Cheah Chu Yeow <chuyeow@gmail.com>
Date: Sun, 27 Feb 2011 22:57:46 +0800
Subject: 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.

Note that only GET and HTTP 200 responses can be cached.

[#6480 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 actionpack/lib/action_controller/caching/actions.rb | 8 +++++---
 actionpack/test/controller/caching_test.rb          | 5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index a4bac3caed..a1c582560c 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -103,12 +103,14 @@ module ActionController #:nodoc:
       end
 
       def _save_fragment(name, options)
-        return unless caching_allowed?
-
         content = response_body
         content = content.join if content.is_a?(Array)
 
-        write_fragment(name, content, options)
+        if caching_allowed?
+          write_fragment(name, content, options)
+        else
+          content
+        end
       end
 
     protected
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index cc393d3ef4..01f3e8f2b6 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -559,6 +559,11 @@ class ActionCacheTest < ActionController::TestCase
     assert_response 404
   end
 
+  def test_four_oh_four_renders_content
+    get :four_oh_four
+    assert_equal "404'd!", @response.body
+  end
+
   def test_simple_runtime_error_returns_500_for_multiple_requests
     get :simple_runtime_error
     assert_response 500
-- 
cgit v1.2.3


From 66245441d4471f29043433f6cf789498cf35b96c Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 09:18:05 -0800
Subject: adding backwards compat for class cache references. <3<3

---
 activesupport/lib/active_support/dependencies.rb | 13 ++++++++++++-
 activesupport/test/class_cache_test.rb           | 14 ++++++++++----
 activesupport/test/dependencies_test.rb          |  6 +++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index d5c51ca417..97e20bdaf4 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -549,10 +549,21 @@ module ActiveSupport #:nodoc:
       end
       alias :get :[]
 
+      class Getter # :nodoc:
+        def initialize(name)
+          @name = name
+        end
+
+        def get
+          Reference.get @name
+        end
+      end
+
       def new(name)
         self[name] = name
-        self
+        Getter.new(name)
       end
+      deprecate :new
 
       def clear!
         @store.clear
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
index 3d3ae559e5..4d19e9841a 100644
--- a/activesupport/test/class_cache_test.rb
+++ b/activesupport/test/class_cache_test.rb
@@ -52,7 +52,9 @@ module ActiveSupport
       end
 
       def test_new
-        @cache.new ClassCacheTest
+        assert_deprecated do
+          @cache.new ClassCacheTest
+        end
         assert @cache.key?(ClassCacheTest.name)
       end
 
@@ -61,9 +63,13 @@ module ActiveSupport
         assert !@cache.key?(ClassCacheTest.name)
       end
 
-      def test_new_returns_self
-        v = @cache.new ClassCacheTest.name
-        assert_equal @cache, v
+      def test_new_returns_proxy
+        v = nil
+        assert_deprecated do
+          v = @cache.new ClassCacheTest.name
+        end
+
+        assert_equal ClassCacheTest, v.get
       end
 
       def test_anonymous_class_fail
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index b3ada53497..bc7f597f1d 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -479,13 +479,13 @@ class DependenciesTest < Test::Unit::TestCase
     with_loading 'dependencies' do
       c = ActiveSupport::Dependencies.ref("ServiceOne")
       service_one_first = ServiceOne
-      assert_equal service_one_first, c.get("ServiceOne")
+      assert_equal service_one_first, c.get
       ActiveSupport::Dependencies.clear
       assert ! defined?(ServiceOne)
 
       service_one_second = ServiceOne
-      assert_not_equal service_one_first, c.get("ServiceOne")
-      assert_equal service_one_second, c.get("ServiceOne")
+      assert_not_equal service_one_first, c.get
+      assert_equal service_one_second, c.get
     end
   end
 
-- 
cgit v1.2.3


From 69e348013bc3ce4289c5fefc29c1aacc47048c0d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 09:31:40 -0800
Subject: adding deprecation noticies to deprecated class cache methods

---
 activesupport/lib/active_support/dependencies.rb | 13 ++++++++++++
 activesupport/test/class_cache_test.rb           | 27 +++++++++++++++++++++---
 activesupport/test/dependencies_test.rb          |  8 +++----
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 97e20bdaf4..4abeb74c45 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -557,6 +557,7 @@ module ActiveSupport #:nodoc:
         def get
           Reference.get @name
         end
+        deprecate :get
       end
 
       def new(name)
@@ -565,6 +566,11 @@ module ActiveSupport #:nodoc:
       end
       deprecate :new
 
+      def store(name)
+        self[name] = name
+        self
+      end
+
       def clear!
         @store.clear
       end
@@ -575,7 +581,14 @@ module ActiveSupport #:nodoc:
     def ref(name)
       Reference.new(name)
     end
+    deprecate :ref
+
+    # Store a reference to a class +klass+.
+    def reference(klass)
+      Reference.store klass
+    end
 
+    # Get the reference for class named +name+.
     def constantize(name)
       Reference.get(name)
     end
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
index 4d19e9841a..8445af8d25 100644
--- a/activesupport/test/class_cache_test.rb
+++ b/activesupport/test/class_cache_test.rb
@@ -59,28 +59,49 @@ module ActiveSupport
       end
 
       def test_new_rejects_strings
-        @cache.new ClassCacheTest.name
+        assert_deprecated do
+          @cache.new ClassCacheTest.name
+        end
         assert !@cache.key?(ClassCacheTest.name)
       end
 
+      def test_new_rejects_strings
+        @cache.store ClassCacheTest.name
+        assert !@cache.key?(ClassCacheTest.name)
+      end
+
+      def test_store_returns_self
+        x = @cache.store ClassCacheTest
+        assert_equal @cache, x
+      end
+
       def test_new_returns_proxy
         v = nil
         assert_deprecated do
           v = @cache.new ClassCacheTest.name
         end
 
-        assert_equal ClassCacheTest, v.get
+        assert_deprecated do
+          assert_equal ClassCacheTest, v.get
+        end
       end
 
       def test_anonymous_class_fail
         assert_raises(ArgumentError) do
-          @cache.new Class.new
+          assert_deprecated do
+            @cache.new Class.new
+          end
         end
 
         assert_raises(ArgumentError) do
           x = Class.new
           @cache[x] = x
         end
+
+        assert_raises(ArgumentError) do
+          x = Class.new
+          @cache.store x
+        end
       end
     end
   end
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index bc7f597f1d..ef017d7436 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -477,15 +477,15 @@ class DependenciesTest < Test::Unit::TestCase
 
   def test_references_should_work
     with_loading 'dependencies' do
-      c = ActiveSupport::Dependencies.ref("ServiceOne")
+      c = ActiveSupport::Dependencies.reference("ServiceOne")
       service_one_first = ServiceOne
-      assert_equal service_one_first, c.get
+      assert_equal service_one_first, c.get("ServiceOne")
       ActiveSupport::Dependencies.clear
       assert ! defined?(ServiceOne)
 
       service_one_second = ServiceOne
-      assert_not_equal service_one_first, c.get
-      assert_equal service_one_second, c.get
+      assert_not_equal service_one_first, c.get("ServiceOne")
+      assert_equal service_one_second, c.get("ServiceOne")
     end
   end
 
-- 
cgit v1.2.3


From dd41387f343e813c40dc997135207f4ac81c58ab Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 09:35:10 -0800
Subject: use newer class cache api

---
 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 2f764f88dc..fc86d52a3a 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -54,7 +54,7 @@ module ActionDispatch
 
           unless controller = @controllers[controller_param]
             controller = @controllers[controller_param] =
-              ActiveSupport::Dependencies.ref(controller_name)
+              ActiveSupport::Dependencies.reference(controller_name)
           end
           controller.get(controller_name)
         end
-- 
cgit v1.2.3


From 91983724211b0e654c9e79e73bacf10a65adf172 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 09:43:27 -0800
Subject: Ruby 1.8: Y U NO FUN?

---
 actionpack/test/dispatch/middleware_stack/middleware_test.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/actionpack/test/dispatch/middleware_stack/middleware_test.rb b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
index aedd5feb38..4e16fdbc77 100644
--- a/actionpack/test/dispatch/middleware_stack/middleware_test.rb
+++ b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
@@ -33,7 +33,9 @@ module ActionDispatch
         k = Class.new
         mw = Middleware.new k
         assert_operator mw, :==, k
-        assert_operator mw, :!=, Class.new
+
+        result = mw != Class.new
+        assert result, 'middleware should not equal other anon class'
       end
 
       def test_double_equal_works_with_strings
-- 
cgit v1.2.3


From 1f2e7214aaed01f50be12017f0ffbf9fcdbdbb5e Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 10:11:28 -0800
Subject: make sure string keys are always looked up from the class cache

---
 actionpack/lib/action_dispatch/middleware/stack.rb |  5 +++--
 .../dispatch/middleware_stack/middleware_test.rb   | 25 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index d9bfd3d573..a4308f528c 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -4,7 +4,7 @@ require "active_support/dependencies"
 module ActionDispatch
   class MiddlewareStack
     class Middleware
-      attr_reader :args, :block
+      attr_reader :args, :block, :name, :classcache
 
       def initialize(klass_or_name, *args, &block)
         @klass = nil
@@ -16,11 +16,12 @@ module ActionDispatch
           @name  = klass_or_name.to_s
         end
 
+        @classcache = ActiveSupport::Dependencies::Reference
         @args, @block = args, block
       end
 
       def klass
-        @klass ||= ActiveSupport::Inflector.constantize(@name)
+        @klass || classcache[@name]
       end
 
       def ==(middleware)
diff --git a/actionpack/test/dispatch/middleware_stack/middleware_test.rb b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
index 4e16fdbc77..9607f026db 100644
--- a/actionpack/test/dispatch/middleware_stack/middleware_test.rb
+++ b/actionpack/test/dispatch/middleware_stack/middleware_test.rb
@@ -47,6 +47,31 @@ module ActionDispatch
         mw = Middleware.new Omg
         assert_operator mw, :==, "::#{Omg.name}"
       end
+
+      def test_middleware_loads_classnames_from_cache
+        mw = Class.new(Middleware) {
+          attr_accessor :classcache
+        }.new(Omg.name)
+
+        fake_cache    = { mw.name => Omg }
+        mw.classcache = fake_cache
+
+        assert_equal Omg, mw.klass
+
+        fake_cache[mw.name] = Middleware
+        assert_equal Middleware, mw.klass
+      end
+
+      def test_middleware_always_returns_class
+        mw = Class.new(Middleware) {
+          attr_accessor :classcache
+        }.new(Omg)
+
+        fake_cache    = { mw.name => Middleware }
+        mw.classcache = fake_cache
+
+        assert_equal Omg, mw.klass
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 72405efe64c7f2d4fc759744b8facbd781f56165 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 10:23:04 -0800
Subject: anonymous classes have blank names on ruby 1.8

---
 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 4abeb74c45..9776eb6a79 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -537,7 +537,7 @@ module ActiveSupport #:nodoc:
       def []=(key, value)
         return unless key.respond_to?(:name)
 
-        raise(ArgumentError, 'anonymous classes cannot be cached') unless key.name
+        raise(ArgumentError, 'anonymous classes cannot be cached') if key.name.blank?
 
         @store[key.name] = value
       end
-- 
cgit v1.2.3


From 272ede9b9abeba6c987b66f047e24b472e99921d Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 10:42:43 -0800
Subject: require deprecation so that we can deprecate methods!

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

diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 9776eb6a79..47596a389d 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/deprecation'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/load_error'
 require 'active_support/core_ext/name_error'
-- 
cgit v1.2.3


From b7cf1f4ccfaac3b50c09df484062fdc92b340876 Mon Sep 17 00:00:00 2001
From: Dalibor Nasevic <dalibor.nasevic@gmail.com>
Date: Wed, 2 Mar 2011 01:55:22 +0100
Subject: No need of instance variable

[#6502 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 actionmailer/test/base_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 7ed9d4a5c0..1b793d255e 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -32,21 +32,21 @@ class BaseTest < ActiveSupport::TestCase
   end
 
   test "mail() with bcc, cc, content_type, charset, mime_version, reply_to and date" do
-    @time = Time.now.beginning_of_day.to_datetime
+    time  = Time.now.beginning_of_day.to_datetime
     email = BaseMailer.welcome(:bcc => 'bcc@test.lindsaar.net',
                                :cc  => 'cc@test.lindsaar.net',
                                :content_type => 'multipart/mixed',
                                :charset => 'iso-8559-1',
                                :mime_version => '2.0',
                                :reply_to => 'reply-to@test.lindsaar.net',
-                               :date => @time)
+                               :date => time)
     assert_equal(['bcc@test.lindsaar.net'],             email.bcc)
     assert_equal(['cc@test.lindsaar.net'],              email.cc)
     assert_equal('multipart/mixed; charset=iso-8559-1', email.content_type)
     assert_equal('iso-8559-1',                          email.charset)
     assert_equal('2.0',                                 email.mime_version)
     assert_equal(['reply-to@test.lindsaar.net'],        email.reply_to)
-    assert_equal(@time,                                 email.date)
+    assert_equal(time,                                  email.date)
   end
 
   test "mail() renders the template using the method being processed" do
-- 
cgit v1.2.3


From b247c8d71a54d684a1c307986a03d1759bbc20e0 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 14:04:41 -0800
Subject: * LocalCache strategy is now a real middleware class, not an
 anonymous class posing for pictures.

---
 activesupport/CHANGELOG                            |  3 ++
 .../active_support/cache/strategy/local_cache.rb   | 52 ++++++++++++----------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 99cea2586b..373236ce9a 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,8 @@
 *Rails 3.1.0 (unreleased)*
 
+* 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.
 
diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 4dce35f1c9..99b26b19fe 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -50,34 +50,40 @@ module ActiveSupport
           end
         end
 
-        # Middleware class can be inserted as a Rack handler to be local cache for the
-        # duration of request.
-        def middleware
-          @middleware ||= begin
-            klass = Class.new
-            klass.class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-              class << self
-                def name
-                  "ActiveSupport::Cache::Strategy::LocalCache"
-                end
-                alias :to_s :name
-              end
+        #--
+        # This class wraps up local storage for middlewares. Only the middleware method should
+        # construct them.
+        class Middleware # :nodoc:
+          attr_reader :name, :thread_local_key
+          alias :to_s :name
 
-              def initialize(app)
-                @app = app
-              end
+          def initialize(name, thread_local_key)
+            @name             = name
+            @thread_local_key = thread_local_key
+            @app              = nil
+          end
 
-              def call(env)
-                Thread.current[:#{thread_local_key}] = LocalStore.new
-                @app.call(env)
-              ensure
-                Thread.current[:#{thread_local_key}] = nil
-              end
-            EOS
-            klass
+          def new(app)
+            @app = app
+            self
+          end
+
+          def call(env)
+            Thread.current[thread_local_key] = LocalStore.new
+            @app.call(env)
+          ensure
+            Thread.current[thread_local_key] = nil
           end
         end
 
+        # Middleware class can be inserted as a Rack handler to be local cache for the
+        # duration of request.
+        def middleware
+          @middleware ||= Middleware.new(
+            "ActiveSupport::Cache::Strategy::LocalCache",
+            thread_local_key)
+        end
+
         def clear(options = nil) # :nodoc:
           local_cache.clear(options) if local_cache
           super
-- 
cgit v1.2.3


From dc89e29f4937a68e91cd7572f45f06c523430c23 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 15:17:13 -0800
Subject: remove to_s implementation so that inspect is helpful

---
 activesupport/lib/active_support/cache/strategy/local_cache.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 99b26b19fe..0649a058aa 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -55,7 +55,6 @@ module ActiveSupport
         # construct them.
         class Middleware # :nodoc:
           attr_reader :name, :thread_local_key
-          alias :to_s :name
 
           def initialize(name, thread_local_key)
             @name             = name
-- 
cgit v1.2.3


From 1db4969dc9cabed9db162e7194b9353d43c967d7 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 2 Mar 2011 15:17:29 -0800
Subject: only compute path.to_s once

---
 railties/lib/rails/engine.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 6e5e842370..7c26234750 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -382,7 +382,10 @@ module Rails
 
       # Finds engine with given path
       def find(path)
-        Rails::Engine::Railties.engines.find { |r| File.expand_path(r.root.to_s) == File.expand_path(path.to_s) }
+        path = path.to_s
+        Rails::Engine::Railties.engines.find { |r|
+          File.expand_path(r.root.to_s) == File.expand_path(path)
+        }
       end
     end
 
-- 
cgit v1.2.3


From f00a39845676bd552e31f47f3588ca266d4f010a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 4 Mar 2011 13:05:27 +0100
Subject: log and readme should respect --quiet

---
 railties/lib/rails/generators/actions.rb |  7 ++++---
 railties/test/generators/actions_test.rb | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index d7a86a5c40..c323df3e95 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -264,17 +264,18 @@ module Rails
       #   readme "README"
       #
       def readme(path)
-        say File.read(find_in_source_paths(path))
+        log File.read(find_in_source_paths(path))
       end
 
       protected
 
         # Define log for backwards compatibility. If just one argument is sent,
-        # invoke say, otherwise invoke say_status.
+        # invoke say, otherwise invoke say_status. Differently from say and
+        # similarly to say_status, this method respects the quiet? option given.
         #
         def log(*args)
           if args.size == 1
-            say args.first.to_s
+            say args.first.to_s unless options.quiet?
           else
             args << (self.behavior == :invoke ? :green : :red)
             say_status *args
diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 4b29afdc8f..68d4c17623 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -191,6 +191,31 @@ class ActionsTest < Rails::Generators::TestCase
     assert_match(/Welcome to Rails/, action(:readme, "README"))
   end
 
+  def test_readme_with_quiet
+    generator(default_arguments, :quiet => true)
+    run_generator
+    Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
+    assert_no_match(/Welcome to Rails/, action(:readme, "README"))
+  end
+
+  def test_log
+    assert_equal("YES\n", action(:log, "YES"))
+  end
+
+  def test_log_with_status
+    assert_equal("         yes  YES\n", action(:log, :yes, "YES"))
+  end
+
+  def test_log_with_quiet
+    generator(default_arguments, :quiet => true)
+    assert_equal("", action(:log, "YES"))
+  end
+
+  def test_log_with_status_with_quiet
+    generator(default_arguments, :quiet => true)
+    assert_equal("", action(:log, :yes, "YES"))
+  end
+
   protected
 
     def action(*args, &block)
-- 
cgit v1.2.3


From 0db915efd1240f493c50b7b9f5d1ea5f1e3eec10 Mon Sep 17 00:00:00 2001
From: Alexander Uvarov <alexander.uvarov@gmail.com>
Date: Fri, 25 Feb 2011 20:19:05 +0500
Subject: Add an option to FormBuilder to omit hidden field with id

[#4551 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 actionpack/lib/action_view/helpers/form_helper.rb |  24 +++-
 actionpack/test/template/form_helper_test.rb      | 135 ++++++++++++++++++++++
 2 files changed, 157 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index befaa3e8d9..669ccd2a2d 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -262,6 +262,24 @@ module ActionView
       #     ...
       #   </form>
       #
+      # === Removing hidden model id's
+      #
+      # The form_for method automatically includes the model id as a hidden field in the form.
+      # This is used to maintain the correlation between the form data and it's associated model.
+      # Some ORM systems do not use id's on nested models so in this case you want to be able
+      # to disable the hidden id.
+      #
+      # In the following example the Post model has many Comments stored within it in a NoSQL database,
+      # thus there is no primary key for comments.
+      #
+      # Example:
+      #
+      #   <%= form(@post) do |f| %>
+      #     <% f.fields_for(:comments, :include_id => false) do |cf| %>
+      #       ...
+      #     <% end %>
+      #   <% end %>
+      #
       # === Customized form builders
       #
       # You can also build forms using a customized FormBuilder class. Subclass
@@ -332,7 +350,7 @@ module ActionView
 
         options[:html][:remote] = options.delete(:remote)
         options[:html][:authenticity_token] = options.delete(:authenticity_token)
-        
+
         builder = options[:parent_builder] = instantiate_builder(object_name, object, options, &proc)
         fields_for = fields_for(object_name, object, options, &proc)
         default_options = builder.multipart? ? { :multipart => true } : {}
@@ -1326,7 +1344,9 @@ module ActionView
         def fields_for_nested_model(name, object, options, block)
           object = convert_to_model(object)
 
-          options[:hidden_field_id] = object.persisted?
+          parent_include_id = self.options.fetch(:include_id, true)
+          include_id = options.fetch(:include_id, parent_include_id)
+          options[:hidden_field_id] = object.persisted? && include_id
           @template.fields_for(name, object, options, &block)
         end
 
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 31da26de7f..359b078466 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1103,6 +1103,61 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association_with_disabled_hidden_id
+    @post.author = Author.new(321)
+
+    form_for(@post) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:author, :include_id => false) { |af|
+        af.text_field(:name)
+      }
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association_with_disabled_hidden_id_inherited
+    @post.author = Author.new(321)
+
+    form_for(@post, :include_id => false) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:author) { |af|
+        af.text_field(:name)
+      }
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association_with_disabled_hidden_id_override
+    @post.author = Author.new(321)
+
+    form_for(@post, :include_id => false) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:author, :include_id => true) { |af|
+        af.text_field(:name)
+      }
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_nested_fields_for_with_existing_records_on_a_nested_attributes_one_to_one_association_with_explicit_hidden_field_placement
     @post.author = Author.new(321)
 
@@ -1146,6 +1201,86 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_with_disabled_hidden_id
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+    @post.author = Author.new(321)
+
+    form_for(@post) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:author) { |af|
+        concat af.text_field(:name)
+      }
+      @post.comments.each do |comment|
+        concat f.fields_for(:comments, comment, :include_id => false) { |cf|
+          concat cf.text_field(:name)
+        }
+      end
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_with_disabled_hidden_id_inherited
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+    @post.author = Author.new(321)
+
+    form_for(@post, :include_id => false) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:author) { |af|
+        concat af.text_field(:name)
+      }
+      @post.comments.each do |comment|
+        concat f.fields_for(:comments, comment) { |cf|
+          concat cf.text_field(:name)
+        }
+      end
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
+  def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_with_disabled_hidden_id_override
+    @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
+    @post.author = Author.new(321)
+
+    form_for(@post, :include_id => false) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:author, :include_id => true) { |af|
+        concat af.text_field(:name)
+      }
+      @post.comments.each do |comment|
+        concat f.fields_for(:comments, comment) { |cf|
+          concat cf.text_field(:name)
+        }
+      end
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+      '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_nested_fields_for_with_existing_records_on_a_nested_attributes_collection_association_using_erb_and_inline_block
     @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
 
-- 
cgit v1.2.3


From 7872cc992bac76e976334d0c20649d69aad5652e Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Fri, 4 Mar 2011 12:04:22 -0300
Subject: refactored Time#<=> and DateTime#<=> by removing unnecessary calls
 without losing performance

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 .../lib/active_support/core_ext/date_time/calculations.rb   | 10 ++--------
 .../lib/active_support/core_ext/time/calculations.rb        | 13 ++-----------
 activesupport/lib/active_support/time_with_zone.rb          |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
index 8d01376f1d..8d924ad420 100644
--- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb
@@ -1,6 +1,4 @@
 require 'rational' unless RUBY_VERSION >= '1.9.2'
-require 'active_support/core_ext/object/acts_like'
-require 'active_support/core_ext/time/zones'
 
 class DateTime
   class << self
@@ -105,11 +103,7 @@ class DateTime
   end
 
   # Layers additional behavior on DateTime#<=> so that Time and ActiveSupport::TimeWithZone instances can be compared with a DateTime
-  def compare_with_coercion(other)
-    other = other.comparable_time if other.respond_to?(:comparable_time)
-    other = other.to_datetime unless other.acts_like?(:date)
-    compare_without_coercion(other)
+  def <=>(other)
+    super other.to_datetime
   end
-  alias_method :compare_without_coercion, :<=>
-  alias_method :<=>, :compare_with_coercion
 end
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 6e4b69f681..7e134db118 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -1,7 +1,4 @@
 require 'active_support/duration'
-require 'active_support/core_ext/date/acts_like'
-require 'active_support/core_ext/date/calculations'
-require 'active_support/core_ext/date_time/conversions'
 
 class Time
   COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
@@ -283,14 +280,8 @@ class Time
   # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances
   # can be chronologically compared with a Time
   def compare_with_coercion(other)
-    # if other is an ActiveSupport::TimeWithZone, coerce a Time instance from it so we can do <=> comparison
-    other = other.comparable_time if other.respond_to?(:comparable_time)
-    if other.acts_like?(:date)
-      # other is a Date/DateTime, so coerce self #to_datetime and hand off to DateTime#<=>
-      to_datetime.compare_without_coercion(other)
-    else
-      compare_without_coercion(other)
-    end
+    # we're avoiding Time#to_datetime cause it's expensive
+    other.is_a?(Time) ? compare_without_coercion(other.to_time) : to_datetime <=> other
   end
   alias_method :compare_without_coercion, :<=>
   alias_method :<=>, :compare_with_coercion
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 3da216ac78..c66aa78ce8 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -281,7 +281,7 @@ module ActiveSupport
 
     # A TimeWithZone acts like a Time, so just return +self+.
     def to_time
-      self
+      utc
     end
 
     def to_datetime
-- 
cgit v1.2.3


From 1f47061b483ed40b6acbecdab486f4733d708528 Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Fri, 4 Mar 2011 16:09:01 -0300
Subject: reverted tests deleted by 080345baca1076a9788d, refactored
 implementations should not invalidate the validations

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 activesupport/test/core_ext/time_ext_test.rb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 891a6badac..53d497013a 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -533,9 +533,19 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     Time::DATE_FORMATS.delete(:custom)
   end
 
-  def test_conversion_methods_are_publicized
-    assert Time.public_instance_methods.include?(:to_date)     || Time.public_instance_methods.include?('to_date')
-    assert Time.public_instance_methods.include?(:to_datetime) || Time.public_instance_methods.include?('to_datetime')
+  def test_to_date
+    assert_equal Date.new(2005, 2, 21), Time.local(2005, 2, 21, 17, 44, 30).to_date
+  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)
+    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)
+    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)
+    end
+    assert_equal ::Date::ITALY, Time.utc(2005, 2, 21, 17, 44, 30).to_datetime.start # use Ruby's default start value
   end
 
   def test_to_time
-- 
cgit v1.2.3


From 056f05adcd030634dc6a6e3054f25d80b7fd4445 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 4 Mar 2011 19:03:47 -0200
Subject: Make CI test with and without IM

---
 ci/ci_build.rb | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 964e2d4eb8..8dd104ec23 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -82,32 +82,72 @@ end
 rm_f "#{root_dir}/activerecord/debug.log"
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with MySQL"
+  puts "[CruiseControl] Building Active Record with MySQL IM enabled"
   puts
+  ENV['IM'] = true
   build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
   build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with MySQL2"
+  puts "[CruiseControl] Building Active Record with MySQL IM disabled"
   puts
+  ENV['IM'] = false
+  build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
+  build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with MySQL2 IM enabled"
+  puts
+  ENV['IM'] = true
+  build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
+  build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with MySQL2 IM disabled"
+  puts
+  ENV['IM'] = false
   build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
   build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with PostgreSQL"
+  puts "[CruiseControl] Building Active Record with PostgreSQL IM enabled"
   puts
+  ENV['IM'] = true
   build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
   build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building Active Record with SQLite 3"
+  puts "[CruiseControl] Building Active Record with PostgreSQL IM disabled"
+  puts
+  ENV['IM'] = false
+  build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
+  build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with SQLite 3 IM enabled"
+  puts
+  ENV['IM'] = true
+  build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
+  build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
+end
+
+cd "#{root_dir}/activerecord" do
+  puts
+  puts "[CruiseControl] Building Active Record with SQLite 3 IM disabled"
   puts
+  ENV['IM'] = false
   build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
   build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end
-- 
cgit v1.2.3


From af27262ec308784d2aaa59d48fd43bef5c2b9f89 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 4 Mar 2011 21:21:34 +0000
Subject: Fix a couple of tests in join_model_test.rb which were failing when
 the identity map is turned off

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

diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index 86904ea2bc..67752da2a5 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -191,8 +191,8 @@ module ActiveRecord
           else
             attributes[reflection.foreign_key] = owner[reflection.active_record_primary_key]
 
-            if options[:as]
-              attributes["#{options[:as]}_type"] = owner.class.base_class.name
+            if reflection.options[:as]
+              attributes[reflection.type] = owner.class.base_class.name
             end
           end
           attributes
-- 
cgit v1.2.3


From 8987cda2bb64fe289f7a28b2833a2786cfbc8259 Mon Sep 17 00:00:00 2001
From: Jon Leighton <j@jonathanleighton.com>
Date: Fri, 4 Mar 2011 22:29:40 +0000
Subject: When preloading has_and_belongs_to_many associations, we should only
 instantiate one AR object per actual record in the database. (Even when IM is
 off.)

---
 .../associations/preloader/has_and_belongs_to_many.rb    |  6 ++++--
 activerecord/test/cases/associations/eager_test.rb       | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
index e794f05340..24be279449 100644
--- a/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
+++ b/activerecord/lib/active_record/associations/preloader/has_and_belongs_to_many.rb
@@ -31,10 +31,12 @@ module ActiveRecord
         private
 
         # Once we have used the join table column (in super), we manually instantiate the
-        # actual records
+        # actual records, ensuring that we don't create more than one instances of the same
+        # record
         def associated_records_by_owner
+          records = {}
           super.each do |owner_key, rows|
-            rows.map! { |row| klass.instantiate(row) }
+            rows.map! { |row| records[row[klass.primary_key]] ||= klass.instantiate(row) }
           end
         end
 
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 26808ae931..48406a9b98 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -525,6 +525,22 @@ class EagerAssociationTest < ActiveRecord::TestCase
     assert posts[1].categories.include?(categories(:general))
   end
 
+  # This is only really relevant when the identity map is off. Since the preloader for habtm
+  # gets raw row hashes from the database and then instantiates them, this test ensures that
+  # it only instantiates one actual object per record from the database.
+  def test_has_and_belongs_to_many_should_not_instantiate_same_records_multiple_times
+    welcome    = posts(:welcome)
+    categories = Category.includes(:posts)
+
+    general    = categories.find { |c| c == categories(:general) }
+    technology = categories.find { |c| c == categories(:technology) }
+
+    post1 = general.posts.to_a.find { |p| p == posts(:welcome) }
+    post2 = technology.posts.to_a.find { |p| p == posts(:welcome) }
+
+    assert_equal post1.object_id, post2.object_id
+  end
+
   def test_eager_with_has_many_and_limit_and_conditions_on_the_eagers
     posts = authors(:david).posts.find(:all,
       :include    => :comments,
-- 
cgit v1.2.3


From 28f1c21b50c17f9be9ea581c3a878186efb5b9ec Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 4 Mar 2011 21:38:12 -0200
Subject: Fix CI

---
 ci/ci_build.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 8dd104ec23..c3af1f0177 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -84,7 +84,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with MySQL IM enabled"
   puts
-  ENV['IM'] = true
+  ENV['IM'] = 'true'
   build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
   build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
@@ -93,7 +93,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with MySQL IM disabled"
   puts
-  ENV['IM'] = false
+  ENV['IM'] = 'false'
   build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
   build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
@@ -102,7 +102,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with MySQL2 IM enabled"
   puts
-  ENV['IM'] = true
+  ENV['IM'] = 'true'
   build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
   build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
 end
@@ -111,7 +111,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with MySQL2 IM disabled"
   puts
-  ENV['IM'] = false
+  ENV['IM'] = 'false'
   build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
   build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
 end
@@ -120,7 +120,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with PostgreSQL IM enabled"
   puts
-  ENV['IM'] = true
+  ENV['IM'] = 'true'
   build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
   build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
 end
@@ -129,7 +129,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with PostgreSQL IM disabled"
   puts
-  ENV['IM'] = false
+  ENV['IM'] = 'false'
   build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
   build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
 end
@@ -138,7 +138,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with SQLite 3 IM enabled"
   puts
-  ENV['IM'] = true
+  ENV['IM'] = 'true'
   build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
   build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end
@@ -147,7 +147,7 @@ cd "#{root_dir}/activerecord" do
   puts
   puts "[CruiseControl] Building Active Record with SQLite 3 IM disabled"
   puts
-  ENV['IM'] = false
+  ENV['IM'] = 'false'
   build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
   build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end
-- 
cgit v1.2.3


From 3b10b8a201d9fbef831be81d7a4bc9b82c75a6f4 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Mar 2011 01:10:00 +0100
Subject: implements ActiveRecord::Base.connection_config to be able to check
 the configuration of the current connection at runtime

---
 activerecord/CHANGELOG                                         |  3 +++
 .../connection_adapters/abstract/connection_specification.rb   | 10 ++++++++++
 activerecord/test/cases/pooled_connections_test.rb             |  5 +++++
 3 files changed, 18 insertions(+)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 92848c8a7d..8b4e9a34cb 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,8 @@
 *Rails 3.1.0 (unreleased)*
 
+* 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:
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
index 3716937689..d88720c8bf 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
@@ -89,6 +89,16 @@ module ActiveRecord
         retrieve_connection
       end
 
+      # Returns the configuration of the associated connection as a hash:
+      #
+      #  ActiveRecord::Base.connection_config
+      #  # => {:pool=>5, :timeout=>5000, :database=>"db/development.sqlite3", :adapter=>"sqlite3"}
+      #
+      # Please use only for reading.
+      def connection_config
+        connection_pool.spec.config
+      end
+
       def connection_pool
         connection_handler.retrieve_connection_pool(self)
       end
diff --git a/activerecord/test/cases/pooled_connections_test.rb b/activerecord/test/cases/pooled_connections_test.rb
index 6269437b14..379cf5b44e 100644
--- a/activerecord/test/cases/pooled_connections_test.rb
+++ b/activerecord/test/cases/pooled_connections_test.rb
@@ -94,6 +94,11 @@ class PooledConnectionsTest < ActiveRecord::TestCase
     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}))
 
-- 
cgit v1.2.3


From feec2250bbb53428ae13ea928c68e378447bef81 Mon Sep 17 00:00:00 2001
From: Ilya Zayats <somebody32@gmail.com>
Date: Sat, 26 Feb 2011 07:49:50 +0300
Subject: added information about TEST_DIR env variable

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

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 1977f8d0ce..e00b26f948 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -101,6 +101,14 @@ $ cd actionpack
 $ 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
+</shell>
+
+
 h4. Warnings
 
 The test suite runs with warnings enabled. Ideally Ruby on Rails should issue no warning, but there may be a few, and also some from third-party libraries. Please ignore (or fix!) them if any, and submit patches that do not issue new warnings.
-- 
cgit v1.2.3


From 4c27ad0c23d8d8889221d5234496b39f1cc9bdb8 Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sat, 26 Feb 2011 12:59:27 -0500
Subject: Correct example that did not do what it claimed. Rework explanation.

---
 .../lib/active_support/core_ext/hash/reverse_merge.rb          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index a82cdfc360..87a7bebd7b 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -6,14 +6,14 @@ class Hash
   #     options.reverse_merge! :size => 25, :velocity => 10
   #   end
   #
-  # Using <tt>merge</tt>, the above example would look as follows:
+  # The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
+  # have the respective key.
+  #
+  # As contrast, using Ruby's built in <tt>merge</tt> would require writing the following:
   #
   #   def setup(options = {})
-  #     { :size => 25, :velocity => 10 }.merge(options)
+  #     options = { :size => 25, :velocity => 10 }.merge(options)
   #   end
-  #
-  # The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
-  # have the respective key.
   def reverse_merge(other_hash)
     other_hash.merge(self)
   end
-- 
cgit v1.2.3


From 8f526b30f49b8441dc80f00a42a58fc4ab61011a Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sat, 26 Feb 2011 13:28:40 -0500
Subject: Warn people that these methods are deprecated.

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

diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index e0b1bf6e83..8090d16fea 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -1045,6 +1045,8 @@ NOTE: Defined in +active_support/core_ext/class/attribute_accessors.rb+.
 
 h4. Class Inheritable Attributes
 
+WARNING: Class Inheritable Attributes are deprecated. It's recommended that you use +Class#class_attribute+ instead.
+
 Class variables are shared down the inheritance tree. Class instance variables are not shared, but they are not inherited either. The macros +class_inheritable_reader+, +class_inheritable_writer+, and +class_inheritable_accessor+ provide accessors for class-level data which is inherited but not shared with children:
 
 <ruby>
-- 
cgit v1.2.3


From ac4c5e97226fd70510ed49872f0ae41ba0d71c52 Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sat, 26 Feb 2011 13:36:47 -0500
Subject: Example descriptions and their examples were flipped. Fix.

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

diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb
index e15a1df9c9..d478ee0ef6 100644
--- a/activesupport/lib/active_support/core_ext/string/filters.rb
+++ b/activesupport/lib/active_support/core_ext/string/filters.rb
@@ -25,13 +25,13 @@ class String
   #   "Once upon a time in a world far far away".truncate(27)
   #   # => "Once upon a time in a wo..."
   #
-  # The last characters will be replaced with the <tt>:omission</tt> string (defaults to "...")
-  # for a total length not exceeding <tt>:length</tt>:
+  # Pass a <tt>:separator</tt> to truncate +text+ at a natural break:
   #
   #   "Once upon a time in a world far far away".truncate(27, :separator => ' ')
   #   # => "Once upon a time in a..."
   #
-  # Pass a <tt>:separator</tt> to truncate +text+ at a natural break:
+  # The last characters will be replaced with the <tt>:omission</tt> string (defaults to "...")
+  # for a total length not exceeding <tt>:length</tt>:
   #
   #   "And they found that many people were sleeping better.".truncate(25, :omission => "... (continued)")
   #   # => "And they f... (continued)"
-- 
cgit v1.2.3


From f305c608166e72217d8f47b227deb4db233cd879 Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sat, 26 Feb 2011 14:29:22 -0500
Subject: Clarify comment by removing french reference ('a la'). Should improve
 readability for non-native english speakers.

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

diff --git a/activesupport/lib/active_support/core_ext/enumerable.rb b/activesupport/lib/active_support/core_ext/enumerable.rb
index 6ecedc26ef..6d7f771b5d 100644
--- a/activesupport/lib/active_support/core_ext/enumerable.rb
+++ b/activesupport/lib/active_support/core_ext/enumerable.rb
@@ -94,7 +94,7 @@ module Enumerable
   end
 
   # Returns true if the collection has more than 1 element. Functionally equivalent to collection.size > 1.
-  # Works with a block too ala any?, so people.many? { |p| p.age > 26 } # => returns true if more than 1 person is over 26.
+  # Can be called with a block too, much like any?, so people.many? { |p| p.age > 26 } returns true if more than 1 person is over 26.
   def many?(&block)
     size = block_given? ? select(&block).size : self.size
     size > 1
-- 
cgit v1.2.3


From e15973ce7c1ea926da38fb5b4a6f2c1b62beaac7 Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Sun, 27 Feb 2011 02:14:30 +0530
Subject: use resources in place of map.resources

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

diff --git a/railties/guides/source/generators.textile b/railties/guides/source/generators.textile
index 41a96b487d..fc7b1216d5 100644
--- a/railties/guides/source/generators.textile
+++ b/railties/guides/source/generators.textile
@@ -345,7 +345,7 @@ $ rails generate scaffold Comment body:text
       invoke    shoulda
       create      test/unit/comment_test.rb
       create      test/fixtures/comments.yml
-       route  map.resources :comments
+       route    resources :comments
       invoke  scaffold_controller
       create    app/controllers/comments_controller.rb
       invoke    erb
-- 
cgit v1.2.3


From eef713dd663dc0381d4a9c5479b3b8f1d254495c Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sat, 26 Feb 2011 19:07:35 -0500
Subject: Clean up wording.

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

diff --git a/railties/guides/source/active_support_core_extensions.textile b/railties/guides/source/active_support_core_extensions.textile
index 8090d16fea..1df36137b4 100644
--- a/railties/guides/source/active_support_core_extensions.textile
+++ b/railties/guides/source/active_support_core_extensions.textile
@@ -2011,7 +2011,7 @@ That syntactic sugar is used a lot in Rails to avoid positional arguments where
 
 If a method expects a variable number of arguments and uses <tt>*</tt> in its declaration, however, such an options hash ends up being an item of the array of arguments, where it loses its role.
 
-In those cases, you may give an options hash a distinguished treatment with +extract_options!+. That method checks the type of the last item of an array. If it is a hash it pops it and returns it, otherwise returns an empty hash.
+In those cases, you may give an options hash a distinguished treatment with +extract_options!+. This method checks the type of the last item of an array. If it is a hash it pops it and returns it, otherwise it returns an empty hash.
 
 Let's see for example the definition of the +caches_action+ controller macro:
 
-- 
cgit v1.2.3


From 3f97f056f9707101a14d0ff43db0866ddc7515c2 Mon Sep 17 00:00:00 2001
From: Rodrigo Navarro <rnavarro1@gmail.com>
Date: Sun, 27 Feb 2011 10:03:50 -0800
Subject: Pointing out that dynamic_form plugin must be installed to be able to
 use error_messages and error_messages_for view helpers.

---
 .../source/active_record_validations_callbacks.textile    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/railties/guides/source/active_record_validations_callbacks.textile b/railties/guides/source/active_record_validations_callbacks.textile
index 5dc6ef3774..58a184a48e 100644
--- a/railties/guides/source/active_record_validations_callbacks.textile
+++ b/railties/guides/source/active_record_validations_callbacks.textile
@@ -738,7 +738,20 @@ person.errors.size # => 0
 
 h3. Displaying Validation Errors in the View
 
-Rails provides built-in helpers to display the error messages of your models in your view templates.
+Rails maintains an official plugin 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.
+
+h4. Installing as a plugin
+<shell>
+$ rails plugin install git://github.com/rails/dynamic_form.git
+</shell>
+
+h4 Installing as a Gem
+Add this line on your Gemfile:
+<ruby>
+gem "dynamic_form"
+</ruby>
+
+Now you will have access to these two methods in your view templates:
 
 h4. +error_messages+ and +error_messages_for+
 
-- 
cgit v1.2.3


From ea6a2b7c111cd3794b2ee41bc60a4071631d01aa Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sun, 27 Feb 2011 16:45:57 -0500
Subject: Fix incorrect word.

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

diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index 52a64383a2..3227600078 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -27,7 +27,7 @@ module ActiveSupport
     # up the queue, subscriptions and turning colors in logs off.
     #
     # The messages are available in the @logger instance, which is a logger with limited
-    # powers (it actually do not send anything to your output), and you can collect them
+    # powers (it actually does not send anything to your output), and you can collect them
     # doing @logger.logged(level), where level is the level used in logging, like info,
     # debug, warn and so on.
     #
-- 
cgit v1.2.3


From 67af97c4c1561f28801a89a4d2c1c97b419e9fa4 Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sun, 27 Feb 2011 20:22:55 -0500
Subject: Fix incorrect example.

---
 activesupport/lib/active_support/ordered_options.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb
index b40cbceb7e..8d8e6ebc58 100644
--- a/activesupport/lib/active_support/ordered_options.rb
+++ b/activesupport/lib/active_support/ordered_options.rb
@@ -2,13 +2,13 @@ require 'active_support/ordered_hash'
 
 # Usually key value pairs are handled something like this:
 #
-#   h = ActiveSupport::OrderedOptions.new
+#   h = {}
 #   h[:boy] = 'John'
 #   h[:girl] = 'Mary'
 #   h[:boy]  # => 'John'
 #   h[:girl] # => 'Mary'
 #
-# Using <tt>OrderedOptions</tt> above code could be reduced to:
+# Using <tt>OrderedOptions</tt>, the above code could be reduced to:
 #
 #   h = ActiveSupport::OrderedOptions.new
 #   h.boy = 'John'
-- 
cgit v1.2.3


From 9b01284c3e20bd667a43b3bae48a92c4d280f4fd Mon Sep 17 00:00:00 2001
From: Lars Smit <lsmit@digidentity.eu>
Date: Mon, 28 Feb 2011 12:17:26 +0100
Subject: Added some new advice on applying patches

---
 .../guides/source/contributing_to_ruby_on_rails.textile    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index e00b26f948..9739da2666 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -351,6 +351,20 @@ $ git format-patch master --stdout > my_new_patch.diff
 
 Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in.
 
+You can check your patches by applying your patch to an different dedicated branch:
+
+<shell>
+$ git checkout -b testing_branch
+$ git apply --check my_new_patch.diff
+</shell>
+
+You can make sure your patches don't add any whitespace by applying it yourself using the --whitespace=error-all option. Make sure you are on your dedicated test branche and:
+
+<shell>
+$ git apply --whitespace=error-all mynew_patch.diff
+</shell>
+
+
 h4. Create a Lighthouse Ticket
 
 Now create a ticket with your patch. Go to the "new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new page at Lighthouse. Fill in a reasonable title and description, remember to attach your patch file, and tag the ticket with the ‘patch’ tag and whatever other subject area tags make sense.
-- 
cgit v1.2.3


From 3673a6981e06365fc46fd7ebd4a5b0d5f8ee3c6e Mon Sep 17 00:00:00 2001
From: Dalibor Nasevic <dalibor.nasevic@gmail.com>
Date: Tue, 1 Mar 2011 01:16:30 +0100
Subject: Removed link to un-existing Issues page on Github

---
 railties/guides/source/layout.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/railties/guides/source/layout.html.erb b/railties/guides/source/layout.html.erb
index e924f2f6c0..f2681c6461 100644
--- a/railties/guides/source/layout.html.erb
+++ b/railties/guides/source/layout.html.erb
@@ -127,9 +127,6 @@
           <%= link_to 'Ruby on Rails Guides Guidelines', 'ruby_on_rails_guides_guidelines.html' %>
           for style and conventions.
         </p>
-        <p>
-          Issues may also be reported in <%= link_to 'Github', 'https://github.com/lifo/docrails/issues' %>.
-        </p>
         <p>And last but not least, any kind of discussion regarding Ruby on Rails
           documentation is very welcome in the <%= link_to 'rubyonrails-docs mailing list', 'http://groups.google.com/group/rubyonrails-docs' %>.
         </p>
-- 
cgit v1.2.3


From 3457db712e1a66838ddd37e99fa86e108ad758a7 Mon Sep 17 00:00:00 2001
From: Dalibor Nasevic <dalibor.nasevic@gmail.com>
Date: Thu, 3 Mar 2011 01:03:25 +0100
Subject: Correct spelling for Base64 in action_mailer

---
 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 15b0d01154..16fcf112b7 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -291,7 +291,7 @@ module ActionMailer #:nodoc:
   #   * <tt>:authentication</tt> - If your mail server requires authentication, you need to specify the
   #     authentication type here.
   #     This is a symbol and one of <tt>:plain</tt> (will send the password in the clear), <tt>:login</tt> (will
-  #     send password BASE64 encoded) or <tt>:cram_md5</tt> (combines a Challenge/Response mechanism to exchange
+  #     send password Base64 encoded) or <tt>:cram_md5</tt> (combines a Challenge/Response mechanism to exchange
   #     information and a cryptographic Message Digest 5 algorithm to hash important information)
   #   * <tt>:enable_starttls_auto</tt> - When set to true, detects if STARTTLS is enabled in your SMTP server
   #     and starts to use it.
-- 
cgit v1.2.3


From d735672aa5c73e314345277f001b55d13859303e Mon Sep 17 00:00:00 2001
From: JudeArasu <judearasu@gmail.com>
Date: Thu, 3 Mar 2011 23:20:28 +0530
Subject: Spelling mistake

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

diff --git a/railties/README.rdoc b/railties/README.rdoc
index 789d5255b7..0457227473 100644
--- a/railties/README.rdoc
+++ b/railties/README.rdoc
@@ -4,7 +4,7 @@ Railties is responsible to glue all frameworks together. Overall, it:
 
 * handles all the bootstrapping process for a Rails application;
 
-* manager rails command line interface;
+* manages rails command line interface;
 
 * provides Rails generators core;
 
@@ -23,3 +23,4 @@ Documentation can be found at
 == License
 
 Railties is released under the MIT license.
+
-- 
cgit v1.2.3


From 045ca303947e7e9209cee4b3fdede05f6dbb02c4 Mon Sep 17 00:00:00 2001
From: mjy <diapriid@gmail.com>
Date: Thu, 3 Mar 2011 13:28:26 -0500
Subject: fixes a missmatched column in example

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

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index b3204b2bda..4db08c774b 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -463,7 +463,7 @@ module ActiveRecord #:nodoc:
       #
       #   # You can use the same string replacement techniques as you can with ActiveRecord#find
       #   Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
-      #   > [#<Post:0x36bff9c @attributes={"first_name"=>"The Cheap Man Buys Twice"}>, ...]
+      #   > [#<Post:0x36bff9c @attributes={"title"=>"The Cheap Man Buys Twice"}>, ...]
       def find_by_sql(sql, binds = [])
         connection.select_all(sanitize_sql(sql), "#{name} Load", binds).collect! { |record| instantiate(record) }
       end
-- 
cgit v1.2.3


From 3eca9d5b43c270d01ac92491281dd96a5ceaa783 Mon Sep 17 00:00:00 2001
From: "Jonathon D. Jones" <jonathon_d_jones@yahoo.com>
Date: Thu, 3 Mar 2011 18:10:33 -0500
Subject: Adds link to Object.blank? from Object.present?

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

diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index 51670b148f..f70853073a 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -13,7 +13,7 @@ class Object
     respond_to?(:empty?) ? empty? : !self
   end
 
-  # An object is present if it's not blank.
+  # An object is present if it's not #blank?.
   def present?
     !blank?
   end
-- 
cgit v1.2.3


From e95b965926a11d77aee379d9557ad1bee155dd7a Mon Sep 17 00:00:00 2001
From: tashian <carl@ppolitics.org>
Date: Thu, 3 Mar 2011 15:04:39 -0800
Subject: Properly escaped a + in the dynamic segments TIP

---
 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 d214031b31..c447fd911a 100644
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile
@@ -391,7 +391,7 @@ NOTE: You can't use +namespace+ or +:module+ with a +:controller+ path segment.
 match ':controller(/:action(/:id))', :controller => /admin\/[^\/]+/
 </ruby>
 
-TIP: By default dynamic segments don't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within a dynamic segment add a constraint which overrides this - for example +:id => /[^\/]+/+ allows anything except a slash.
+TIP: By default dynamic segments don't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within a dynamic segment add a constraint which overrides this - for example +:id => /[^\/]<plus>/+ allows anything except a slash.
 
 h4. Static Segments
 
-- 
cgit v1.2.3


From 86c15d8b8984b5865d73ecdd6687d91060bda5ba Mon Sep 17 00:00:00 2001
From: "R.T. Lechow" <rtlechow@gmail.com>
Date: Thu, 3 Mar 2011 22:23:30 -0500
Subject: Active Model typos.

---
 activemodel/README.rdoc                                            | 2 +-
 activemodel/test/cases/validations/numericality_validation_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index d9a9bdae3e..b5b5edd52a 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -8,7 +8,7 @@ the Rails framework.
 Prior to Rails 3.0, if a plugin or gem developer wanted to have an object
 interact with Action Pack helpers, it was required to either copy chunks of
 code from Rails, or monkey patch entire helpers to make them handle objects
-that did not exacly conform to the Active Record interface. This would result
+that did not exactly conform to the Active Record interface. This would result
 in code duplication and fragile applications that broke on upgrades.
 
 Active Model solves this. You can include functionality from the following
diff --git a/activemodel/test/cases/validations/numericality_validation_test.rb b/activemodel/test/cases/validations/numericality_validation_test.rb
index e1d7d40c47..08f6169ca5 100644
--- a/activemodel/test/cases/validations/numericality_validation_test.rb
+++ b/activemodel/test/cases/validations/numericality_validation_test.rb
@@ -14,7 +14,7 @@ class NumericalityValidationTest < ActiveModel::TestCase
 
   NIL = [nil]
   BLANK = ["", " ", " \t \r \n"]
-  BIGDECIMAL_STRINGS = %w(12345678901234567890.1234567890) # 30 significent digits
+  BIGDECIMAL_STRINGS = %w(12345678901234567890.1234567890) # 30 significant digits
   FLOAT_STRINGS = %w(0.0 +0.0 -0.0 10.0 10.5 -10.5 -0.0001 -090.1 90.1e1 -90.1e5 -90.1e-5 90e-5)
   INTEGER_STRINGS = %w(0 +0 -0 10 +10 -10 0090 -090)
   FLOATS = [0.0, 10.0, 10.5, -10.5, -0.0001] + FLOAT_STRINGS
-- 
cgit v1.2.3


From 48841dd6aebd41cfab66f719f3d6896e172d7b9f Mon Sep 17 00:00:00 2001
From: "R.T. Lechow" <rtlechow@gmail.com>
Date: Thu, 3 Mar 2011 22:31:00 -0500
Subject: Active Resource typos.

---
 activeresource/lib/active_resource/base.rb    | 4 ++--
 activeresource/test/cases/base_test.rb        | 2 +-
 activeresource/test/cases/validations_test.rb | 2 +-
 activeresource/test/connection_test.rb        | 2 +-
 activeresource/test/fixtures/address.rb       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index daa8962929..160763779e 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -522,9 +522,9 @@ module ActiveResource
       #
       # * <tt>:key</tt> - An OpenSSL::PKey::RSA or OpenSSL::PKey::DSA object.
       # * <tt>:cert</tt> - An OpenSSL::X509::Certificate object as client certificate
-      # * <tt>:ca_file</tt> - Path to a CA certification file in PEM format. The file can contrain several CA certificates.
+      # * <tt>:ca_file</tt> - Path to a CA certification file in PEM format. The file can contain several CA certificates.
       # * <tt>:ca_path</tt> - Path of a CA certification directory containing certifications in PEM format.
-      # * <tt>:verify_mode</tt> - Flags for server the certification verification at begining of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable)
+      # * <tt>:verify_mode</tt> - Flags for server the certification verification at beginning of SSL/TLS session. (OpenSSL::SSL::VERIFY_NONE or OpenSSL::SSL::VERIFY_PEER is acceptable)
       # * <tt>:verify_callback</tt> - The verify callback for the server certification verification.
       # * <tt>:verify_depth</tt> - The maximum depth for the certificate chain verification.
       # * <tt>:cert_store</tt> - OpenSSL::X509::Store to verify peer certificate.
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb
index ab801902ac..48dacbdf67 100644
--- a/activeresource/test/cases/base_test.rb
+++ b/activeresource/test/cases/base_test.rb
@@ -876,7 +876,7 @@ class BaseTest < Test::Unit::TestCase
   end
 
   ########################################################################
-  # Tests the more miscelaneous helper methods
+  # Tests the more miscellaneous helper methods
   ########################################################################
   def test_exists
     # Class method.
diff --git a/activeresource/test/cases/validations_test.rb b/activeresource/test/cases/validations_test.rb
index 671d1ea8f0..3b1caecb04 100644
--- a/activeresource/test/cases/validations_test.rb
+++ b/activeresource/test/cases/validations_test.rb
@@ -3,7 +3,7 @@ require 'fixtures/project'
 require 'active_support/core_ext/hash/conversions'
 
 # The validations are tested thoroughly under ActiveModel::Validations
-# This test case simply makes sur that they are all accessible by
+# This test case simply makes sure that they are all accessible by
 # Active Resource objects.
 class ValidationsTest < ActiveModel::TestCase
   VALID_PROJECT_HASH = { :name => "My Project", :description => "A project" }
diff --git a/activeresource/test/connection_test.rb b/activeresource/test/connection_test.rb
index fe80cdf2e5..6e79845aa0 100644
--- a/activeresource/test/connection_test.rb
+++ b/activeresource/test/connection_test.rb
@@ -44,7 +44,7 @@ class ConnectionTest < Test::Unit::TestCase
     # 401 is an unauthorized request
     assert_response_raises ActiveResource::UnauthorizedAccess, 401
 
-    # 403 is a forbidden requst (and authorizing will not help)
+    # 403 is a forbidden request (and authorizing will not help)
     assert_response_raises ActiveResource::ForbiddenAccess, 403
 
     # 404 is a missing resource.
diff --git a/activeresource/test/fixtures/address.rb b/activeresource/test/fixtures/address.rb
index fe921e1595..7a73ecb52a 100644
--- a/activeresource/test/fixtures/address.rb
+++ b/activeresource/test/fixtures/address.rb
@@ -1,4 +1,4 @@
-# turns everyting into the same object
+# turns everything into the same object
 class AddressXMLFormatter
   include ActiveResource::Formats::XmlFormat
 
-- 
cgit v1.2.3


From 273700cbd0f8e9013fd4b4a33ab310e4ac02ff62 Mon Sep 17 00:00:00 2001
From: "R.T. Lechow" <rtlechow@gmail.com>
Date: Thu, 3 Mar 2011 23:14:18 -0500
Subject: Active Support typos.

---
 activesupport/bin/generate_tables                                 | 2 +-
 activesupport/lib/active_support/core_ext/object/try.rb           | 2 +-
 activesupport/lib/active_support/core_ext/string/multibyte.rb     | 2 +-
 activesupport/lib/active_support/core_ext/string/output_safety.rb | 2 +-
 activesupport/lib/active_support/dependencies.rb                  | 2 +-
 activesupport/lib/active_support/log_subscriber/test_helper.rb    | 2 +-
 activesupport/lib/active_support/multibyte/unicode.rb             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/activesupport/bin/generate_tables b/activesupport/bin/generate_tables
index 7a4f840226..5fefa429df 100644
--- a/activesupport/bin/generate_tables
+++ b/activesupport/bin/generate_tables
@@ -45,7 +45,7 @@ module ActiveSupport
             ([0-9]+);           # canonical combining class
             ([A-Z]+);           # bidi class
             (<([A-Z]*)>)?       # decomposition type
-            ((\ ?[0-9A-F]+)*);  # decompomposition mapping
+            ((\ ?[0-9A-F]+)*);  # decomposition mapping
             ([0-9]*);           # decimal digit
             ([0-9]*);           # digit
             ([^;]*);            # numeric
diff --git a/activesupport/lib/active_support/core_ext/object/try.rb b/activesupport/lib/active_support/core_ext/object/try.rb
index ff812234e3..04619124a1 100644
--- a/activesupport/lib/active_support/core_ext/object/try.rb
+++ b/activesupport/lib/active_support/core_ext/object/try.rb
@@ -21,7 +21,7 @@ class Object
   #   Person.try(:find, 1)
   #   @people.try(:collect) {|p| p.name}
   #
-  # Without a method argument try will yield to the block unless the reciever is nil.
+  # Without a method argument try will yield to the block unless the receiver is nil.
   #   @person.try { |p| "#{p.first_name} #{p.last_name}" }
   #--
   # +try+ behaves like +Object#send+, unless called on +NilClass+.
diff --git a/activesupport/lib/active_support/core_ext/string/multibyte.rb b/activesupport/lib/active_support/core_ext/string/multibyte.rb
index 0b974f5e0a..41de4d6435 100644
--- a/activesupport/lib/active_support/core_ext/string/multibyte.rb
+++ b/activesupport/lib/active_support/core_ext/string/multibyte.rb
@@ -9,7 +9,7 @@ class String
     #
     # In Ruby 1.8 and older it creates and returns an instance of the ActiveSupport::Multibyte::Chars class which
     # encapsulates the original string. A Unicode safe version of all the String methods are defined on this proxy
-    # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsuled string.
+    # class. If the proxy class doesn't respond to a certain method, it's forwarded to the encapsulated string.
     #
     #   name = 'Claus Müller'
     #   name.reverse # => "rell??M sualC"
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index c930abc003..addd4dab95 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -24,7 +24,7 @@ class ERB
       end
     end
 
-    # Aliasing twice issues a warning "dicarding old...". Remove first to avoid it.
+    # Aliasing twice issues a warning "discarding old...". Remove first to avoid it.
     remove_method(:h)
     alias h html_escape
 
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index 47596a389d..dc10f78104 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -513,7 +513,7 @@ module ActiveSupport #:nodoc:
     # to its class/module if it implements +before_remove_const+.
     #
     # The callback implementation should be restricted to cleaning up caches, etc.
-    # as the enviroment will be in an inconsistent state, e.g. other constants
+    # as the environment will be in an inconsistent state, e.g. other constants
     # may have already been unloaded and not accessible.
     def remove_unloadable_constants!
       autoloaded_constants.each { |const| remove_constant const }
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index 3227600078..392e33edbc 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -23,7 +23,7 @@ module ActiveSupport
     #   end
     #
     # All you need to do is to ensure that your log subscriber is added to Rails::Subscriber,
-    # as in the second line of the code above. The test helpers is reponsible for setting
+    # as in the second line of the code above. The test helpers are responsible for setting
     # up the queue, subscriptions and turning colors in logs off.
     #
     # The messages are available in the @logger instance, which is a logger with limited
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb
index 1139783b65..513f83e445 100644
--- a/activesupport/lib/active_support/multibyte/unicode.rb
+++ b/activesupport/lib/active_support/multibyte/unicode.rb
@@ -247,7 +247,7 @@ module ActiveSupport
           if is_unused || is_restricted
             bytes[i] = tidy_byte(byte)
           elsif is_cont
-            # Not expecting contination byte? Clean up. Otherwise, now expect one less.
+            # Not expecting continuation byte? Clean up. Otherwise, now expect one less.
             conts_expected == 0 ? bytes[i] = tidy_byte(byte) : conts_expected -= 1
           else
             if conts_expected > 0
-- 
cgit v1.2.3


From a1b4d8e7b277ddcfba6c31cbb9245025123cf04b Mon Sep 17 00:00:00 2001
From: "R.T. Lechow" <rtlechow@gmail.com>
Date: Thu, 3 Mar 2011 23:54:58 -0500
Subject: Active Record typos.

---
 activerecord/lib/active_record/associations/association.rb | 4 ++--
 activerecord/lib/active_record/autosave_association.rb     | 2 +-
 activerecord/lib/active_record/callbacks.rb                | 2 +-
 activerecord/test/cases/base_test.rb                       | 4 ++--
 activerecord/test/cases/identity_map_test.rb               | 4 ++--
 activerecord/test/cases/migration_test.rb                  | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/activerecord/lib/active_record/associations/association.rb b/activerecord/lib/active_record/associations/association.rb
index 67752da2a5..25b4b9d90d 100644
--- a/activerecord/lib/active_record/associations/association.rb
+++ b/activerecord/lib/active_record/associations/association.rb
@@ -7,7 +7,7 @@ module ActiveRecord
     # This is the root class of all associations ('+ Foo' signifies an included module Foo):
     #
     #   Association
-    #     SingularAssociaton
+    #     SingularAssociation
     #       HasOneAssociation
     #         HasOneThroughAssociation + ThroughAssociation
     #       BelongsToAssociation
@@ -88,7 +88,7 @@ module ActiveRecord
 
       # Construct the scope for this association.
       #
-      # Note that the association_scope is merged into the targed_scope only when the
+      # Note that the association_scope is merged into the target_scope only when the
       # scoped method is called. This is because at that point the call may be surrounded
       # by scope.scoping { ... } or with_scope { ... } etc, which affects the scope which
       # actually gets built.
diff --git a/activerecord/lib/active_record/autosave_association.rb b/activerecord/lib/active_record/autosave_association.rb
index 748cc99a62..48dbe0838a 100644
--- a/activerecord/lib/active_record/autosave_association.rb
+++ b/activerecord/lib/active_record/autosave_association.rb
@@ -4,7 +4,7 @@ module ActiveRecord
   # = Active Record Autosave Association
   #
   # +AutosaveAssociation+ is a module that takes care of automatically saving
-  # associacted records when their parent is saved. In addition to saving, it
+  # associated records when their parent is saved. In addition to saving, it
   # also destroys any associated records that were marked for destruction.
   # (See +mark_for_destruction+ and <tt>marked_for_destruction?</tt>).
   #
diff --git a/activerecord/lib/active_record/callbacks.rb b/activerecord/lib/active_record/callbacks.rb
index ff4ce1b605..86d58df99b 100644
--- a/activerecord/lib/active_record/callbacks.rb
+++ b/activerecord/lib/active_record/callbacks.rb
@@ -73,7 +73,7 @@ module ActiveRecord
   #
   # Now, when <tt>Topic#destroy</tt> is run only +destroy_author+ is called. When <tt>Reply#destroy</tt> is
   # run, both +destroy_author+ and +destroy_readers+ are called. Contrast this to the following situation
-  # where the +before_destroy+ methis is overriden:
+  # where the +before_destroy+ method is overridden:
   #
   #   class Topic < ActiveRecord::Base
   #     def before_destroy() destroy_author end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index b62b5003e4..d03fc68a11 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -832,12 +832,12 @@ class BasicsTest < ActiveRecord::TestCase
 
   def test_dup_of_saved_object_marks_as_dirty_only_changed_attributes
     developer = Developer.create! :name => 'Bjorn'
-    assert !developer.name_changed?           # both attributes of saved object should be threated as not changed
+    assert !developer.name_changed?           # both attributes of saved object should be treated as not changed
     assert !developer.salary_changed?
 
     cloned_developer = developer.dup
     assert cloned_developer.name_changed?     # ... but on cloned object should be
-    assert !cloned_developer.salary_changed?  # ... BUT salary has non-nil default which should be threated as not changed on cloned instance
+    assert !cloned_developer.salary_changed?  # ... BUT salary has non-nil default which should be treated as not changed on cloned instance
   end
 
   def test_bignum
diff --git a/activerecord/test/cases/identity_map_test.rb b/activerecord/test/cases/identity_map_test.rb
index d98638ab73..399d6c26df 100644
--- a/activerecord/test/cases/identity_map_test.rb
+++ b/activerecord/test/cases/identity_map_test.rb
@@ -295,7 +295,7 @@ class IdentityMapTest < ActiveRecord::TestCase
   end
 
   ##############################################################################
-  # Behaviour releated to saving failures
+  # Behaviour related to saving failures
   ##############################################################################
 
   def test_reload_object_if_save_failed
@@ -338,7 +338,7 @@ class IdentityMapTest < ActiveRecord::TestCase
   end
 
   ##############################################################################
-  # Behaviour of readonly, forzen, destroyed
+  # Behaviour of readonly, frozen, destroyed
   ##############################################################################
 
   def test_find_using_identity_map_respects_readonly_when_loading_associated_object_first
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 9d7c49768b..bf7565a0d0 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -543,7 +543,7 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_equal "I was born ....", bob.bio
       assert_equal 18, bob.age
 
-      # Test for 30 significent digits (beyond the 16 of float), 10 of them
+      # Test for 30 significant digits (beyond the 16 of float), 10 of them
       # after the decimal place.
 
       unless current_adapter?(:SQLite3Adapter)
@@ -1975,7 +1975,7 @@ if ActiveRecord::Base.connection.supports_migrations?
           t.integer :age
         end
 
-        # Adding an index fires a query everytime to check if an index already exists or not
+        # Adding an index fires a query every time to check if an index already exists or not
         assert_queries(3) do
           with_bulk_change_table do |t|
             t.index :username, :unique => true, :name => :awesome_username_index
-- 
cgit v1.2.3


From 87e9e3f9afa470df49f2a07af87074b9f4567028 Mon Sep 17 00:00:00 2001
From: "R.T. Lechow" <rtlechow@gmail.com>
Date: Fri, 4 Mar 2011 00:09:26 -0500
Subject: Action Pack typos.

---
 actionpack/lib/action_controller/caching/actions.rb       | 2 +-
 actionpack/lib/action_controller/metal/instrumentation.rb | 2 +-
 actionpack/lib/action_dispatch/routing/mapper.rb          | 4 ++--
 actionpack/lib/action_view/helpers/date_helper.rb         | 4 ++--
 actionpack/lib/action_view/helpers/form_tag_helper.rb     | 2 +-
 actionpack/lib/action_view/helpers/number_helper.rb       | 6 +++---
 actionpack/lib/action_view/helpers/translation_helper.rb  | 2 +-
 actionpack/lib/action_view/locale/en.yml                  | 2 +-
 actionpack/lib/action_view/template/handlers/erb.rb       | 2 +-
 actionpack/test/controller/routing_test.rb                | 2 +-
 actionpack/test/template/number_helper_test.rb            | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index a1c582560c..2c8a6e4d4d 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -80,7 +80,7 @@ module ActionController #:nodoc:
     # header the Content-Type of the cached response could be wrong because
     # no information about the MIME type is stored in the cache key. So, if
     # you first ask for MIME type M in the Accept header, a cache entry is
-    # created, and then perform a second resquest to the same resource asking
+    # created, and then perform a second request to the same resource asking
     # for a different MIME type, you'd get the content cached for M.
     #
     # The <tt>:format</tt> parameter is taken into account though. The safest
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index b08d9a8434..dc3ea939e6 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -78,7 +78,7 @@ module ActionController
       yield
     end
 
-    # Everytime after an action is processed, this method is invoked
+    # Every time after an action is processed, this method is invoked
     # with the payload, so you can add more information.
     # :api: plugin
     def append_info_to_payload(payload) #:nodoc:
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 589df218a8..1733c8032a 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -700,7 +700,7 @@ module ActionDispatch
         # Now routes such as +/posts/1+ will no longer be valid, but +/posts/1.1+ will be.
         # The +id+ parameter must match the constraint passed in for this example.
         #
-        # You may use this to also resrict other parameters:
+        # You may use this to also restrict other parameters:
         #
         #   resources :posts do
         #     constraints(:post_id => /\d+\.\d+) do
@@ -720,7 +720,7 @@ module ActionDispatch
         #
         # === Dynamic request matching
         #
-        # Requests to routes can be constrained based on specific critera:
+        # Requests to routes can be constrained based on specific criteria:
         #
         #    constraints(lambda { |req| req.env["HTTP_USER_AGENT"] =~ /iPhone/ }) do
         #      resources :iphones
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index dc8e4bc316..6cd1565031 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -617,7 +617,7 @@ module ActionView
         @options[:discard_second] ||= true unless @options[:include_seconds] && !@options[:discard_minute]
 
         # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
-        # valid (otherwise it could be 31 and february wouldn't be a valid date)
+        # valid (otherwise it could be 31 and February wouldn't be a valid date)
         if @datetime && @options[:discard_day] && !@options[:discard_month]
           @datetime = @datetime.change(:day => 1)
         end
@@ -644,7 +644,7 @@ module ActionView
         @options[:discard_day]    ||= true if @options[:discard_month] || !order.include?(:day)
 
         # If the day is hidden and the month is visible, the day should be set to the 1st so all month choices are
-        # valid (otherwise it could be 31 and february wouldn't be a valid date)
+        # valid (otherwise it could be 31 and February wouldn't be a valid date)
         if @datetime && @options[:discard_day] && !@options[:discard_month]
           @datetime = @datetime.change(:day => 1)
         end
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 71f8534cbf..49aa434020 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -592,7 +592,7 @@ module ActionView
           options.stringify_keys.tap do |html_options|
             html_options["enctype"] = "multipart/form-data" if html_options.delete("multipart")
             # The following URL is unescaped, this is just a hash of options, and it is the
-            # responsability of the caller to escape all the values.
+            # responsibility of the caller to escape all the values.
             html_options["action"]  = url_for(url_for_options, *parameters_for_url)
             html_options["accept-charset"] = "UTF-8"
             html_options["data-remote"] = true if html_options.delete("remote")
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 26f8dce3c3..4e44843c4b 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -369,7 +369,7 @@ module ActionView
       # See <tt>number_to_human_size</tt> if you want to print a file size.
       #
       # You can also define you own unit-quantifier names if you want to use other decimal units
-      # (eg.: 1500 becomes "1.5 kilometers", 0.150 becomes "150 mililiters", etc). You may define
+      # (eg.: 1500 becomes "1.5 kilometers", 0.150 becomes "150 milliliters", etc). You may define
       # a wide range of unit quantifiers, even fractional ones (centi, deci, mili, etc).
       #
       # ==== Options
@@ -425,13 +425,13 @@ module ActionView
       #     thousand:
       #       one: "kilometer"
       #       other: "kilometers"
-      #     billion: "gazilion-distance"
+      #     billion: "gazillion-distance"
       #
       # Then you could do:
       #
       #  number_to_human(543934, :units => :distance)                              # => "544 kilometers"
       #  number_to_human(54393498, :units => :distance)                            # => "54400 kilometers"
-      #  number_to_human(54393498000, :units => :distance)                         # => "54.4 gazilion-distance"
+      #  number_to_human(54393498000, :units => :distance)                         # => "54.4 gazillion-distance"
       #  number_to_human(343, :units => :distance, :precision => 1)                # => "300 meters"
       #  number_to_human(1, :units => :distance)                                   # => "1 meter"
       #  number_to_human(0.34, :units => :distance)                                # => "34 centimeters"
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index e7ec1df2c8..59e6ce878f 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -26,7 +26,7 @@ module ActionView
       #
       # E.g. the value returned for a missing translation key :"blog.post.title" will be
       # <span class="translation_missing" title="translation missing: blog.post.title">Title</span>.
-      # This way your views will display rather reasonableful strings but it will still
+      # This way your views will display rather reasonable strings but it will still
       # be easy to spot missing translations.
       #
       # Second, it'll scope the key by the current partial if the key starts
diff --git a/actionpack/lib/action_view/locale/en.yml b/actionpack/lib/action_view/locale/en.yml
index 9004e52c5b..eb816b9446 100644
--- a/actionpack/lib/action_view/locale/en.yml
+++ b/actionpack/lib/action_view/locale/en.yml
@@ -5,7 +5,7 @@
     format:
       # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
       separator: "."
-      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      # Delimits thousands (e.g. 1,000,000 is a million) (always in groups of three)
       delimiter: ","
       # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
       precision: 3
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 0803114f44..a36837afc8 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -63,7 +63,7 @@ module ActionView
         class_attribute :default_format
         self.default_format = Mime::HTML
 
-        # Default implemenation used.
+        # Default implementation used.
         class_attribute :erb_implementation
         self.erb_implementation = Erubis
 
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 5f6f1b61c0..18cf944f46 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -407,7 +407,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     assert_equal '/page/foo', url_for(rs, { :controller => 'content', :action => 'show_page', :id => 'foo' })
     assert_equal({ :controller => "content", :action => 'show_page', :id => 'foo' }, rs.recognize_path("/page/foo"))
 
-    token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in russian
+    token = "\321\202\320\265\320\272\321\201\321\202" # 'text' in Russian
     token.force_encoding(Encoding::BINARY) if token.respond_to?(:force_encoding)
     escaped_token = CGI::escape(token)
 
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 156b7cb5ff..c1b4bab903 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -140,7 +140,7 @@ class NumberHelperTest < ActionView::TestCase
 
   def test_number_with_precision_with_significant_true_and_zero_precision
     # Zero precision with significant is a mistake (would always return zero),
-    # so we treat it as if significant was false (increases backwards compatibily for number_to_human_size)
+    # so we treat it as if significant was false (increases backwards compatibility for number_to_human_size)
     assert_equal "124", number_with_precision(123.987, :precision => 0, :significant => true)
     assert_equal "12", number_with_precision(12, :precision => 0, :significant => true )
     assert_equal "12", number_with_precision("12.3", :precision => 0, :significant => true )
-- 
cgit v1.2.3


From 737abe4b4dcf3621d7ba6db7fe5d64d73078bfad Mon Sep 17 00:00:00 2001
From: "R.T. Lechow" <rtlechow@gmail.com>
Date: Fri, 4 Mar 2011 00:19:58 -0500
Subject: Railties typos.

---
 railties/lib/rails/engine.rb                                        | 6 +++---
 .../rails/generators/rails/plugin_new/templates/test/test_helper.rb | 2 +-
 railties/lib/rails/generators/resource_helpers.rb                   | 2 +-
 railties/lib/rails/railtie/configuration.rb                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 7c26234750..50bba22a3a 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -252,12 +252,12 @@ module Rails
   #   end
   #
   # The routes above will automatically point to <tt>MyEngine::ApplicationContoller</tt>. Furthermore, you don't
-  # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you shuold simply use
+  # need to use longer url helpers like <tt>my_engine_articles_path</tt>. Instead, you should simply use
   # <tt>articles_path</tt> as you would do with your application.
   #
   # To make that behaviour consistent with other parts of the framework, an isolated engine also has influence on
   # <tt>ActiveModel::Naming</tt>. When you use a namespaced model, like <tt>MyEngine::Article</tt>, it will normally
-  # use the prefix "my_engine". In an isolated engine, the prefix will be ommited in url helpers and
+  # use the prefix "my_engine". In an isolated engine, the prefix will be omitted in url helpers and
   # form fields for convenience.
   #
   #   polymorphic_url(MyEngine::Article.new) #=> "articles_path"
@@ -266,7 +266,7 @@ module Rails
   #     text_field :title #=> <input type="text" name="article[title]" id="article_title" />
   #   end
   #
-  # Additionaly isolated engine will set its name according to namespace, so
+  # Additionally isolated engine will set its name according to namespace, so
   # MyEngine::Engine.engine_name #=> "my_engine". It will also set MyEngine.table_name_prefix
   # to "my_engine_", changing MyEngine::Article model to use my_engine_article table.
   #
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
index 791b901593..dcd3b276e3 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
@@ -1,4 +1,4 @@
-# Configure Rails Envinronment
+# Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index d6ccfc496a..de01c858dd 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -53,7 +53,7 @@ module Rails
           @controller_i18n_scope ||= controller_file_path.gsub('/', '.')
         end
 
-        # Loads the ORM::Generators::ActiveModel class. This class is responsable
+        # Loads the ORM::Generators::ActiveModel class. This class is responsible
         # to tell scaffold entities how to generate an specific method for the
         # ORM. Check Rails::Generators::ActiveModel for more information.
         def orm_class
diff --git a/railties/lib/rails/railtie/configuration.rb b/railties/lib/rails/railtie/configuration.rb
index afeceafb67..e4368866a1 100644
--- a/railties/lib/rails/railtie/configuration.rb
+++ b/railties/lib/rails/railtie/configuration.rb
@@ -18,7 +18,7 @@ module Rails
 
       # This allows you to modify application's generators from Railties.
       #
-      # Values set on app_generators will become defaults for applicaiton, unless
+      # Values set on app_generators will become defaults for application, unless
       # application overwrites them.
       def app_generators
         @@app_generators ||= Rails::Configuration::Generators.new
-- 
cgit v1.2.3


From b12a4a9296469f4866b20a5db8c02cdc8844d9db Mon Sep 17 00:00:00 2001
From: JudeArasu <judearasu@gmail.com>
Date: Sat, 5 Mar 2011 06:08:21 +0530
Subject: typo changes

---
 actionmailer/README.rdoc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc
index b346bd9e79..fb93fd1080 100644
--- a/actionmailer/README.rdoc
+++ b/actionmailer/README.rdoc
@@ -75,9 +75,9 @@ Or you can just chain the methods together like:
 == Receiving emails
 
 To receive emails, you need to implement a public instance method called <tt>receive</tt> that takes a
-tmail object as its single parameter. The Action Mailer framework has a corresponding class method,
+email object as its single parameter. The Action Mailer framework has a corresponding class method,
 which is also called <tt>receive</tt>, that accepts a raw, unprocessed email as a string, which it then turns
-into the tmail object and calls the receive instance method.
+into the email object and calls the receive instance method.
 
 Example:
 
@@ -104,7 +104,7 @@ trivial case like this:
   rails runner 'Mailman.receive(STDIN.read)'
 
 However, invoking Rails in the runner for each mail to be received is very resource intensive.  A single
-instance of Rails should be run within a daemon if it is going to be utilized to process more than just
+instance of Rails should be run within a daemon, if it is going to be utilized to process more than just
 a limited number of email.
 
 == Configuration
@@ -145,3 +145,4 @@ API documentation is at
 Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
 
 * https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets
+
-- 
cgit v1.2.3


From 5f99a899a82c7201b7047e4e95d591a572a9099b Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Mar 2011 11:08:05 +0100
Subject: copy-edits 108561f

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

diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index f70853073a..d0c1ea8326 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -13,7 +13,7 @@ class Object
     respond_to?(:empty?) ? empty? : !self
   end
 
-  # An object is present if it's not #blank?.
+  # An object is present if it's not <tt>blank?</tt>.
   def present?
     !blank?
   end
-- 
cgit v1.2.3


From f6a5449d431e5d9096edbf4cb52eb2d82f467925 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Mar 2011 11:29:57 +0100
Subject: copy-edits 819762c

* simplifies some sentences
* use a more neutral language with less you/yours
---
 railties/guides/source/contributing_to_ruby_on_rails.textile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/railties/guides/source/contributing_to_ruby_on_rails.textile b/railties/guides/source/contributing_to_ruby_on_rails.textile
index 9739da2666..3454b8b7a3 100644
--- a/railties/guides/source/contributing_to_ruby_on_rails.textile
+++ b/railties/guides/source/contributing_to_ruby_on_rails.textile
@@ -349,22 +349,21 @@ $ git commit -a
 $ git format-patch master --stdout > my_new_patch.diff
 </shell>
 
-Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in.
+Open the diff file in your text editor of choice to sanity check the results, and make sure that no unintended changes crept in.
 
-You can check your patches by applying your patch to an different dedicated branch:
+You can also perform an extra check by applying the patch to a different dedicated branch:
 
 <shell>
 $ git checkout -b testing_branch
 $ git apply --check my_new_patch.diff
 </shell>
 
-You can make sure your patches don't add any whitespace by applying it yourself using the --whitespace=error-all option. Make sure you are on your dedicated test branche and:
+Please make sure the patch does not introduce whitespace errors:
 
 <shell>
 $ git apply --whitespace=error-all mynew_patch.diff
 </shell>
 
-
 h4. Create a Lighthouse Ticket
 
 Now create a ticket with your patch. Go to the "new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new page at Lighthouse. Fill in a reasonable title and description, remember to attach your patch file, and tag the ticket with the ‘patch’ tag and whatever other subject area tags make sense.
-- 
cgit v1.2.3


From 20768176292cbcb883ab152b4aa9ed8c664771cd Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 5 Mar 2011 11:54:06 +0100
Subject: revises the RDoc of Hash#reverse_merge

---
 .../active_support/core_ext/hash/reverse_merge.rb    | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
index 87a7bebd7b..01863a162b 100644
--- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb
@@ -1,25 +1,19 @@
 class Hash
-  # Allows for reverse merging two hashes where the keys in the calling hash take precedence over those
-  # in the <tt>other_hash</tt>. This is particularly useful for initializing an option hash with default values:
+  # Merges the caller into +other_hash+. For example,
   #
-  #   def setup(options = {})
-  #     options.reverse_merge! :size => 25, :velocity => 10
-  #   end
+  #   options = options.reverse_merge(:size => 25, :velocity => 10)
   #
-  # The default <tt>:size</tt> and <tt>:velocity</tt> are only set if the +options+ hash passed in doesn't already
-  # have the respective key.
+  # is equivalent to
   #
-  # As contrast, using Ruby's built in <tt>merge</tt> would require writing the following:
+  #   options = {:size => 25, :velocity => 10}.merge(options)
   #
-  #   def setup(options = {})
-  #     options = { :size => 25, :velocity => 10 }.merge(options)
-  #   end
+  # This is particularly useful for initializing an options hash
+  # with default values.
   def reverse_merge(other_hash)
     other_hash.merge(self)
   end
 
-  # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second.
-  # Modifies the receiver in place.
+  # Destructive +reverse_merge+.
   def reverse_merge!(other_hash)
     # right wins if there is no left
     merge!( other_hash ){|key,left,right| left }
-- 
cgit v1.2.3