From cefe723e285f20d1f2a33f67da03348568f7e0b0 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Wed, 3 Mar 2010 13:39:36 +1100
Subject: Removing prototype and just using vanilla js

---
 .../rails/app/templates/public/index.html          | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/railties/lib/generators/rails/app/templates/public/index.html b/railties/lib/generators/rails/app/templates/public/index.html
index ef916f9c5a..836da1b689 100644
--- a/railties/lib/generators/rails/app/templates/public/index.html
+++ b/railties/lib/generators/rails/app/templates/public/index.html
@@ -181,27 +181,27 @@
       }
 
     </style>
-    <script type="text/javascript" src="javascripts/prototype.js"></script>
-    <script type="text/javascript" src="javascripts/effects.js"></script>
     <script type="text/javascript">
       function about() {
-        if (Element.empty('about-content')) {
-          new Ajax.Updater('about-content', 'rails/info/properties', {
-            method:     'get',
-            onFailure:  function() {Element.classNames('about-content').add('failure')},
-            onComplete: function() {new Effect.BlindDown('about-content', {duration: 0.25})}
-          });
-        } else {
-          new Effect[Element.visible('about-content') ?
-            'BlindUp' : 'BlindDown']('about-content', {duration: 0.25});
-        }
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","rails/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+
+      function prepend() {
+        search = document.getElementById('search-text');
+        text = search.value;
+        search.value = 'site:rubyonrails.org ' + text;
       }
 
       window.onload = function() {
-        $('search-text').value = '';
-        $('search').onsubmit = function() {
-          $('search-text').value = 'site:rubyonrails.org ' + $F('search-text');
-        }
+        document.getElementById('search-text').value = '';
       }
     </script>
   </head>
@@ -210,7 +210,7 @@
       <div id="sidebar">
         <ul id="sidebar-items">
           <li>
-            <form id="search" action="http://www.google.com/search" method="get">
+            <form id="search" action="http://www.google.com/search" method="get" onSubmit="prepend();">
               <input type="hidden" name="hl" value="en" />
               <input type="text" id="search-text" name="q" value="site:rubyonrails.org " />
               <input type="submit" value="Search" /> the Rails site
-- 
cgit v1.2.3


From 63002ba36b858ca2aea814579193db9e1511d1fd Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Sun, 28 Mar 2010 15:24:35 +1100
Subject: Fixing test, ; is a delimiter, not a termination character, ref RFC
 2045

---
 actionmailer/test/old_base/mail_service_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index e49307bfda..8a677df9a8 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -1019,8 +1019,8 @@ EOF
 
   def test_empty_header_values_omitted
     result = TestMailer.unnamed_attachment(@recipient).encoded
-    assert_match %r{Content-Type: application/octet-stream;}, result
-    assert_match %r{Content-Disposition: attachment;}, result
+    assert_match %r{Content-Type: application/octet-stream}, result
+    assert_match %r{Content-Disposition: attachment}, result
   end
 
   def test_headers_with_nonalpha_chars
-- 
cgit v1.2.3


From a41d1b1fb168ee248749444590050f120378afe1 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Sun, 28 Mar 2010 16:22:37 +1100
Subject: Updating test, should be calling :decoded, not :encoded, is a problem
 now that Mail is fixed

---
 actionmailer/test/old_base/mail_service_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb
index 8a677df9a8..9eb067554f 100644
--- a/actionmailer/test/old_base/mail_service_test.rb
+++ b/actionmailer/test/old_base/mail_service_test.rb
@@ -784,7 +784,7 @@ EOF
     expected.date    = Time.local 2004, 12, 12
 
     created = TestMailer.utf8_body @recipient
-    assert_match(/åœö blah/, created.encoded)
+    assert_match(/åœö blah/, created.decoded)
   end
 
   def test_multiple_utf8_recipients
-- 
cgit v1.2.3


From b91c57d16cc1b7b686e5ecc208dfe08648360803 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Sun, 28 Mar 2010 16:24:54 +1100
Subject: Mail now correctly bundles up the charset into the content type field

---
 actionmailer/test/base_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 6f274c11df..aa28c5aa8b 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -135,13 +135,13 @@ class BaseTest < ActiveSupport::TestCase
                                :mime_version => '2.0',
                                :reply_to => 'reply-to@test.lindsaar.net',
                                :date => @time)
-    assert_equal(['bcc@test.lindsaar.net'],      email.bcc)
-    assert_equal(['cc@test.lindsaar.net'],       email.cc)
-    assert_equal('multipart/mixed',              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(['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)
   end
 
   test "mail() renders the template using the method being processed" do
-- 
cgit v1.2.3


From 4e0d1cfad74454e65f6be5c265e0e4b4e099cec3 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Sun, 28 Mar 2010 17:03:33 +1100
Subject: Fixing up attachment encoding specs to work with latest mail - and be
 correct

---
 actionmailer/test/base_test.rb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index aa28c5aa8b..baeee542be 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -39,8 +39,15 @@ class BaseTest < ActiveSupport::TestCase
     end
 
     def attachment_with_hash
-      attachments['invoice.jpg'] = { :data => "you smiling", :mime_type => "image/x-jpg",
-        :transfer_encoding => "base64" }
+      attachments['invoice.jpg'] = { :data => "\312\213\254\232)b",
+                                     :mime_type => "image/x-jpg",
+                                     :transfer_encoding => "base64" }
+      mail
+    end
+
+    def attachment_with_hash_default_encoding
+      attachments['invoice.jpg'] = { :data => "\312\213\254\232)b",
+                                     :mime_type => "image/x-jpg" }
       mail
     end
 
@@ -206,6 +213,15 @@ class BaseTest < ActiveSupport::TestCase
     assert_equal expected, email.attachments['invoice.jpg'].decoded
   end
 
+  test "attachment with hash using default mail encoding" do
+    email = BaseMailer.attachment_with_hash_default_encoding
+    assert_equal(1, email.attachments.length)
+    assert_equal('invoice.jpg', email.attachments[0].filename)
+    expected = "\312\213\254\232)b"
+    expected.force_encoding(Encoding::BINARY) if '1.9'.respond_to?(:force_encoding)
+    assert_equal expected, email.attachments['invoice.jpg'].decoded
+  end
+
   test "sets mime type to multipart/mixed when attachment is included" do
     email = BaseMailer.attachment_with_content
     assert_equal(1, email.attachments.length)
-- 
cgit v1.2.3


From 53bcd4af093854a0826480473533c702a8f80b88 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Sun, 28 Mar 2010 17:03:49 +1100
Subject: Updating mail version requirement to 2.1.5

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

diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index a7a2599105..3e40897d60 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.1.3')
+  s.add_dependency('mail',        '~> 2.1.5')
   s.add_dependency('text-format', '~> 1.0.0')
 end
-- 
cgit v1.2.3


From 835f5d0269a8d3615585119e77f1ba7d601c943b Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Sun, 28 Mar 2010 15:02:17 +0430
Subject: Rails 3 application can run performance tests now. [#4171
 state:resolved]

---
 actionpack/lib/action_dispatch/testing/performance_test.rb            | 4 +++-
 .../generators/rails/app/templates/test/performance/browsing_test.rb  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_dispatch/testing/performance_test.rb b/actionpack/lib/action_dispatch/testing/performance_test.rb
index 1b9a6c18b7..33a5c68b9d 100644
--- a/actionpack/lib/action_dispatch/testing/performance_test.rb
+++ b/actionpack/lib/action_dispatch/testing/performance_test.rb
@@ -1,7 +1,7 @@
 require 'active_support/testing/performance'
 require 'active_support/testing/default'
 
-if defined?(ActiveSupport::Testing::Performance)
+begin
   module ActionDispatch
     # An integration test that runs a code profiler on your test methods.
     # Profiling output for combinations of each test method, measurement, and
@@ -14,4 +14,6 @@ if defined?(ActiveSupport::Testing::Performance)
       include ActiveSupport::Testing::Default
     end
   end
+rescue NameError
+  $stderr.puts "Specify ruby-prof as application's dependency in Gemfile to run benchmarks."
 end
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
index a3dc38d9e4..867fc8c985 100644
--- a/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
+++ b/railties/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'
 require 'rails/performance_test_help'
 
 # Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
+class BrowsingTest < ActionDispatch::PerformanceTest
   def test_homepage
     get '/'
   end
-- 
cgit v1.2.3


From 3b1c69d2dd2b24a29e4443d7dc481589320a3f3e Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 28 Mar 2010 12:43:20 +0200
Subject: adds a few requires in active_model/dirty.rb

[#4284 state:committed]
---
 activemodel/lib/active_model/dirty.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/activemodel/lib/active_model/dirty.rb b/activemodel/lib/active_model/dirty.rb
index cb67ef7270..2d5acdfced 100644
--- a/activemodel/lib/active_model/dirty.rb
+++ b/activemodel/lib/active_model/dirty.rb
@@ -1,4 +1,7 @@
+require 'active_model/attribute_methods'
+require 'active_support/concern'
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/object/duplicable'
 
 module ActiveModel
   # <tt>ActiveModel::Dirty</tt> provides a way to track changes in your
-- 
cgit v1.2.3


From 105f9b8154bbee88b45e0bb9de949206cbc1ba02 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 28 Mar 2010 13:26:13 +0200
Subject: adds missing requires for Object#duplicable?

---
 actionpack/lib/action_dispatch/http/filter_parameters.rb                | 1 +
 activerecord/lib/active_record/base.rb                                  | 1 +
 .../lib/active_record/connection_adapters/abstract/query_cache.rb       | 2 ++
 activeresource/lib/active_resource/base.rb                              | 1 +
 4 files changed, 5 insertions(+)

diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
index e42b4d09b0..152aaa2e67 100644
--- a/actionpack/lib/action_dispatch/http/filter_parameters.rb
+++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/duplicable'
 
 module ActionDispatch
   module Http
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 367b4ce217..02db241ee0 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -13,6 +13,7 @@ require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/duplicable'
 require 'arel'
 require 'active_record/errors'
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
index 020acbbe5a..1e095110f2 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/duplicable'
+
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module QueryCache
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 67296a171a..5cfe4f7c7d 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -9,6 +9,7 @@ require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/misc'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/object/duplicable'
 require 'set'
 require 'uri'
 
-- 
cgit v1.2.3


From 76f024ac8db82490a99c71d0d8951d677e3bc9bc Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sun, 28 Mar 2010 14:15:02 +0200
Subject: adds missing requires for Object#blank? and Object#present?

---
 actionmailer/lib/action_mailer/base.rb                                  | 1 +
 actionmailer/lib/action_mailer/old_api.rb                               | 1 +
 actionpack/lib/action_controller/metal/http_authentication.rb           | 1 +
 actionpack/lib/action_controller/metal/renderers.rb                     | 1 +
 actionpack/lib/action_controller/railties/log_subscriber.rb             | 2 ++
 actionpack/lib/action_controller/test_case.rb                           | 1 +
 actionpack/lib/action_dispatch/http/cache.rb                            | 2 ++
 actionpack/lib/action_dispatch/http/mime_type.rb                        | 1 +
 actionpack/lib/action_dispatch/http/response.rb                         | 1 +
 actionpack/lib/action_dispatch/http/upload.rb                           | 2 ++
 actionpack/lib/action_dispatch/middleware/session/abstract_store.rb     | 1 +
 actionpack/lib/action_dispatch/middleware/session/cookie_store.rb       | 1 +
 actionpack/lib/action_dispatch/routing/deprecated_mapper.rb             | 2 ++
 actionpack/lib/action_dispatch/routing/mapper.rb                        | 1 +
 actionpack/lib/action_dispatch/testing/test_request.rb                  | 2 ++
 actionpack/lib/action_view/helpers/capture_helper.rb                    | 2 ++
 actionpack/lib/action_view/helpers/form_helper.rb                       | 1 +
 actionpack/lib/action_view/helpers/form_options_helper.rb               | 1 +
 actionpack/lib/action_view/helpers/form_tag_helper.rb                   | 1 +
 actionpack/lib/action_view/helpers/number_helper.rb                     | 1 +
 actionpack/lib/action_view/helpers/prototype_helper.rb                  | 1 +
 actionpack/lib/action_view/helpers/tag_helper.rb                        | 1 +
 actionpack/lib/action_view/helpers/text_helper.rb                       | 1 +
 actionpack/lib/action_view/render/partials.rb                           | 2 ++
 actionpack/lib/action_view/test_case.rb                                 | 1 +
 activemodel/lib/active_model/errors.rb                                  | 1 +
 activemodel/lib/active_model/validator.rb                               | 1 +
 activerecord/lib/active_record/associations.rb                          | 1 +
 .../lib/active_record/associations/has_many_through_association.rb      | 1 +
 activerecord/lib/active_record/attribute_methods/dirty.rb               | 2 ++
 activerecord/lib/active_record/attribute_methods/query.rb               | 2 ++
 activerecord/lib/active_record/base.rb                                  | 1 +
 .../active_record/connection_adapters/abstract/schema_definitions.rb    | 1 +
 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb     | 1 +
 .../lib/active_record/connection_adapters/postgresql_adapter.rb         | 1 +
 activerecord/lib/active_record/fixtures.rb                              | 1 +
 activerecord/lib/active_record/named_scope.rb                           | 1 +
 activerecord/lib/active_record/nested_attributes.rb                     | 1 +
 activerecord/lib/active_record/query_cache.rb                           | 2 ++
 activerecord/lib/active_record/relation.rb                              | 2 ++
 activerecord/lib/active_record/relation/batches.rb                      | 2 ++
 activerecord/lib/active_record/relation/calculations.rb                 | 2 ++
 activerecord/lib/active_record/relation/finder_methods.rb               | 2 ++
 activerecord/lib/active_record/relation/query_methods.rb                | 2 ++
 activerecord/lib/active_record/relation/spawn_methods.rb                | 2 ++
 activerecord/lib/active_record/schema.rb                                | 2 ++
 activeresource/lib/active_resource/custom_methods.rb                    | 2 ++
 activeresource/lib/active_resource/validations.rb                       | 1 +
 activesupport/lib/active_support/xml_mini/libxmlsax.rb                  | 1 +
 activesupport/lib/active_support/xml_mini/nokogirisax.rb                | 1 +
 railties/lib/rails/generators/rails/resource/resource_generator.rb      | 1 +
 51 files changed, 69 insertions(+)

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 0519783d02..793cd53518 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -2,6 +2,7 @@ require 'mail'
 require 'action_mailer/tmail_compat'
 require 'action_mailer/collector'
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/blank'
 
 module ActionMailer #:nodoc:
   # Action Mailer allows you to send email from your application using a mailer model and views.
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
index c7f341d46c..7c59a8ae50 100644
--- a/actionmailer/lib/action_mailer/old_api.rb
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
 
 module ActionMailer
   module OldApi #:nodoc:
diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb
index 6ec788f302..424828f7e8 100644
--- a/actionpack/lib/action_controller/metal/http_authentication.rb
+++ b/actionpack/lib/action_controller/metal/http_authentication.rb
@@ -1,4 +1,5 @@
 require 'active_support/base64'
+require 'active_support/core_ext/object/blank'
 
 module ActionController
   module HttpAuthentication
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index d906e1fb5b..aebd71e867 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/object/blank'
 
 module ActionController
   def self.add_renderer(key, &block)
diff --git a/actionpack/lib/action_controller/railties/log_subscriber.rb b/actionpack/lib/action_controller/railties/log_subscriber.rb
index c2299d0b05..00ac3bdf67 100644
--- a/actionpack/lib/action_controller/railties/log_subscriber.rb
+++ b/actionpack/lib/action_controller/railties/log_subscriber.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionController
   module Railties
     class LogSubscriber < Rails::LogSubscriber
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 120f34460e..306db4a431 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,4 +1,5 @@
 require 'rack/session/abstract/id'
+require 'active_support/core_ext/object/blank'
 
 module ActionController
   module TemplateAssertions
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index d2404e63c5..9b9e81440b 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionDispatch
   module Http
     module Cache
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index 3f1a77295d..d6a805bf3b 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -1,5 +1,6 @@
 require 'set'
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/core_ext/object/blank'
 
 module Mime
   class Mimes < Array
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 9cfe5a5ea9..362e5ec970 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -1,5 +1,6 @@
 require 'digest/md5'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
 
 module ActionDispatch # :nodoc:
   # Represents an HTTP response generated by a controller action. One can use
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index dc6121b911..81d2517304 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionDispatch
   module Http
     module UploadedFile
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index 311880cabc..dddedc832f 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -1,5 +1,6 @@
 require 'rack/utils'
 require 'rack/request'
+require 'active_support/core_ext/object/blank'
 
 module ActionDispatch
   module Session
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 22da82479e..3331b7c25e 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/blank'
 
 module ActionDispatch
   module Session
diff --git a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
index dd650e83d9..b0545279b1 100644
--- a/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionDispatch
   module Routing
     class RouteSet
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 5a3868e1d4..26f0e14e72 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/object/blank'
 
 module ActionDispatch
   module Routing
diff --git a/actionpack/lib/action_dispatch/testing/test_request.rb b/actionpack/lib/action_dispatch/testing/test_request.rb
index 20288aa7a5..090e03cf44 100644
--- a/actionpack/lib/action_dispatch/testing/test_request.rb
+++ b/actionpack/lib/action_dispatch/testing/test_request.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionDispatch
   class TestRequest < Request
     DEFAULT_ENV = Rack::MockRequest.env_for('/')
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index f0be814700..20598237e9 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionView
   module Helpers
     # CaptureHelper exposes methods to let you extract generated markup which
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 2ba5339b7d..7b5b3ae000 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -4,6 +4,7 @@ require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
 require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/form_options_helper.rb b/actionpack/lib/action_view/helpers/form_options_helper.rb
index 4c523d4b20..11c6351bd3 100644
--- a/actionpack/lib/action_view/helpers/form_options_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_options_helper.rb
@@ -1,6 +1,7 @@
 require 'cgi'
 require 'erb'
 require 'action_view/helpers/form_helper'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 07694f5ebb..ca100e102e 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -1,6 +1,7 @@
 require 'cgi'
 require 'action_view/helpers/tag_helper'
 require 'active_support/core_ext/object/returning'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 719b64b940..605e5d5873 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/big_decimal/conversions'
 require 'active_support/core_ext/float/rounding'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   module Helpers #:nodoc:
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index ccdc8181db..ebe0b4e876 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1,6 +1,7 @@
 require 'set'
 require 'active_support/json'
 require 'active_support/core_ext/object/returning'
+require 'active_support/core_ext/object/blank'
 
 module ActionView
   module Helpers
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index 9b4cacd4d7..c09d01eeee 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'set'
 
 module ActionView
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 27be1690dd..0e1bc139ff 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'action_view/helpers/tag_helper'
 
 module ActionView
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 17d16556b9..f04a89c1ac 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionView
   # There's also a convenience method for rendering sub templates within the current controller that depends on a
   # single object (we call this kind of sub templates for partials). It relies on the fact that partials should
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index b0ababe344..23b0c6e121 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'action_controller/test_case'
 require 'action_view'
 
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index a9a54a90e0..8d28040c32 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/object/blank'
 require 'active_support/ordered_hash'
 
 module ActiveModel
diff --git a/activemodel/lib/active_model/validator.rb b/activemodel/lib/active_model/validator.rb
index b7c52be3f0..906d239bcc 100644
--- a/activemodel/lib/active_model/validator.rb
+++ b/activemodel/lib/active_model/validator.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/array/wrap'
 require "active_support/core_ext/module/anonymous"
+require 'active_support/core_ext/object/blank'
 
 module ActiveModel #:nodoc:
   # A simple base class that can be used along with 
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index d623ddb915..37d9c07a22 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   class InverseOfAssociationNotFoundError < ActiveRecordError #:nodoc:
diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index bd2acd4340..5338bb099d 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -1,4 +1,5 @@
 require "active_record/associations/through_association_scope"
+require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   module Associations
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index a8698a2f5a..435aea9b09 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module AttributeMethods
     module Dirty
diff --git a/activerecord/lib/active_record/attribute_methods/query.rb b/activerecord/lib/active_record/attribute_methods/query.rb
index a949d80120..948809c65a 100644
--- a/activerecord/lib/active_record/attribute_methods/query.rb
+++ b/activerecord/lib/active_record/attribute_methods/query.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module AttributeMethods
     module Query
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 02db241ee0..b81434c1f7 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -14,6 +14,7 @@ require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/object/singleton_class'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/object/blank'
 require 'arel'
 require 'active_record/errors'
 
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 64faaef4a0..046825d43f 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'date'
 require 'set'
 require 'bigdecimal'
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 521bd810d0..55d9d20bb5 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -1,5 +1,6 @@
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_support/core_ext/kernel/requires'
+require 'active_support/core_ext/object/blank'
 require 'set'
 
 module MysqlCompat #:nodoc:
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 31d5266da8..2ae26246a2 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -1,5 +1,6 @@
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_support/core_ext/kernel/requires'
+require 'active_support/core_ext/object/blank'
 
 begin
   require_library_or_gem 'pg'
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 79f70f07cd..22f0e60083 100644
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -4,6 +4,7 @@ require 'csv'
 require 'zlib'
 require 'active_support/dependencies'
 require 'active_support/core_ext/logger'
+require 'active_support/core_ext/object/blank'
 
 if RUBY_VERSION < '1.9'
   module YAML #:nodoc:
diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index 394e1587e1..11c21a9207 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -1,6 +1,7 @@
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/object/singleton_class'
+require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   module NamedScope
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index 76ec7eb681..ee2d420194 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/object/try'
+require 'active_support/core_ext/object/blank'
 
 module ActiveRecord
   module NestedAttributes #:nodoc:
diff --git a/activerecord/lib/active_record/query_cache.rb b/activerecord/lib/active_record/query_cache.rb
index eb92bc2545..093c6c1e55 100644
--- a/activerecord/lib/active_record/query_cache.rb
+++ b/activerecord/lib/active_record/query_cache.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   class QueryCache
     module ClassMethods
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index a20c152eeb..8577ec58f7 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   class Relation
     JoinOperation = Struct.new(:relation, :join_class, :on)
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index 4a260d4caa..cb57b445e5 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module Batches # :nodoc:
     # Yields each record that was found by the find +options+. The find is
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb
index e77424a64b..a5ea6e7e3a 100644
--- a/activerecord/lib/active_record/relation/calculations.rb
+++ b/activerecord/lib/active_record/relation/calculations.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module Calculations
     # Count operates using three different approaches.
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index c1cce679b6..37aaac0894 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module FinderMethods
     # Find operates with four different retrieval approaches:
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index 0250e739b8..e224781016 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module QueryMethods
     extend ActiveSupport::Concern
diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb
index 2841ff1239..a17de1bdbb 100644
--- a/activerecord/lib/active_record/relation/spawn_methods.rb
+++ b/activerecord/lib/active_record/relation/spawn_methods.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   module SpawnMethods
     def merge(r)
diff --git a/activerecord/lib/active_record/schema.rb b/activerecord/lib/active_record/schema.rb
index a996a0ebac..a833356d15 100644
--- a/activerecord/lib/active_record/schema.rb
+++ b/activerecord/lib/active_record/schema.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveRecord
   # Allows programmers to programmatically define a schema in a portable
   # DSL. This means you can define tables, indexes, etc. without using SQL
diff --git a/activeresource/lib/active_resource/custom_methods.rb b/activeresource/lib/active_resource/custom_methods.rb
index ff14b49b07..dd3e35dfc7 100644
--- a/activeresource/lib/active_resource/custom_methods.rb
+++ b/activeresource/lib/active_resource/custom_methods.rb
@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/blank'
+
 module ActiveResource
   # A module to support custom REST methods and sub-resources, allowing you to break out
   # of the "default" REST methods with your own custom resource requests.  For example,
diff --git a/activeresource/lib/active_resource/validations.rb b/activeresource/lib/active_resource/validations.rb
index 4774c6dd22..a19e0d0ac9 100644
--- a/activeresource/lib/active_resource/validations.rb
+++ b/activeresource/lib/active_resource/validations.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/blank'
 
 module ActiveResource
   class ResourceInvalid < ClientError  #:nodoc:
diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
index d7b2f4c5be..fe2c1b9349 100644
--- a/activesupport/lib/active_support/xml_mini/libxmlsax.rb
+++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb
@@ -1,4 +1,5 @@
 require 'libxml'
+require 'active_support/core_ext/object/blank'
 
 # = XmlMini LibXML implementation using a SAX-based parser
 module ActiveSupport
diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
index d538a9110f..8af7b5e565 100644
--- a/activesupport/lib/active_support/xml_mini/nokogirisax.rb
+++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb
@@ -1,4 +1,5 @@
 require 'nokogiri'
+require 'active_support/core_ext/object/blank'
 
 # = XmlMini Nokogiri implementation using a SAX-based parser
 module ActiveSupport
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index 1e78945a7e..8a46708009 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -1,5 +1,6 @@
 require 'rails/generators/resource_helpers'
 require 'rails/generators/rails/model/model_generator'
+require 'active_support/core_ext/object/blank'
 
 module Rails
   module Generators
-- 
cgit v1.2.3


From f1e5a9ff982998c31c9dedf2fa79180c7dea820a Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Sun, 28 Mar 2010 18:47:46 +0430
Subject: Add :dependent = to has_one and has_many [#3075 state:resolved]

---
 activerecord/lib/active_record/associations.rb     | 39 ++++++++++++++++++++--
 .../associations/belongs_to_associations_test.rb   |  8 ++++-
 .../associations/has_many_associations_test.rb     |  8 +++++
 .../associations/has_one_associations_test.rb      | 10 +++++-
 activerecord/test/models/company.rb                |  5 +++
 5 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 37d9c07a22..ee87cb9b41 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -86,6 +86,15 @@ module ActiveRecord
     end
   end
 
+  # This error is raised when trying to destroy a parent instance in a N:1, 1:1 assosications
+  # (has_many, has_one) when there is at least 1 child assosociated instance.
+  # ex: if @project.tasks.size > 0, DeleteRestrictionError will be raised when trying to destroy @project
+  class DeleteRestrictionError < ActiveRecordError #:nodoc:
+    def initialize(reflection)
+      super("Cannot delete record because of dependent #{reflection.name}")
+    end
+  end
+
   # See ActiveRecord::Associations::ClassMethods for documentation.
   module Associations # :nodoc:
     extend ActiveSupport::Concern
@@ -831,6 +840,8 @@ module ActiveRecord
       #   objects are deleted *without* calling their +destroy+ method.  If set to <tt>:nullify</tt> all associated
       #   objects' foreign keys are set to +NULL+ *without* calling their +save+ callbacks. *Warning:* This option is ignored when also using
       #   the <tt>:through</tt> option.
+      #   the <tt>:through</tt> option. If set to <tt>:restrict</tt>
+      #   this object cannot be deleted if it has any associated object.
       # [:finder_sql]
       #   Specify a complete SQL statement to fetch the association. This is a good way to go for complex
       #   associations that depend on multiple tables. Note: When this option is used, +find_in_collection+ is _not_ added.
@@ -1469,9 +1480,15 @@ module ActiveRecord
 
         # Creates before_destroy callback methods that nullify, delete or destroy
         # has_many associated objects, according to the defined :dependent rule.
+        # If the association is marked as :dependent => :restrict, create a callback
+        # that prevents deleting entirely.
         #
         # See HasManyAssociation#delete_records.  Dependent associations
         # delete children, otherwise foreign key is set to NULL.
+        # See HasManyAssociation#delete_records. Dependent associations
+        # delete children if the option is set to :destroy or :delete_all, set the
+        # foreign key to NULL if the option is set to :nullify, and do not touch the
+        # child records if the option is set to :restrict.
         #
         # The +extra_conditions+ parameter, which is not used within the main
         # Active Record codebase, is meant to allow plugins to define extra
@@ -1531,14 +1548,24 @@ module ActiveRecord
                       %@#{dependent_conditions}@)
                   end
                 CALLBACK
+                when :restrict
+                  method_name = "has_many_dependent_restrict_for_#{reflection.name}".to_sym
+                  define_method(method_name) do
+                    unless send(reflection.name).empty?
+                      raise DeleteRestrictionError.new(reflection)
+                    end
+                  end
+                  before_destroy method_name
               else
-                raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, or :nullify (#{reflection.options[:dependent].inspect})"
+                raise ArgumentError, "The :dependent option expects either :destroy, :delete_all, :nullify or :restrict (#{reflection.options[:dependent].inspect})"
             end
           end
         end
 
         # Creates before_destroy callback methods that nullify, delete or destroy
         # has_one associated objects, according to the defined :dependent rule.
+        # If the association is marked as :dependent => :restrict, create a callback
+        # that prevents deleting entirely.
         def configure_dependency_for_has_one(reflection)
           if reflection.options.include?(:dependent)
             name = reflection.options[:dependent]
@@ -1559,8 +1586,16 @@ module ActiveRecord
                     association.update_attribute(#{reflection.primary_key_name.inspect}, nil) if association
                   end
                 eoruby
+              when :restrict
+                method_name = "has_one_dependent_restrict_for_#{reflection.name}".to_sym
+                define_method(method_name) do
+                  unless send(reflection.name).nil?
+                    raise DeleteRestrictionError.new(reflection)
+                  end
+                end
+                before_destroy method_name
               else
-                raise ArgumentError, "The :dependent option expects either :destroy, :delete or :nullify (#{reflection.options[:dependent].inspect})"
+                raise ArgumentError, "The :dependent option expects either :destroy, :delete, :nullify or :restrict (#{reflection.options[:dependent].inspect})"
             end
 
             before_destroy method_name
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 41a23d7f61..163ac025dd 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -439,9 +439,15 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal [author_address.id], AuthorAddress.destroyed_author_address_ids
   end
 
-  def test_invalid_belongs_to_dependent_option_raises_exception
+  def test_invalid_belongs_to_dependent_option_nullify_raises_exception
     assert_raise ArgumentError do
       Author.belongs_to :special_author_address, :dependent => :nullify
     end
   end
+  
+  def test_invalid_belongs_to_dependent_option_restrict_raises_exception
+    assert_raise ArgumentError do
+      Author.belongs_to :special_author_address, :dependent => :restrict
+    end
+  end
 end
diff --git a/activerecord/test/cases/associations/has_many_associations_test.rb b/activerecord/test/cases/associations/has_many_associations_test.rb
index 54624e79ce..c1e539d573 100644
--- a/activerecord/test/cases/associations/has_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_associations_test.rb
@@ -836,6 +836,14 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
     assert_equal num_accounts, Account.count
   end
 
+  def test_restrict
+    firm = RestrictedFirm.new(:name => 'restrict')
+    firm.save!
+    child_firm = firm.companies.create(:name => 'child')
+    assert !firm.companies.empty?
+    assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
+  end
+
   def test_included_in_collection
     assert companies(:first_firm).clients.include?(Client.find(2))
   end
diff --git a/activerecord/test/cases/associations/has_one_associations_test.rb b/activerecord/test/cases/associations/has_one_associations_test.rb
index 7372f2da1b..8f5540950e 100644
--- a/activerecord/test/cases/associations/has_one_associations_test.rb
+++ b/activerecord/test/cases/associations/has_one_associations_test.rb
@@ -177,7 +177,15 @@ class HasOneAssociationsTest < ActiveRecord::TestCase
     assert_nothing_raised { firm.destroy }
   end
 
-  def test_succesful_build_association
+  def test_dependence_with_restrict
+    firm = RestrictedFirm.new(:name => 'restrict')
+    firm.save!
+    account = firm.create_account(:credit_limit => 10)
+    assert !firm.account.nil?
+    assert_raise(ActiveRecord::DeleteRestrictionError) { firm.destroy }
+  end
+
+  def test_successful_build_association
     firm = Firm.new("name" => "GlobalMegaCorp")
     firm.save
 
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb
index f31d5f87e5..be6dd71e3b 100644
--- a/activerecord/test/models/company.rb
+++ b/activerecord/test/models/company.rb
@@ -95,6 +95,11 @@ class DependentFirm < Company
   has_many :companies, :foreign_key => 'client_of', :dependent => :nullify
 end
 
+class RestrictedFirm < Company
+  has_one :account, :foreign_key => "firm_id", :dependent => :restrict, :order => "id"
+  has_many :companies, :foreign_key => 'client_of', :order => "id", :dependent => :restrict
+end
+
 class Client < Company
   belongs_to :firm, :foreign_key => "client_of"
   belongs_to :firm_with_basic_id, :class_name => "Firm", :foreign_key => "firm_id"
-- 
cgit v1.2.3


From d1f3437cac77673bf00fd95c5a0b7c1676d70603 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 28 Mar 2010 11:34:09 -0700
Subject: Cosmetics: mismatch indentation

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

diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index 0c1334fe1b..c1838bb93e 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -4,7 +4,7 @@ module ActiveModel
       def check_validity!
          raise ArgumentError, "An object with the method include? is required must be supplied as the " <<
                               ":in option of the configuration hash" unless options[:in].respond_to?(:include?)
-       end
+      end
 
       def validate_each(record, attribute, value)
         return if options[:in].include?(value)
-- 
cgit v1.2.3


From 5c058295d1e43ea88dd4161592844263a12f02ad Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 28 Mar 2010 11:34:53 -0700
Subject: Bump mail dep to 2.1.5.1

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

diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 3e40897d60..8d6475cea9 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.1.5')
+  s.add_dependency('mail',        '~> 2.1.5.2')
   s.add_dependency('text-format', '~> 1.0.0')
 end
-- 
cgit v1.2.3


From e1a70faea675499d717cef7662262ceb03b23975 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Sun, 28 Mar 2010 11:10:38 +0100
Subject: Add constraints to resources in new routing DSL

Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 61 ++++++++++++++++++------
 actionpack/test/dispatch/routing_test.rb         | 26 ++++++++++
 2 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 26f0e14e72..2546bdd43e 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -259,6 +259,7 @@ module ActionDispatch
 
         def scope(*args)
           options = args.extract_options!
+          options = options.dup
 
           case args.first
           when String
@@ -440,6 +441,32 @@ module ActionDispatch
           def id_segment
             ":#{singular}_id"
           end
+
+          def constraints
+            options[:constraints] || {}
+          end
+
+          def id_constraint?
+            options[:id] && options[:id].is_a?(Regexp) || constraints[:id] && constraints[:id].is_a?(Regexp)
+          end
+
+          def id_constraint
+            options[:id] || constraints[:id]
+          end
+
+          def collection_options
+            (options || {}).dup.tap do |options|
+              options.delete(:id)
+              options[:constraints] = options[:constraints].dup if options[:constraints]
+              options[:constraints].delete(:id) if options[:constraints].is_a?(Hash)
+            end
+          end
+
+          def nested_options
+            options = { :name_prefix => member_name }
+            options["#{singular}_id".to_sym] = id_constraint if id_constraint?
+            options
+          end
         end
 
         class SingletonResource < Resource #:nodoc:
@@ -484,12 +511,14 @@ module ActionDispatch
                 yield if block_given?
               end
 
-              get    :show if resource.actions.include?(:show)
-              post   :create if resource.actions.include?(:create)
-              put    :update if resource.actions.include?(:update)
-              delete :destroy if resource.actions.include?(:destroy)
-              get    :new, :as => resource.name if resource.actions.include?(:new)
-              get    :edit, :as => resource.name if resource.actions.include?(:edit)
+              scope(resource.options) do
+                get    :show if resource.actions.include?(:show)
+                post   :create if resource.actions.include?(:create)
+                put    :update if resource.actions.include?(:update)
+                delete :destroy if resource.actions.include?(:destroy)
+                get    :new, :as => resource.name if resource.actions.include?(:new)
+                get    :edit, :as => resource.name if resource.actions.include?(:edit)
+              end
             end
           end
 
@@ -510,17 +539,21 @@ module ActionDispatch
               yield if block_given?
 
               with_scope_level(:collection) do
-                get  :index if resource.actions.include?(:index)
-                post :create if resource.actions.include?(:create)
-                get  :new, :as => resource.singular if resource.actions.include?(:new)
+                scope(resource.collection_options) do
+                  get  :index if resource.actions.include?(:index)
+                  post :create if resource.actions.include?(:create)
+                  get  :new, :as => resource.singular if resource.actions.include?(:new)
+                end
               end
 
               with_scope_level(:member) do
                 scope(':id') do
-                  get    :show if resource.actions.include?(:show)
-                  put    :update if resource.actions.include?(:update)
-                  delete :destroy if resource.actions.include?(:destroy)
-                  get    :edit, :as => resource.singular if resource.actions.include?(:edit)
+                  scope(resource.options) do
+                    get    :show if resource.actions.include?(:show)
+                    put    :update if resource.actions.include?(:update)
+                    delete :destroy if resource.actions.include?(:destroy)
+                    get    :edit, :as => resource.singular if resource.actions.include?(:edit)
+                  end
                 end
               end
             end
@@ -559,7 +592,7 @@ module ActionDispatch
           end
 
           with_scope_level(:nested) do
-            scope(parent_resource.id_segment, :name_prefix => parent_resource.member_name) do
+            scope(parent_resource.id_segment, parent_resource.nested_options) do
               yield
             end
           end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index c4e71a8689..b1de96cee5 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -171,6 +171,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         resources :descriptions
         root :to => 'projects#index'
       end
+
+      resources :products, :constraints => { :id => /\d{4}/ } do
+        resources :images
+      end
+
+      resource :dashboard, :constraints => { :ip => /192\.168\.1\.\d{1,3}/ }
     end
   end
 
@@ -794,6 +800,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_resource_constraints
+    with_test_routes do
+      assert_raise(ActionController::RoutingError) { get '/products/1' }
+      get '/products'
+      assert_equal 'products#index', @response.body
+      get '/products/0001'
+      assert_equal 'products#show', @response.body
+
+      assert_raise(ActionController::RoutingError) { get '/products/1/images' }
+      get '/products/0001/images'
+      assert_equal 'images#index', @response.body
+      get '/products/0001/images/1'
+      assert_equal 'images#show', @response.body
+
+      assert_raise(ActionController::RoutingError) { get '/dashboard', {}, {'REMOTE_ADDR' => '10.0.0.100'} }
+      get '/dashboard', {}, {'REMOTE_ADDR' => '192.168.1.100'}
+      assert_equal 'dashboards#show', @response.body
+    end
+  end
+
   private
     def with_test_routes
       yield
-- 
cgit v1.2.3


From 77a2a3d9b3aa461437ced326ea4a70112a8c68ed Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 28 Mar 2010 13:40:38 -0700
Subject: Request#content_type exists in Rack::Request, and other parts of
 Rack::Request expect it to return a String. Split the Rails API so that
 Request#content_type returns a String, and Request#content_mime_type returns
 a Mime::Type object.

---
 actionpack/lib/action_dispatch/http/mime_negotiation.rb    | 8 ++++++--
 actionpack/lib/action_dispatch/http/request.rb             | 6 +++---
 actionpack/lib/action_dispatch/middleware/params_parser.rb | 6 ++++--
 actionpack/test/dispatch/rack_test.rb                      | 6 +++---
 actionpack/test/dispatch/request_test.rb                   | 8 ++++----
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index fec250e928..be89924015 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -5,7 +5,7 @@ module ActionDispatch
       #
       # For backward compatibility, the post \format is extracted from the
       # X-Post-Data-Format HTTP header if present.
-      def content_type
+      def content_mime_type
         @env["action_dispatch.request.content_type"] ||= begin
           if @env['CONTENT_TYPE'] =~ /^([^,\;]*)/
             Mime::Type.lookup($1.strip.downcase)
@@ -15,13 +15,17 @@ module ActionDispatch
         end
       end
 
+      def content_type
+        content_mime_type && content_mime_type.to_s
+      end
+
       # Returns the accepted MIME type for the request.
       def accepts
         @env["action_dispatch.request.accepts"] ||= begin
           header = @env['HTTP_ACCEPT'].to_s.strip
 
           if header.empty?
-            [content_type]
+            [content_mime_type]
           else
             Mime::Type.parse(header)
           end
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index ea9f0f99c2..8b8426b5aa 100755
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -96,11 +96,11 @@ module ActionDispatch
     end
 
     def forgery_whitelisted?
-      method == :get || xhr? || content_type.nil? || !content_type.verify_request?
+      method == :get || xhr? || content_mime_type.nil? || !content_mime_type.verify_request?
     end
 
     def media_type
-      content_type.to_s
+      content_mime_type.to_s
     end
 
     # Returns the content length of the request as an integer.
@@ -157,7 +157,7 @@ module ActionDispatch
     end
 
     def form_data?
-      FORM_DATA_MEDIA_TYPES.include?(content_type.to_s)
+      FORM_DATA_MEDIA_TYPES.include?(content_mime_type.to_s)
     end
 
     def body_stream #:nodoc:
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index f4c4324fb0..18a3688bb0 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -25,7 +25,9 @@ module ActionDispatch
 
         return false if request.content_length.zero?
 
-        mime_type = content_type_from_legacy_post_data_format_header(env) || request.content_type
+        mime_type = content_type_from_legacy_post_data_format_header(env) ||
+          request.content_mime_type
+
         strategy = @parsers[mime_type]
 
         return false unless strategy
@@ -53,7 +55,7 @@ module ActionDispatch
 
         raise
           { "body"           => request.raw_post,
-            "content_type"   => request.content_type,
+            "content_type"   => request.content_mime_type,
             "content_length" => request.content_length,
             "exception"      => "#{e.message} (#{e.class})",
             "backtrace"      => e.backtrace }
diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
index 94eba2a24f..504bebbb86 100644
--- a/actionpack/test/dispatch/rack_test.rb
+++ b/actionpack/test/dispatch/rack_test.rb
@@ -122,7 +122,7 @@ class RackRequestTest < BaseRackTest
   test "cgi environment variables" do
     assert_equal "Basic", @request.auth_type
     assert_equal 0, @request.content_length
-    assert_equal nil, @request.content_type
+    assert_equal nil, @request.content_mime_type
     assert_equal "CGI/1.1", @request.gateway_interface
     assert_equal "*/*", @request.accept
     assert_equal "UTF-8", @request.accept_charset
@@ -177,12 +177,12 @@ end
 class RackRequestContentTypeTest < BaseRackTest
   test "html content type verification" do
     @request.env['CONTENT_TYPE'] = Mime::HTML.to_s
-    assert @request.content_type.verify_request?
+    assert @request.content_mime_type.verify_request?
   end
 
   test "xml content type verification" do
     @request.env['CONTENT_TYPE'] = Mime::XML.to_s
-    assert !@request.content_type.verify_request?
+    assert !@request.content_mime_type.verify_request?
   end
 end
 
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index badef4e92e..9093e1ed65 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -295,7 +295,7 @@ class RequestTest < ActiveSupport::TestCase
 
   test "content type" do
     request = stub_request 'CONTENT_TYPE' => 'text/html'
-    assert_equal Mime::HTML, request.content_type
+    assert_equal Mime::HTML, request.content_mime_type
   end
 
   test "can override format with parameter" do
@@ -310,17 +310,17 @@ class RequestTest < ActiveSupport::TestCase
 
   test "no content type" do
     request = stub_request
-    assert_equal nil, request.content_type
+    assert_equal nil, request.content_mime_type
   end
 
   test "content type is XML" do
     request = stub_request 'CONTENT_TYPE' => 'application/xml'
-    assert_equal Mime::XML, request.content_type
+    assert_equal Mime::XML, request.content_mime_type
   end
 
   test "content type with charset" do
     request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8'
-    assert_equal Mime::XML, request.content_type
+    assert_equal Mime::XML, request.content_mime_type
   end
 
   test "user agent" do
-- 
cgit v1.2.3


From b0967cc5cf5ce08e7fb0574692e3bb785e79973a Mon Sep 17 00:00:00 2001
From: Matthew Rudy Jacobs <matthewrudyjacobs@gmail.com>
Date: Tue, 2 Mar 2010 11:24:35 +0800
Subject: defining a named_scope which overwrites an existing method is now
 allowed we just log a warning.

This was motivated by the fact that :open is defined on all classes
as such the named_scope "open" can never be used, without hacking
ActiveRecord with an "undef_method" [#4083 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/named_scope.rb |  3 ++-
 activerecord/test/cases/named_scope_test.rb   | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index 11c21a9207..aac00cc54a 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -102,7 +102,8 @@ module ActiveRecord
         name = name.to_sym
 
         if !scopes[name] && respond_to?(name, true)
-          raise ArgumentError, "Cannot define scope :#{name} because #{self.name}.#{name} method already exists."
+          logger.warn "Creating scope :#{name}. " \
+                      "Overwriting existing method #{self.name}.#{name}."
         end
 
         scopes[name] = lambda do |parent_scope, *args|
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 6c2b4fa3a7..40c724b87e 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -371,8 +371,21 @@ class NamedScopeTest < ActiveRecord::TestCase
   end
 
   def test_named_scopes_with_reserved_names
-    [:where, :with_scope].each do |protected_method|
-      assert_raises(ArgumentError) { Topic.scope protected_method }
+    class << Topic
+      def public_method; end
+      public :public_method
+      
+      def protected_method; end
+      protected :protected_method
+      
+      def private_method; end
+      private :private_method
+    end
+    
+    [:public_method, :protected_method, :private_method].each do |reserved_method|
+      assert Topic.respond_to?(reserved_method, true)
+      ActiveRecord::Base.logger.expects(:warn)
+      Topic.scope(reserved_method)
     end
   end
 
-- 
cgit v1.2.3


From edaf92f5ab4b44e789e526dfa8b93cb370e595cf Mon Sep 17 00:00:00 2001
From: Vladimir Andrijevik <vladimir@andrijevik.net>
Date: Fri, 8 Jan 2010 13:57:14 -0800
Subject: Drop expires argument from call to @data in MemCacheStore so it works
 with memcache-client and memcached gems, as advertised [#3672 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activesupport/lib/active_support/cache/mem_cache_store.rb | 2 +-
 activesupport/test/caching_test.rb                        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index d584c9e254..d84a62ca2d 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -91,7 +91,7 @@ module ActiveSupport
 
       def delete(key, options = nil) # :nodoc:
         super do
-          response = @data.delete(key, expires_in(options))
+          response = @data.delete(key)
           response == Response::DELETED
         end
       rescue MemCache::MemCacheError => e
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index 00e05f76fe..d96f8e1de5 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -333,6 +333,12 @@ uses_memcached 'memcached backed store' do
       assert_equal 'bat', @cache.read('baz')
       assert_equal nil, @cache.read('foo')
     end
+
+    def test_delete_should_only_pass_key_to_data
+      key = 'foo'
+      @data.expects(:delete).with(key)
+      @cache.delete(key)
+    end
   end
 
   class CompressedMemCacheStore < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 1b9777e84f569c6abde2435d66882170e263fc90 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 28 Mar 2010 15:46:45 -0700
Subject: Why are we not updating bundler?

---
 ci/ci_build.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 1602c5106d..cd62381d9c 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -19,7 +19,7 @@ puts "[CruiseControl] Rails build"
 build_results = {}
 
 # Install required version of bundler.
-bundler_install_cmd = "sudo gem install bundler -v 0.9.10 --no-ri --no-rdoc"
+bundler_install_cmd = "sudo gem install bundler --no-ri --no-rdoc"
 puts "Running command: #{bundler_install_cmd}"
 build_results[:install_bundler] = system bundler_install_cmd
 
-- 
cgit v1.2.3


From 26bc5c542e41037fcdcf7b831d9cbbbe3bf8c96a Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Mon, 29 Mar 2010 00:10:18 +0100
Subject: Add ActionDispatch to RDoc task [#4287 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 Rakefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Rakefile b/Rakefile
index 66a65fb249..cae9b04f4a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -88,6 +88,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('actionpack/README')
   rdoc.rdoc_files.include('actionpack/CHANGELOG')
   rdoc.rdoc_files.include('actionpack/lib/action_controller/**/*.rb')
+  rdoc.rdoc_files.include('actionpack/lib/action_dispatch/**/*.rb')
   rdoc.rdoc_files.include('actionpack/lib/action_view/**/*.rb')
   rdoc.rdoc_files.exclude('actionpack/lib/action_controller/vendor/*')
 
-- 
cgit v1.2.3


From 878a9e02f662516d0d70c44beb1a3f4297342896 Mon Sep 17 00:00:00 2001
From: Paco Guzman <fjguzman@aspgems.com>
Date: Sat, 27 Mar 2010 16:16:57 +0100
Subject: html_tag option to wrap error_message_on text [#4283 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 .../lib/action_view/helpers/active_model_helper.rb  | 21 ++++++++++++---------
 .../test/template/active_model_helper_test.rb       |  4 ++++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 80b3d3a664..bbfac32322 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -97,10 +97,10 @@ module ActionView
       end
 
       # Returns a string containing the error message attached to the +method+ on the +object+ if one exists.
-      # This error message is wrapped in a <tt>DIV</tt> tag, which can be extended to include a <tt>:prepend_text</tt>
-      # and/or <tt>:append_text</tt> (to properly explain the error), and a <tt>:css_class</tt> to style it
-      # accordingly. +object+ should either be the name of an instance variable or the actual object. The method can be
-      # passed in either as a string or a symbol.
+      # This error message is wrapped in a <tt>DIV</tt> tag by default or with <tt>:html_tag</tt> if specified,
+      # which can be extended to include a <tt>:prepend_text</tt> and/or <tt>:append_text</tt> (to properly explain
+      # the error), and a <tt>:css_class</tt> to style it accordingly. +object+ should either be the name of an
+      # instance variable or the actual object. The method can be passed in either as a string or a symbol.
       # As an example, let's say you have a model <tt>@post</tt> that has an error message on the +title+ attribute:
       #
       #   <%= error_message_on "post", "title" %>
@@ -112,25 +112,28 @@ module ActionView
       #   <%= error_message_on "post", "title",
       #       :prepend_text => "Title simply ",
       #       :append_text => " (or it won't work).",
+      #       :html_tag => "span",
       #       :css_class => "inputError" %>
+      #   # => <span class="inputError">Title simply can't be empty (or it won't work).</span>
       def error_message_on(object, method, *args)
         options = args.extract_options!
         unless args.empty?
           ActiveSupport::Deprecation.warn('error_message_on takes an option hash instead of separate ' +
-            'prepend_text, append_text, and css_class arguments', caller)
+            'prepend_text, append_text, html_tag, and css_class arguments', caller)
 
           options[:prepend_text] = args[0] || ''
           options[:append_text] = args[1] || ''
-          options[:css_class] = args[2] || 'formError'
+          options[:html_tag] = args[2] || 'div'
+          options[:css_class] = args[3] || 'formError'
         end
-        options.reverse_merge!(:prepend_text => '', :append_text => '', :css_class => 'formError')
+        options.reverse_merge!(:prepend_text => '', :append_text => '', :html_tag => 'div', :css_class => 'formError')
 
         object = convert_to_model(object)
 
         if (obj = (object.respond_to?(:errors) ? object : instance_variable_get("@#{object}"))) &&
           (errors = obj.errors[method]).presence
-          content_tag("div",
-            "#{options[:prepend_text]}#{ERB::Util.h(errors.first)}#{options[:append_text]}".html_safe,
+          content_tag(options[:html_tag],
+            (options[:prepend_text].html_safe << errors.first).safe_concat(options[:append_text]),
             :class => options[:css_class]
           )
         else
diff --git a/actionpack/test/template/active_model_helper_test.rb b/actionpack/test/template/active_model_helper_test.rb
index 7a665b00bc..1a5316a689 100644
--- a/actionpack/test/template/active_model_helper_test.rb
+++ b/actionpack/test/template/active_model_helper_test.rb
@@ -266,6 +266,10 @@ class ActiveModelHelperTest < ActionView::TestCase
     assert_dom_equal "<div class=\"differentError\">beforecan't be emptyafter</div>", error_message_on(:post, :author_name, :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
   end
 
+  def test_error_message_on_with_tag_option_in_options_hash
+    assert_dom_equal "<span class=\"differentError\">beforecan't be emptyafter</span>", error_message_on(:post, :author_name, :html_tag => "span", :css_class => 'differentError', :prepend_text => 'before', :append_text => 'after')
+  end
+
   def test_error_message_on_handles_empty_errors
     assert_equal "", error_message_on(@post, :tag)
   end
-- 
cgit v1.2.3


From de2b0147d04d5460e576cc21afbb062eb012ea7e Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Wed, 10 Mar 2010 21:14:27 +0330
Subject: Reapply Rizwan's patch, but memoize Bundler.load.specs in an ivar.
 [#3697 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 railties/lib/rails/tasks/documentation.rake | 75 +++++++++++++----------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index f2fee45594..1c5db25952 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,4 +1,9 @@
 namespace :doc do
+  def gem_path(gem_name)
+    @specs ||= Bundler.load.specs
+    @specs.find{|s| s.name == gem_name}.full_gem_path
+  end
+
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
   Rake::RDocTask.new("app") { |rdoc|
     rdoc.rdoc_dir = 'doc/app'
@@ -11,54 +16,42 @@ namespace :doc do
     rdoc.rdoc_files.include('lib/**/*.rb')
   }
 
-  desc 'Generate documentation for the Rails framework. Specify path with RAILS_PATH="/path/to/rails"'
-  path = ENV['RAILS_PATH']
-  unless path && File.directory?(path)
-    task :rails do
-      if path
-        $stderr.puts "Skipping doc:rails, missing Rails directory at #{path}"
-      else
-        $stderr.puts "Skipping doc:rails, RAILS_PATH environment variable is not set"
-      end
+  desc 'Generate documentation for the Rails framework.'
+  Rake::RDocTask.new("rails") { |rdoc|
+    rdoc.rdoc_dir = 'doc/api'
+    rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+    rdoc.title    = "Rails Framework Documentation"
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README')
+
+    %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('actionmailer')}/#{file}")
     end
-  else
-    Rake::RDocTask.new("rails") { |rdoc|
-      version = "-#{Rails::VERSION::STRING}" unless ENV['RAILS_PATH']
-      rdoc.rdoc_dir = 'doc/api'
-      rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-      rdoc.title    = "Rails Framework Documentation"
-      rdoc.options << '--line-numbers' << '--inline-source'
-      rdoc.rdoc_files.include('README')
-
-      %w(README CHANGELOG lib/action_mailer/base.rb).each do |file|
-        rdoc.rdoc_files.include("#{path}/actionmailer#{version}/#{file}")
-      end
 
-      %w(README CHANGELOG lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{path}/actionpack#{version}/#{file}")
-      end
+    %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('actionpack')}/#{file}")
+    end
 
-      %w(README CHANGELOG lib/active_model/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{path}/activemodel#{version}/#{file}")
-      end
+    %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('activemodel')}/#{file}")
+    end
 
-      %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{path}/activerecord#{version}/#{file}")
-      end
+    %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('activerecord')}/#{file}")
+    end
 
-      %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
-        rdoc.rdoc_files.include("#{path}/activeresource#{version}/#{file}")
-      end
+    %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('activeresource')}/#{file}")
+    end
 
-      %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{path}/activesupport#{version}/#{file}")
-      end
+    %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('activesupport')}/#{file}")
+    end
 
-      %w(README CHANGELOG MIT-LICENSE lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
-        rdoc.rdoc_files.include("#{path}/railties#{version}/#{file}")
-      end
-    }
-  end
+    %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+      rdoc.rdoc_files.include("#{gem_path('railties')}/#{file}")
+    end
+  }
 
   plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
 
-- 
cgit v1.2.3


From fc6746fc3f102029020e3893cde5480a58470d59 Mon Sep 17 00:00:00 2001
From: Eugene Pimenov <libc@mac.com>
Date: Sun, 20 Sep 2009 14:35:24 +0400
Subject: PostgreSQL adapter: escape_bytea, quote_string and unescape_bytea
 aren't thread-safe in Ruby 1.8 [#3237 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 .../active_record/connection_adapters/postgresql_adapter.rb  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 2ae26246a2..a6042e1382 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -300,7 +300,7 @@ module ActiveRecord
       # QUOTING ==================================================
 
       # Escapes binary strings for bytea input to the database.
-      def escape_bytea(value)
+      def escape_bytea(original_value)
         if @connection.respond_to?(:escape_bytea)
           self.class.instance_eval do
             define_method(:escape_bytea) do |value|
@@ -324,13 +324,13 @@ module ActiveRecord
             end
           end
         end
-        escape_bytea(value)
+        escape_bytea(original_value)
       end
 
       # Unescapes bytea output from a database to the binary string it represents.
       # NOTE: This is NOT an inverse of escape_bytea! This is only to be used
       #       on escaped binary output from database drive.
-      def unescape_bytea(value)
+      def unescape_bytea(original_value)
         # In each case, check if the value actually is escaped PostgreSQL bytea output
         # or an unescaped Active Record attribute that was just written.
         if PGconn.respond_to?(:unescape_bytea)
@@ -370,7 +370,7 @@ module ActiveRecord
             end
           end
         end
-        unescape_bytea(value)
+        unescape_bytea(original_value)
       end
 
       # Quotes PostgreSQL-specific data types for SQL input.
@@ -395,7 +395,7 @@ module ActiveRecord
       end
 
       # Quotes strings for use in SQL input in the postgres driver for better performance.
-      def quote_string(s) #:nodoc:
+      def quote_string(original_value) #:nodoc:
         if @connection.respond_to?(:escape)
           self.class.instance_eval do
             define_method(:quote_string) do |s|
@@ -415,7 +415,7 @@ module ActiveRecord
             remove_method(:quote_string)
           end
         end
-        quote_string(s)
+        quote_string(original_value)
       end
 
       # Checks the following cases:
-- 
cgit v1.2.3


From 4b07352420c4a3c0fdae40fd6fd31796f39a8909 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 28 Mar 2010 18:17:11 -0700
Subject: ./tools/console to drop into irb with rails loaded

---
 tools/console | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 tools/console

diff --git a/tools/console b/tools/console
new file mode 100755
index 0000000000..ea995a1a54
--- /dev/null
+++ b/tools/console
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require File.expand_path('../../load_paths', __FILE__)
+require 'rails/all'
+require 'active_support/all'
+require 'irb'
+require 'irb/completion'
+IRB.start
-- 
cgit v1.2.3


From 72074aac334a846fbb53e7cb12c0254c15004c26 Mon Sep 17 00:00:00 2001
From: Jan De Poorter <jan@defv.be>
Date: Thu, 25 Feb 2010 16:21:41 +0100
Subject: Add _index to named collection routes for uncountable resources (e.g.
 Sheep)

Signed-off-by: Rizwan Reza <rizwanreza@gmail.com>
---
 actionpack/lib/action_dispatch/routing/mapper.rb | 6 +++++-
 actionpack/test/dispatch/routing_test.rb         | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 2546bdd43e..fa64a2f1d0 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -426,7 +426,11 @@ module ActionDispatch
           end
 
           def collection_name
-            plural
+            uncountable? ? "#{plural}_index" : plural
+          end
+          
+          def uncountable?
+            singular == plural
           end
 
           def name_for_action(action)
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index b1de96cee5..4821b5986c 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -113,6 +113,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       resources :posts, :only => [:index, :show] do
         resources :comments, :except => :destroy
       end
+      
+      resources :sheep
 
       match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
 
@@ -530,6 +532,13 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_raise(ActionController::RoutingError) { delete '/posts/1/comments' }
     end
   end
+  
+  def test_resources_for_uncountable_names
+    with_test_routes do
+      assert_equal '/sheep', sheep_index_path
+      assert_equal '/sheep/1', sheep_path(1)
+    end
+  end
 
   def test_path_names
     with_test_routes do
-- 
cgit v1.2.3


From cf6734fdf9d72bfc7fe92e36bf603d67ad815e6b Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Mon, 29 Mar 2010 05:45:32 +0430
Subject: Add more tests and docs to uncountable routes. [#3930 state:resolved]

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

diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index fa64a2f1d0..8a84afd315 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -425,10 +425,11 @@ module ActionDispatch
             singular
           end
 
+          # Checks for uncountable plurals, and appends "_index" if they're.
           def collection_name
             uncountable? ? "#{plural}_index" : plural
           end
-          
+
           def uncountable?
             singular == plural
           end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 4821b5986c..10cc4dfb4f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -113,7 +113,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       resources :posts, :only => [:index, :show] do
         resources :comments, :except => :destroy
       end
-      
+
       resources :sheep
 
       match 'sprockets.js' => ::TestRoutingMapper::SprocketsApp
@@ -532,11 +532,13 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_raise(ActionController::RoutingError) { delete '/posts/1/comments' }
     end
   end
-  
+
   def test_resources_for_uncountable_names
     with_test_routes do
       assert_equal '/sheep', sheep_index_path
       assert_equal '/sheep/1', sheep_path(1)
+      assert_equal '/sheep/new', new_sheep_path
+      assert_equal '/sheep/1/edit', edit_sheep_path(1)
     end
   end
 
-- 
cgit v1.2.3


From 49bc6a249e2a200216f8a96c36093a2c7a471c9b Mon Sep 17 00:00:00 2001
From: Craig R Webster <craig@barkingiguana.com>
Date: Sun, 21 Mar 2010 19:35:38 +0000
Subject: Allow customisation of asset path generation using a proc.

Set config.action_controller.asset_path_template to a proc that takes one
argument - the direct, unchanged asset path - and returns a path to that asset
using the scheme that your assets require.

This is useful if you have a setup which scales by introducing new application
servers where the mtime of the asset files may not be the same as those of the
asset files on your previous servers, but it does require your web servers to
have knowledge of the asset template paths that you rewrite to so it's not
suitable for out-of-the-box use. An example of configuring asset path
generation and rewriting these paths using Apache is included in
actionpack/lib/action_view/helpers/asset_tag_helper.rb.

Signed-off-by: wycats <wycats@gmail.com>
---
 .../lib/action_view/helpers/asset_tag_helper.rb    | 68 +++++++++++++++++++++-
 actionpack/test/template/asset_tag_helper_test.rb  |  9 +++
 railties/guides/source/configuring.textile         |  2 +
 3 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 02ad41719b..635c58bc35 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -108,7 +108,7 @@ module ActionView
     #     "http://asset%d.example.com", "https://asset1.example.com"
     #   )
     #
-    # === Using asset timestamps
+    # === Using asset path templates
     #
     # By default, Rails appends asset's timestamps to all asset paths. This allows
     # you to set a cache-expiration date for the asset far into the future, but
@@ -133,6 +133,65 @@ module ActionView
     # will request the same assets over and over again even thought they didn't
     # change. You can use something like Live HTTP Headers for Firefox to verify
     # that the cache is indeed working.
+    #
+    # This strategy works well enough for most server setups and requires the
+    # least configuration, but if you deploy several application servers at
+    # different times - say to handle a temporary spike in load - then the
+    # asset time stamps will be out of sync. In a setup like this you may want
+    # to set the way that asset paths are generated yourself.
+    #
+    # Altering the asset paths that Rails generates can be done in two ways.
+    # The easiest is to define the RAILS_ASSET_ID environment variable. The
+    # contents of this variable will always be used in preference to
+    # calculated timestamps. A more complex but flexible way is to set
+    # <tt>ActionController::Base.config.asset_path_template</tt> to a proc
+    # that takes the unmodified asset path and returns the path needed for
+    # your asset caching to work. Typically you'd do something like this in
+    # <tt>config/environments/production.rb</tt>:
+    #
+    #   # Normally you'd calculate RELEASE_NUMBER at startup.
+    #   RELEASE_NUMBER = 12345
+    #   config.action_controller.asset_path_template = proc { |asset_path|
+    #     "/release-#{RELEASE_NUMBER}#{asset_path}"
+    #   }
+    #
+    # This example would cause the following behaviour on all servers no
+    # matter when they were deployed:
+    #
+    #   image_tag("rails.png")
+    #   # => <img alt="Rails" src="/release-12345/images/rails.png" />
+    #   stylesheet_link_tag("application")
+    #   # => <link href="/release-12345/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
+    #
+    # Changing the asset_path_template does require that your web servers have
+    # knowledge of the asset template paths that you rewrite to so it's not
+    # suitable for out-of-the-box use. To use the example given above you
+    # could use something like this in your Apache VirtualHost configuration:
+    #
+    #   <LocationMatch "^/release-\d+/(images|javascripts|stylesheets)/.*$">
+    #     # Some browsers still send conditional-GET requests if there's a
+    #     # Last-Modified header or an ETag header even if they haven't
+    #     # reached the expiry date sent in the Expires header.
+    #     Header unset Last-Modified
+    #     Header unset ETag
+    #     FileETag None
+    #
+    #     # Assets requested using a cache-busting filename should be served
+    #     # only once and then cached for a really long time. The HTTP/1.1
+    #     # spec frowns on hugely-long expiration times though and suggests
+    #     # that assets which never expire be served with an expiration date
+    #     # 1 year from access.
+    #     ExpiresActive On
+    #     ExpiresDefault "access plus 1 year"
+    #   </LocationMatch>
+    #
+    #   # We use cached-busting location names with the far-future expires
+    #   # headers to ensure that if a file does change it can force a new
+    #   # request. The actual asset filenames are still the same though so we
+    #   # need to rewrite the location from the cache-busting location to the
+    #   # real asset location so that we can serve it.
+    #   RewriteEngine On
+    #   RewriteRule ^/release-\d+/(images|javascripts|stylesheets)/(.*)$ /$1/$2 [L]
     module AssetTagHelper
       JAVASCRIPT_DEFAULT_SOURCES = ['prototype', 'effects', 'dragdrop', 'controls', 'rails'].freeze unless const_defined?(:JAVASCRIPT_DEFAULT_SOURCES)
 
@@ -646,7 +705,12 @@ module ActionView
 
           source += ".#{ext}" if rewrite_extension?(source, dir, ext)
           source  = "/#{dir}/#{source}" unless source[0] == ?/
-          source  = rewrite_asset_path(source)
+          asset_path_template = config.asset_path_template
+          if asset_path_template && asset_path_template.respond_to?(:call)
+            source = asset_path_template.call(source)
+          else
+            source = rewrite_asset_path(source)
+          end
 
           has_request = controller.respond_to?(:request)
           if has_request && include_host && source !~ %r{^#{controller.config.relative_url_root}/}
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index c471df861d..43d11df8fe 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -373,6 +373,15 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
+  def test_proc_asset_id
+    @controller.config.asset_path_template = Proc.new do |asset_path|
+      "/assets.v12345#{asset_path}"
+    end
+
+    expected_path = "/assets.v12345/images/rails.png"
+    assert_equal %(<img alt="Rails" src="#{expected_path}" />), image_tag("rails.png")
+  end
+
   def test_timebased_asset_id_with_relative_url_root
     @controller.config.relative_url_root = "/collaboration/hieraki"
     expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index 5418ad7dd4..e438d4cc0a 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -133,6 +133,8 @@ h4. Configuring Action Controller
 
 * +config.action_controller.asset_host+ provides a string that is prepended to all of the URL-generating helpers in +AssetHelper+. This is designed to allow moving all javascript, CSS, and image files to a separate asset host.
 
+* +config.action_controller.asset_template_path+ allows you to override the default asset path generation by providing your own instructions.
+
 * +config.action_controller.consider_all_requests_local+ is generally set to +true+ during development and +false+ during production; if it is set to +true+, then any error will cause detailed debugging information to be dumped in the HTTP response. For finer-grained control, set this to +false+ and implement +local_request?+ to specify which requests should provide debugging information on errors.
 
 * +config.action_controller.allow_concurrency+ should be set to +true+ to allow concurrent (threadsafe) action processing. Set to +false+ by default. You probably don't want to call this one directly, though, because a series of other adjustments need to be made for threadsafe mode to work properly. Instead, you should simply call +config.threadsafe!+ inside your +production.rb+ file, which makes all the necessary adjustments.
-- 
cgit v1.2.3


From 201e8986b15f4d815355e0ca96e02cf16dba9372 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 28 Mar 2010 18:45:52 -0700
Subject: Updated asset_template_path to asset_path and have it also support a
 String [#4247 state:resolved]

---
 .../lib/action_view/helpers/asset_tag_helper.rb     | 21 +++++++++++----------
 actionpack/test/template/asset_tag_helper_test.rb   |  9 ++++++++-
 railties/guides/source/configuring.textile          |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 635c58bc35..e4ec17467e 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -108,7 +108,7 @@ module ActionView
     #     "http://asset%d.example.com", "https://asset1.example.com"
     #   )
     #
-    # === Using asset path templates
+    # === Customizing the asset path
     #
     # By default, Rails appends asset's timestamps to all asset paths. This allows
     # you to set a cache-expiration date for the asset far into the future, but
@@ -144,7 +144,7 @@ module ActionView
     # The easiest is to define the RAILS_ASSET_ID environment variable. The
     # contents of this variable will always be used in preference to
     # calculated timestamps. A more complex but flexible way is to set
-    # <tt>ActionController::Base.config.asset_path_template</tt> to a proc
+    # <tt>ActionController::Base.config.asset_path</tt> to a proc
     # that takes the unmodified asset path and returns the path needed for
     # your asset caching to work. Typically you'd do something like this in
     # <tt>config/environments/production.rb</tt>:
@@ -163,7 +163,7 @@ module ActionView
     #   stylesheet_link_tag("application")
     #   # => <link href="/release-12345/stylesheets/application.css?1232285206" media="screen" rel="stylesheet" type="text/css" />
     #
-    # Changing the asset_path_template does require that your web servers have
+    # Changing the asset_path does require that your web servers have
     # knowledge of the asset template paths that you rewrite to so it's not
     # suitable for out-of-the-box use. To use the example given above you
     # could use something like this in your Apache VirtualHost configuration:
@@ -705,12 +705,7 @@ module ActionView
 
           source += ".#{ext}" if rewrite_extension?(source, dir, ext)
           source  = "/#{dir}/#{source}" unless source[0] == ?/
-          asset_path_template = config.asset_path_template
-          if asset_path_template && asset_path_template.respond_to?(:call)
-            source = asset_path_template.call(source)
-          else
-            source = rewrite_asset_path(source)
-          end
+          source = rewrite_asset_path(source, config.asset_path)
 
           has_request = controller.respond_to?(:request)
           if has_request && include_host && source !~ %r{^#{controller.config.relative_url_root}/}
@@ -774,7 +769,13 @@ module ActionView
 
         # Break out the asset path rewrite in case plugins wish to put the asset id
         # someplace other than the query string.
-        def rewrite_asset_path(source)
+        def rewrite_asset_path(source, path = nil)
+          if path && path.respond_to?(:call)
+            return path.call(source)
+          elsif path && path.is_a?(String)
+            return path % [source]
+          end
+
           asset_id = rails_asset_id(source)
           if asset_id.blank?
             source
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 43d11df8fe..fbd504ae7d 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -373,8 +373,15 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")
   end
 
+  def test_string_asset_id
+    @controller.config.asset_path = "/assets.v12345%s"
+
+    expected_path = "/assets.v12345/images/rails.png"
+    assert_equal %(<img alt="Rails" src="#{expected_path}" />), image_tag("rails.png")
+  end
+
   def test_proc_asset_id
-    @controller.config.asset_path_template = Proc.new do |asset_path|
+    @controller.config.asset_path = Proc.new do |asset_path|
       "/assets.v12345#{asset_path}"
     end
 
diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index e438d4cc0a..e35126fc5a 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -133,7 +133,7 @@ h4. Configuring Action Controller
 
 * +config.action_controller.asset_host+ provides a string that is prepended to all of the URL-generating helpers in +AssetHelper+. This is designed to allow moving all javascript, CSS, and image files to a separate asset host.
 
-* +config.action_controller.asset_template_path+ allows you to override the default asset path generation by providing your own instructions.
+* +config.action_controller.asset_path+ allows you to override the default asset path generation by providing your own instructions.
 
 * +config.action_controller.consider_all_requests_local+ is generally set to +true+ during development and +false+ during production; if it is set to +true+, then any error will cause detailed debugging information to be dumped in the HTTP response. For finer-grained control, set this to +false+ and implement +local_request?+ to specify which requests should provide debugging information on errors.
 
-- 
cgit v1.2.3


From bd69589143371254b6d71aa74b1230144eb30a9c Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 28 Mar 2010 19:07:50 -0700
Subject: preinitializer.rb is no longer needed, so remove it from the guide
 and replace with better suggestion. [#4279 state:resolved]

---
 railties/guides/source/configuring.textile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/railties/guides/source/configuring.textile b/railties/guides/source/configuring.textile
index e35126fc5a..55077bcd24 100644
--- a/railties/guides/source/configuring.textile
+++ b/railties/guides/source/configuring.textile
@@ -9,24 +9,24 @@ endprologue.
 
 h3. Locations for Initialization Code
 
-Rails offers (at least) five good spots to place initialization code:
+Rails offers (at least) four good spots to place initialization code:
 
-* Preinitializers
-* environment.rb
+* application.rb
 * Environment-specific Configuration Files
 * Initializers (load_application_initializers)
 * After-Initializers
 
-h3. Using a Preinitializer
+h3. Running Code Before Rails
 
-Rails allows you to use a preinitializer to run code before the framework itself is loaded. If you save code in +RAILS_ROOT/config/preinitializer.rb+, that code will be the first thing loaded, before any of the framework components (Active Record, Action Pack, and so on.) If you want to change the behavior of one of the classes that is used in the initialization process, you can do so in this file.
+To run some code before Rails itself is loaded, simply put it above the call to
++require 'rails/all'+ in your +application.rb+.
 
 h3. Configuring Rails Components
 
-In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The +environment.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components. For example, the default Rails 2.3 +environment.rb+ file includes one setting:
+In general, the work of configuring Rails means configuring the components of Rails, as well as configuring Rails itself. The +application.rb+ and environment-specific configuration files (such as +config/environments/production.rb+) allow you to specify the various settings that you want to pass down to all of the components. For example, the default Rails 2.3 +application.rb+ file includes one setting:
 
 <ruby>
-config.time_zone = 'UTC'
+config.filter_parameters << :password
 </ruby>
 
 This is a setting for Rails itself. If you want to pass settings to individual Rails components, you can do so via the same +config+ object:
@@ -53,8 +53,6 @@ h4. Rails General Configuration
 
 * +config.eager_load_paths+ accepts an array of paths from which Rails will eager load on boot if cache classes is enabled. All elements of this array must also be in +load_paths+. 
 
-* +config.frameworks+ accepts an array of rails framework components that should be loaded. (Defaults to +:active_record+, +:action_controller+, +:action_view+, +:action_mailer+, and +:active_resource+). 
-
 * +config.load_once_paths+ accepts an array of paths from which Rails will automatically load from only once. All elements of this array must also be in +load_paths+.
 
 * +config.load_paths+ accepts an array of additional paths to prepend to the load path. By default, all app, lib, vendor and mock paths are included in this list. 
-- 
cgit v1.2.3


From a4eab8f1f3306656bef3bacebaceec4e88fdc57b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 28 Mar 2010 19:11:06 -0700
Subject: Update example of default_scope to use the new arel finder syntax

---
 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 b81434c1f7..21b89694fc 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1290,7 +1290,7 @@ module ActiveRecord #:nodoc:
         # <tt>options</tt> argument is the same as in find.
         #
         #   class Person < ActiveRecord::Base
-        #     default_scope :order => 'last_name, first_name'
+        #     default_scope order('last_name, first_name')
         #   end
         def default_scope(options = {})
           self.default_scoping << construct_finder_arel(options)
-- 
cgit v1.2.3


From 4ea289fb1175daed88f1d4119b441505c1e10f57 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Mon, 29 Mar 2010 00:23:02 -0300
Subject: ruby-debug19 added to Gemfile [#4290 state:committed]

Signed-off-by: wycats <wycats@gmail.com>
---
 Gemfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Gemfile b/Gemfile
index ea9842c0c5..951137b243 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,6 +11,8 @@ group :mri do
   if RUBY_VERSION < '1.9'
     gem "system_timer"
     gem "ruby-debug", ">= 0.10.3"
+  else
+    gem "ruby-debug19"
   end
 end
 
-- 
cgit v1.2.3


From 98d2d8ce2c2f332ee337b9ab2110300e1f2bf1f2 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Sun, 28 Mar 2010 22:14:32 -0700
Subject: use the database to lower case strings rather than ruby. [#4293
 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/validations/uniqueness.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index e28808df98..4806fa0ecc 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -67,13 +67,11 @@ module ActiveRecord
 
         if value.nil? || (options[:case_sensitive] || !column.text?)
           sql = "#{sql_attribute} #{operator}"
-          params = [value]
         else
-          sql = "LOWER(#{sql_attribute}) #{operator}"
-          params = [value.mb_chars.downcase]
+          sql = "LOWER(#{sql_attribute}) = LOWER(?)"
         end
 
-        [sql, params]
+        [sql, [value]]
       end
     end
 
-- 
cgit v1.2.3


From a0dc6755db71b33aebccdb95fd0dd7097c934c04 Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Mon, 29 Mar 2010 09:52:33 +0430
Subject: Reorganized app/test directory. [#3057 state:resolved]

Run 'rake update:test_directory' to reorganize your already generated apps.

test/functional                   ->      test/controllers
test/functional                   ->      test/controllers
test/unit/helpers                 ->      test/helpers
test/unit/**/*_observer_test.rb   ->      test/observers
test/unit                         ->      test/models
---
 railties/CHANGELOG                                 |  2 +
 .../templates/test/controllers/.empty_directory    |  0
 .../app/templates/test/functional/.empty_directory |  0
 .../app/templates/test/helpers/.empty_directory    |  0
 .../templates/test/integration/.empty_directory    |  0
 .../app/templates/test/models/.empty_directory     |  0
 .../rails/app/templates/test/unit/.empty_directory |  0
 .../test_unit/controller/controller_generator.rb   |  2 +-
 .../test_unit/helper/helper_generator.rb           |  2 +-
 .../test_unit/integration/integration_generator.rb |  2 +-
 .../test_unit/mailer/mailer_generator.rb           |  2 +-
 .../test_unit/mailer/templates/controller_test.rb  | 20 +++++++++
 .../test_unit/mailer/templates/functional_test.rb  | 20 ---------
 .../generators/test_unit/model/model_generator.rb  |  2 +-
 .../test_unit/observer/observer_generator.rb       |  2 +-
 .../test_unit/scaffold/scaffold_generator.rb       |  2 +-
 railties/lib/rails/tasks/framework.rake            | 47 +++++++++++++++++++++-
 railties/lib/rails/test_unit/testing.rake          | 36 ++++++++++-------
 railties/test/generators/app_generator_test.rb     |  6 +--
 .../test/generators/controller_generator_test.rb   |  8 ++--
 railties/test/generators/helper_generator_test.rb  |  2 +-
 .../generators/integration_test_generator_test.rb  |  2 +-
 railties/test/generators/mailer_generator_test.rb  |  2 +-
 railties/test/generators/model_generator_test.rb   |  2 +-
 .../test/generators/observer_generator_test.rb     |  2 +-
 .../test/generators/resource_generator_test.rb     | 10 ++---
 .../scaffold_controller_generator_test.rb          |  8 ++--
 .../test/generators/scaffold_generator_test.rb     | 12 +++---
 28 files changed, 123 insertions(+), 70 deletions(-)
 create mode 100644 railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory
 create mode 100644 railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory
 create mode 100644 railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory
 create mode 100644 railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb
 delete mode 100644 railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 0b67479742..9cd6c53bc5 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* Reorganized app/test directory. Run rake update:test_directory to reorganize your apps [Rizwan Reza]
+
 * Added "rake about" as a replacement for script/about [DHH]
 
 * Removed all the default commands in script/* and replaced them with script/rails and a rails command that'll act the same when run from within the app [DHH]. Example:
diff --git a/railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
index 20f3bd8965..db99e55e9e 100644
--- a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
@@ -8,7 +8,7 @@ module TestUnit
 
       def create_test_files
         template 'functional_test.rb',
-                 File.join('test/functional', class_path, "#{file_name}_controller_test.rb")
+                 File.join('test/controllers', class_path, "#{file_name}_controller_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
index 4ea80bf7be..d4c287540c 100644
--- a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
@@ -6,7 +6,7 @@ module TestUnit
       check_class_collision :suffix => "HelperTest"
 
       def create_helper_files
-        template 'helper_test.rb', File.join('test/unit/helpers', class_path, "#{file_name}_helper_test.rb")
+        template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
index 32d0fac029..af45998bc1 100644
--- a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
+++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
@@ -6,7 +6,7 @@ module TestUnit
       check_class_collision :suffix => "Test"
 
       def create_test_files
-        template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+        template 'integration_test.rb', File.join('test/controllers', class_path, "#{file_name}_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
index 1a49286d41..894d24049c 100644
--- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
@@ -7,7 +7,7 @@ module TestUnit
       check_class_collision :suffix => "Test"
 
       def create_test_files
-        template "functional_test.rb", File.join('test/functional', class_path, "#{file_name}_test.rb")
+        template "controller_test.rb", File.join('test/controllers', class_path, "#{file_name}_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb
new file mode 100644
index 0000000000..80ac7f0feb
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb
@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class <%= class_name %>Test < ActionMailer::TestCase
+<% for action in actions -%>
+  test "<%= action %>" do
+    mail = <%= class_name %>.<%= action %>
+    assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
+    assert_equal ["to@example.org"], mail.to
+    assert_equal ["from@example.com"], mail.from
+    assert_match "Hi", mail.body.encoded
+  end
+
+<% end -%>
+<% if actions.blank? -%>
+  # replace this with your real tests
+  test "the truth" do
+    assert true
+  end
+<% end -%>
+end
diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
deleted file mode 100644
index 80ac7f0feb..0000000000
--- a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'test_helper'
-
-class <%= class_name %>Test < ActionMailer::TestCase
-<% for action in actions -%>
-  test "<%= action %>" do
-    mail = <%= class_name %>.<%= action %>
-    assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
-    assert_equal ["to@example.org"], mail.to
-    assert_equal ["from@example.com"], mail.from
-    assert_match "Hi", mail.body.encoded
-  end
-
-<% end -%>
-<% if actions.blank? -%>
-  # replace this with your real tests
-  test "the truth" do
-    assert true
-  end
-<% end -%>
-end
diff --git a/railties/lib/rails/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb
index 609b815683..17c431ae81 100644
--- a/railties/lib/rails/generators/test_unit/model/model_generator.rb
+++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb
@@ -9,7 +9,7 @@ module TestUnit
       check_class_collision :suffix => "Test"
 
       def create_test_file
-        template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb")
+        template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement
diff --git a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
index 6cc1158c21..5db111ec68 100644
--- a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
@@ -6,7 +6,7 @@ module TestUnit
       check_class_collision :suffix => "ObserverTest"
 
       def create_test_files
-        template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_observer_test.rb")
+        template 'unit_test.rb',  File.join('test/observers', class_path, "#{file_name}_observer_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index c0315c7fe6..5d1ac1dde4 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -11,7 +11,7 @@ module TestUnit
 
       def create_test_files
         template 'functional_test.rb',
-                 File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")
+                 File.join('test/controllers', controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index 738f7f5301..a3109a9243 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -17,7 +17,7 @@ namespace :rails do
   end
 
   desc "Update both configs, scripts and public/javascripts from Rails"
-  task :update => [ "update:configs", "update:javascripts", "update:scripts", "update:application_controller" ]
+  task :update => [ "update:configs", "update:javascripts", "update:scripts", "update:application_controller", "update:test_directory" ]
 
   desc "Applies the template supplied by LOCATION=/path/to/template"
   task :template do
@@ -72,5 +72,50 @@ namespace :rails do
         puts "#{old_style} has been renamed to #{new_style}, update your SCM as necessary"
       end
     end
+
+    desc "Move test directories to new locations"
+    task :test_directory do
+      if File.exists?(Rails.root.join('test'))
+        FileUtils.mkdir(Rails.root.join('test/controllers')) unless File.exists?(Rails.root.join('test/controllers'))
+        [Rails.root.join('test/functional'), Rails.root.join('test/integration')].each do |controller_test_dir|
+          if File.exists?(controller_test_dir)
+            puts "#{controller_test_dir} exists"
+            FileUtils.mv(Dir["#{controller_test_dir}/**/*"], Rails.root.join('test/controllers'), :force => true)
+            FileUtils.rm_rf(controller_test_dir)
+          end
+        end
+
+        if File.exists?(Rails.root.join('test/unit/helpers'))
+          FileUtils.mkdir(Rails.root.join('test/helpers')) unless File.exists?(Rails.root.join('test/helpers'))
+          FileUtils.mv(Dir[Rails.root.join('test/unit/helpers/**/*')], Rails.root.join('test/helpers'), :force => true)
+        else
+          unless File.exists?(Rails.root.join('test/helpers'))
+            FileUtils.mkdir(Rails.root.join('test/helpers'))
+          end
+        end
+        
+        if File.exists?(Rails.root.join('test/unit'))
+          observer_tests = "#{Rails.root}/test/unit/**/*_observer_test.rb"
+          unless observer_tests.empty?
+            FileUtils.mkdir(Rails.root.join('test/observers')) unless File.exists?(Rails.root.join('test/observers'))
+            FileUtils.mv(observer_tests, Rails.root.join('test/observers'), :force => true)
+          end
+          FileUtils.mkdir(Rails.root.join('test/models')) unless File.exists?(Rails.root.join('test/models'))
+          FileUtils.mv(Dir[Rails.root.join('test/unit/*')], Rails.root.join('test/models'), :force => true)
+          FileUtils.rm_rf(Rails.root.join('test/unit'))
+        end
+      end
+      
+      puts <<-TEST
+      
+      All test directories have been updated:
+      
+      test/functional                   ->      test/controllers
+      test/functional                   ->      test/controllers
+      test/unit/helpers                 ->      test/helpers
+      test/unit/**/*_observer_test.rb   ->      test/observers
+      test/unit                         ->      test/models
+      TEST
+    end
   end
 end
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 57857fb911..4f34707f53 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -40,7 +40,7 @@ end
 
 desc 'Run all unit, functional and integration tests'
 task :test do
-  errors = %w(test:units test:functionals test:integration).collect do |task|
+  errors = %w(test:models test:controllers test:helpers).collect do |task|
     begin
       Rake::Task[task].invoke
       nil
@@ -55,8 +55,10 @@ namespace :test do
   Rake::TestTask.new(:recent => "db:test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
-      recent_tests('app/models/**/*.rb', 'test/unit', since) +
-      recent_tests('app/controllers/**/*.rb', 'test/functional', since)
+      recent_tests('app/models/**/*.rb', 'test/models', since) +
+      recent_tests('app/models/**/*_observer.rb', 'test/observers', since) +
+      recent_tests('app/controllers/**/*.rb', 'test/controllers', since) +
+      recent_tests('app/helpers/**/*.rb', 'test/helpers', since)
 
     t.libs << 'test'
     t.test_files = touched.uniq
@@ -74,35 +76,39 @@ namespace :test do
       end
 
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
+      observers   = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*_observer\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
+      helpers     = changed_since_checkin.select { |path| path =~ /app[\\\/]helpers[\\\/].*\.rb$/ }
 
-      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
-      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
+      model_tests      = models.map { |model| "test/models/#{File.basename(model, '.rb')}_test.rb" }
+      observer_tests   = observers.map { |observer| "test/observers/#{File.basename(observer, '.rb')}_test.rb" }
+      controller_tests = controllers.map { |controller| "test/controllers/#{File.basename(controller, '.rb')}_test.rb" }
+      helper_tests     = helpers.map { |helper| "test/helpers/#{File.basename(helper, '.rb')}_test.rb" }
 
-      unit_tests.uniq + functional_tests.uniq
+      (model_tests + observer_tests + controller_tests + helper_tests).uniq
     end
 
     t.libs << 'test'
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-  Rake::TestTask.new(:units => "db:test:prepare") do |t|
+  Rake::TestTask.new(:models => "db:test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/unit/**/*_test.rb'
+    t.pattern = ['test/models/**/*_test.rb', 'test/observers/**/*_test.rb']
   end
-  Rake::Task['test:units'].comment = "Run the unit tests in test/unit"
+  Rake::Task['test:models'].comment = "Run the unit tests in test/models and test/observers"
 
-  Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
+  Rake::TestTask.new(:controllers => "db:test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/functional/**/*_test.rb'
+    t.pattern = 'test/controllers/**/*_test.rb'
   end
-  Rake::Task['test:functionals'].comment = "Run the functional tests in test/functional"
+  Rake::Task['test:controllers'].comment = "Run the functional and integration tests in test/controllers"
 
-  Rake::TestTask.new(:integration => "db:test:prepare") do |t|
+  Rake::TestTask.new(:helpers => "db:test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/integration/**/*_test.rb'
+    t.pattern = 'test/helpers/**/*_test.rb'
   end
-  Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
+  Rake::Task['test:helpers'].comment = "Run the unit tests in test/helpers"
 
   Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
     t.libs << 'test'
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 95ca2acf2c..51676ff4c2 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -37,11 +37,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
       public/javascripts
       public/stylesheets
       script/rails
+      test/controllers
       test/fixtures
-      test/functional
-      test/integration
+      test/helpers
+      test/models
       test/performance
-      test/unit
       vendor
       vendor/plugins
       tmp/sessions
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index be99dc068d..2974f35dd9 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -28,23 +28,23 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
   def test_invokes_helper
     run_generator
     assert_file "app/helpers/account_helper.rb"
-    assert_file "test/unit/helpers/account_helper_test.rb"
+    assert_file "test/helpers/account_helper_test.rb"
   end
 
   def test_does_not_invoke_helper_if_required
     run_generator ["account", "--skip-helper"]
     assert_no_file "app/helpers/account_helper.rb"
-    assert_no_file "test/unit/helpers/account_helper_test.rb"
+    assert_no_file "test/helpers/account_helper_test.rb"
   end
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/functional/account_controller_test.rb"
+    assert_file "test/controllers/account_controller_test.rb"
   end
 
   def test_does_not_invoke_test_framework_if_required
     run_generator ["account", "--no-test-framework"]
-    assert_no_file "test/functional/account_controller_test.rb"
+    assert_no_file "test/controllers/account_controller_test.rb"
   end
 
   def test_invokes_default_template_engine
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index f0bfebd57f..b82a72bdd4 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -15,7 +15,7 @@ class HelperGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/unit/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
+    assert_file "test/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
   end
 
   def test_logs_if_the_test_framework_cannot_be_found
diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb
index cf282a0911..170507458f 100644
--- a/railties/test/generators/integration_test_generator_test.rb
+++ b/railties/test/generators/integration_test_generator_test.rb
@@ -7,6 +7,6 @@ class IntegrationTestGeneratorTest < Rails::Generators::TestCase
 
   def test_integration_test_skeleton_is_created
     run_generator
-    assert_file "test/integration/integration_test.rb", /class IntegrationTest < ActionController::IntegrationTest/
+    assert_file "test/controllers/integration_test.rb", /class IntegrationTest < ActionController::IntegrationTest/
   end
 end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 81d6afa221..c91e2199b7 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -28,7 +28,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/functional/notifier_test.rb" do |test|
+    assert_file "test/controllers/notifier_test.rb" do |test|
       assert_match /class NotifierTest < ActionMailer::TestCase/, test
       assert_match /test "foo"/, test
       assert_match /test "bar"/, test
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index f5cfd8eeca..5cd86bf95c 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -153,7 +153,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/unit/account_test.rb", /class AccountTest < ActiveSupport::TestCase/
+    assert_file "test/models/account_test.rb", /class AccountTest < ActiveSupport::TestCase/
     assert_file "test/fixtures/accounts.yml", /name: MyString/, /age: 1/
   end
 
diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb
index 45fe8dfbd3..cbf987f10c 100644
--- a/railties/test/generators/observer_generator_test.rb
+++ b/railties/test/generators/observer_generator_test.rb
@@ -17,7 +17,7 @@ class ObserverGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/unit/account_observer_test.rb", /class AccountObserverTest < ActiveSupport::TestCase/
+    assert_file "test/observers/account_observer_test.rb", /class AccountObserverTest < ActiveSupport::TestCase/
   end
 
   def test_logs_if_the_test_framework_cannot_be_found
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 96fd7a0a72..79fd081018 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -18,7 +18,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
 
     %w(
       app/models/account.rb
-      test/unit/account_test.rb
+      test/models/account_test.rb
       test/fixtures/accounts.yml
     ).each { |path| assert_file path }
 
@@ -33,10 +33,10 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   def test_resource_controller_with_pluralized_class_name
     run_generator
     assert_file "app/controllers/accounts_controller.rb", /class AccountsController < ApplicationController/
-    assert_file "test/functional/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/
+    assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/
 
     assert_file "app/helpers/accounts_helper.rb", /module AccountsHelper/
-    assert_file "test/unit/helpers/accounts_helper_test.rb", /class AccountsHelperTest < ActionView::TestCase/
+    assert_file "test/helpers/accounts_helper_test.rb", /class AccountsHelperTest < ActionView::TestCase/
   end
 
   def test_resource_controller_with_actions
@@ -70,14 +70,14 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
-    assert_file "test/unit/account_test.rb", /class AccountTest/
+    assert_file "test/models/account_test.rb", /class AccountTest/
     assert_match /Plural version of the model detected, using singularized version. Override with --force-plural./, content
   end
 
   def test_plural_names_can_be_forced
     content = run_generator ["accounts", "--force-plural"]
     assert_file "app/models/accounts.rb", /class Accounts < ActiveRecord::Base/
-    assert_file "test/unit/accounts_test.rb", /class AccountsTest/
+    assert_file "test/models/accounts_test.rb", /class AccountsTest/
     assert_no_match /Plural version of the model detected/, content
   end
 
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 77ed63b1bb..3cc3d49ee9 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -54,7 +54,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
-    assert_file "test/unit/helpers/users_helper_test.rb", /class UsersHelperTest < ActionView::TestCase/
+    assert_file "test/helpers/users_helper_test.rb", /class UsersHelperTest < ActionView::TestCase/
   end
 
   def test_views_are_generated
@@ -72,7 +72,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_functional_tests
     run_generator
 
-    assert_file "test/functional/users_controller_test.rb" do |content|
+    assert_file "test/controllers/users_controller_test.rb" do |content|
       assert_match /class UsersControllerTest < ActionController::TestCase/, content
       assert_match /test "should get index"/, content
     end
@@ -85,7 +85,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_no_match /def index/, content
     end
 
-    assert_file "test/functional/users_controller_test.rb" do |content|
+    assert_file "test/controllers/users_controller_test.rb" do |content|
       assert_no_match /test "should get index"/, content
     end
 
@@ -95,7 +95,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_skip_helper_if_required
     run_generator ["User", "name:string", "age:integer", "--no-helper"]
     assert_no_file "app/helpers/users_helper.rb"
-    assert_no_file "test/unit/helpers/users_helper_test.rb"
+    assert_no_file "test/helpers/users_helper_test.rb"
   end
 
   def test_skip_layout_if_required
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 6cf2efca45..2137f6654d 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -12,7 +12,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Model
     assert_file "app/models/product_line.rb", /class ProductLine < ActiveRecord::Base/
-    assert_file "test/unit/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/
+    assert_file "test/models/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/
     assert_file "test/fixtures/product_lines.yml"
     assert_migration "db/migrate/create_product_lines.rb"
 
@@ -59,7 +59,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
       end
     end
 
-    assert_file "test/functional/product_lines_controller_test.rb",
+    assert_file "test/controllers/product_lines_controller_test.rb",
                 /class ProductLinesControllerTest < ActionController::TestCase/
 
     # Views
@@ -74,7 +74,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Helpers
     assert_file "app/helpers/product_lines_helper.rb"
-    assert_file "test/unit/helpers/product_lines_helper_test.rb"
+    assert_file "test/helpers/product_lines_helper_test.rb"
 
     # Stylesheets
     assert_file "public/stylesheets/scaffold.css"
@@ -86,7 +86,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Model
     assert_no_file "app/models/product_line.rb"
-    assert_no_file "test/unit/product_line_test.rb"
+    assert_no_file "test/models/product_line_test.rb"
     assert_no_file "test/fixtures/product_lines.yml"
     assert_no_migration "db/migrate/create_product_lines.rb"
 
@@ -97,7 +97,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Controller
     assert_no_file "app/controllers/product_lines_controller.rb"
-    assert_no_file "test/functional/product_lines_controller_test.rb"
+    assert_no_file "test/controllers/product_lines_controller_test.rb"
 
     # Views
     assert_no_file "app/views/product_lines"
@@ -105,7 +105,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Helpers
     assert_no_file "app/helpers/product_lines_helper.rb"
-    assert_no_file "test/unit/helpers/product_lines_helper_test.rb"
+    assert_no_file "test/helpers/product_lines_helper_test.rb"
 
     # Stylesheets (should not be removed)
     assert_file "public/stylesheets/scaffold.css"
-- 
cgit v1.2.3


From d31e03f3566471f2ad04dc6dace889fae962f7a8 Mon Sep 17 00:00:00 2001
From: Rizwan Reza <rizwanreza@gmail.com>
Date: Mon, 29 Mar 2010 09:56:27 +0430
Subject: Update USAGE docs for generators.

---
 railties/lib/rails/generators/rails/controller/USAGE          | 2 +-
 railties/lib/rails/generators/rails/helper/USAGE              | 2 +-
 railties/lib/rails/generators/rails/mailer/USAGE              | 2 +-
 railties/lib/rails/generators/rails/model/USAGE               | 2 +-
 railties/lib/rails/generators/rails/observer/USAGE            | 2 +-
 railties/lib/rails/generators/rails/scaffold_controller/USAGE | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/railties/lib/rails/generators/rails/controller/USAGE b/railties/lib/rails/generators/rails/controller/USAGE
index 70618a3906..fc990e7684 100644
--- a/railties/lib/rails/generators/rails/controller/USAGE
+++ b/railties/lib/rails/generators/rails/controller/USAGE
@@ -13,6 +13,6 @@ Example:
 
     Credit card controller with URLs like /credit_card/debit.
         Controller:      app/controllers/credit_card_controller.rb
-        Functional Test: test/functional/credit_card_controller_test.rb
+        Functional Test: test/controllers/credit_card_controller_test.rb
         Views:           app/views/credit_card/debit.html.erb [...]
         Helper:          app/helpers/credit_card_helper.rb
diff --git a/railties/lib/rails/generators/rails/helper/USAGE b/railties/lib/rails/generators/rails/helper/USAGE
index c0ddb0f606..30e323a858 100644
--- a/railties/lib/rails/generators/rails/helper/USAGE
+++ b/railties/lib/rails/generators/rails/helper/USAGE
@@ -13,5 +13,5 @@ Example:
 
     Credit card helper.
         Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/unit/helpers/credit_card_helper_test.rb
+        Test:       test/helpers/credit_card_helper_test.rb
 
diff --git a/railties/lib/rails/generators/rails/mailer/USAGE b/railties/lib/rails/generators/rails/mailer/USAGE
index a08d459739..87e069442f 100644
--- a/railties/lib/rails/generators/rails/mailer/USAGE
+++ b/railties/lib/rails/generators/rails/mailer/USAGE
@@ -11,5 +11,5 @@ Example:
     creates a Notifications mailer class, views, test, and fixtures:
         Mailer:     app/mailers/notifications.rb
         Views:      app/views/notifications/signup.erb [...]
-        Test:       test/functional/notifications_test.rb
+        Test:       test/controllers/notifications_test.rb
         Fixtures:   test/fixtures/notifications/signup [...]
diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index d97e9ac103..ac09adc01d 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -21,7 +21,7 @@ Examples:
         For ActiveRecord and TestUnit it creates:
 
             Model:      app/models/account.rb
-            Test:       test/unit/account_test.rb
+            Test:       test/models/account_test.rb
             Fixtures:   test/fixtures/accounts.yml
             Migration:  db/migrate/XXX_add_accounts.rb
 
diff --git a/railties/lib/rails/generators/rails/observer/USAGE b/railties/lib/rails/generators/rails/observer/USAGE
index d8f32a6a48..1d2de7f17f 100644
--- a/railties/lib/rails/generators/rails/observer/USAGE
+++ b/railties/lib/rails/generators/rails/observer/USAGE
@@ -9,4 +9,4 @@ Example:
 
     For ActiveRecord and TestUnit it creates:
         Observer:   app/models/account_observer.rb
-        TestUnit:   test/unit/account_observer_test.rb
+        TestUnit:   test/observers/account_observer_test.rb
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/USAGE b/railties/lib/rails/generators/rails/scaffold_controller/USAGE
index 673f69bc81..419f302f54 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold_controller/USAGE
@@ -15,6 +15,6 @@ Example:
 
     Credit card controller with URLs like /credit_card/debit.
         Controller:      app/controllers/credit_cards_controller.rb
-        Functional Test: test/functional/credit_cards_controller_test.rb
+        Functional Test: test/controllers/credit_cards_controller_test.rb
         Views:           app/views/credit_cards/index.html.erb [...]
         Helper:          app/helpers/credit_cards_helper.rb
-- 
cgit v1.2.3


From d39ec8195546075afb5830c7f5a53bb74946521c Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Mon, 29 Mar 2010 05:10:42 +0100
Subject: Make Railties RDoc task work again [#4291 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 Rakefile          | 4 ++--
 railties/Rakefile | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Rakefile b/Rakefile
index cae9b04f4a..2fa1f756d9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -72,8 +72,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('railties/CHANGELOG')
   rdoc.rdoc_files.include('railties/MIT-LICENSE')
   rdoc.rdoc_files.include('railties/README')
-  rdoc.rdoc_files.include('railties/lib/{*.rb,commands/*.rb,rails/*.rb,generators/*.rb}')
-  rdoc.rdoc_files.exclude('railties/lib/vendor/*')
+  rdoc.rdoc_files.include('railties/lib/**/*.rb')
+  rdoc.rdoc_files.exclude('railties/lib/rails/generators/**/templates/*')
 
   rdoc.rdoc_files.include('activerecord/README')
   rdoc.rdoc_files.include('activerecord/CHANGELOG')
diff --git a/railties/Rakefile b/railties/Rakefile
index 6368456366..d88036f829 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,5 +1,3 @@
-require File.expand_path('../../load_paths', __FILE__)
-
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -60,10 +58,8 @@ Rake::RDocTask.new { |rdoc|
   rdoc.options << '--charset' << 'utf-8'
   rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
   rdoc.rdoc_files.include('README', 'CHANGELOG')
-  rdoc.rdoc_files.include('lib/*.rb')
-  rdoc.rdoc_files.include('lib/rails/*.rb')
-  rdoc.rdoc_files.include('lib/rails/generators/*.rb')
-  rdoc.rdoc_files.include('lib/rails/commands/**/*.rb')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.exclude('lib/rails/generators/**/templates/*')
 }
 
 # Generate GEM ----------------------------------------------------------------------------
-- 
cgit v1.2.3


From 40d90ed7df3fbb730b5a1231445247accbf895f1 Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Mon, 29 Mar 2010 04:09:39 +0100
Subject: Ignore generated railties RDocs [#4289 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9d68f4860f..16bffc157b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ activesupport/test/fixtures/isolation_test
 railties/test/500.html
 railties/test/fixtures/tmp
 railties/test/initializer/root/log
-railties/doc/guides/html/images
-railties/doc/guides/html/stylesheets
+railties/doc
 railties/guides/output
 railties/tmp
-- 
cgit v1.2.3


From 41e7c68d87903d0596228b6c1ae2c5d87b209280 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sun, 28 Mar 2010 22:51:48 -0700
Subject: Ruby 1.9.2: marshaling round-trips Time#zone

---
 .../lib/active_support/core_ext/time/marshal.rb    | 56 ++++++++++++++++++++++
 .../core_ext/time/marshal_with_utc_flag.rb         | 26 ----------
 activesupport/lib/active_support/time.rb           |  2 +-
 activesupport/test/core_ext/time_ext_test.rb       | 20 ++++----
 activesupport/test/message_encryptor_test.rb       |  2 +-
 activesupport/test/message_verifier_test.rb        |  2 +-
 6 files changed, 67 insertions(+), 41 deletions(-)
 create mode 100644 activesupport/lib/active_support/core_ext/time/marshal.rb
 delete mode 100644 activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb

diff --git a/activesupport/lib/active_support/core_ext/time/marshal.rb b/activesupport/lib/active_support/core_ext/time/marshal.rb
new file mode 100644
index 0000000000..1a4d918ce7
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/time/marshal.rb
@@ -0,0 +1,56 @@
+# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
+# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
+# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
+if !Marshal.load(Marshal.dump(Time.now.utc)).utc?
+  class Time
+    class << self
+      alias_method :_load_without_utc_flag, :_load
+      def _load(marshaled_time)
+        time = _load_without_utc_flag(marshaled_time)
+        time.instance_eval do
+          if defined?(@marshal_with_utc_coercion)
+            val = remove_instance_variable("@marshal_with_utc_coercion")
+          end
+          val ? utc : self
+        end
+      end
+    end
+
+    alias_method :_dump_without_utc_flag, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
+      obj._dump_without_utc_flag(*args)
+    end
+  end
+end
+
+# Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only
+# preserves utc_offset. Preserve zone also, even though it may not
+# work in some edge cases.
+if Time.local(2010).zone != Marshal.load(Marshal.dump(Time.local(2010))).zone
+  class Time
+    class << self
+      alias_method :_load_without_zone, :_load
+      def _load(marshaled_time)
+        time = _load_without_zone(marshaled_time)
+        time.instance_eval do
+          if zone = defined?(@_zone) && remove_instance_variable('@_zone')
+            ary = to_a
+            ary[-1] = zone
+            utc? ? Time.utc(*ary) : Time.local(*ary)
+          else
+            self
+          end
+        end
+      end
+    end
+
+    alias_method :_dump_without_zone, :_dump
+    def _dump(*args)
+      obj = dup
+      obj.instance_variable_set('@_zone', zone)
+      obj._dump_without_zone(*args)
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb b/activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb
deleted file mode 100644
index 8d46d80251..0000000000
--- a/activesupport/lib/active_support/core_ext/time/marshal_with_utc_flag.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Pre-1.9 versions of Ruby have a bug with marshaling Time instances, where utc instances are
-# unmarshalled in the local zone, instead of utc. We're layering behavior on the _dump and _load
-# methods so that utc instances can be flagged on dump, and coerced back to utc on load.
-if RUBY_VERSION < '1.9'
-  class Time
-    class << self
-      alias_method :_original_load, :_load
-      def _load(marshaled_time)
-        time = _original_load(marshaled_time)
-        time.instance_eval do
-          if defined?(@marshal_with_utc_coercion)
-            val = remove_instance_variable("@marshal_with_utc_coercion")
-          end
-          val ? utc : self
-        end
-      end
-    end
-
-    alias_method :_original_dump, :_dump
-    def _dump(*args)
-      obj = dup
-      obj.instance_variable_set('@marshal_with_utc_coercion', utc?)
-      obj._original_dump(*args)
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/time.rb b/activesupport/lib/active_support/time.rb
index 0f421421d0..784c7173a9 100644
--- a/activesupport/lib/active_support/time.rb
+++ b/activesupport/lib/active_support/time.rb
@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 require 'active_support/core_ext/time/publicize_conversion_methods'
-require 'active_support/core_ext/time/marshal_with_utc_flag'
+require 'active_support/core_ext/time/marshal'
 require 'active_support/core_ext/time/acts_like'
 require 'active_support/core_ext/time/calculations'
 require 'active_support/core_ext/time/conversions'
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 159b7d8366..c24c8619c6 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -758,33 +758,29 @@ end
 class TimeExtMarshalingTest < Test::Unit::TestCase
   def test_marshaling_with_utc_instance
     t = Time.utc(2000)
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal "UTC", unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 
   def test_marshaling_with_local_instance
     t = Time.local(2000)
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal t.zone, unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 
   def test_marshaling_with_frozen_utc_instance
     t = Time.utc(2000).freeze
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal "UTC", unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 
   def test_marshaling_with_frozen_local_instance
     t = Time.local(2000).freeze
-    marshaled = Marshal.dump t
-    unmarshaled = Marshal.load marshaled
-    assert_equal t, unmarshaled
+    unmarshaled = Marshal.load(Marshal.dump(t))
     assert_equal t.zone, unmarshaled.zone
+    assert_equal t, unmarshaled
   end
 end
diff --git a/activesupport/test/message_encryptor_test.rb b/activesupport/test/message_encryptor_test.rb
index 5c2b44f188..2fba62bdd6 100644
--- a/activesupport/test/message_encryptor_test.rb
+++ b/activesupport/test/message_encryptor_test.rb
@@ -4,7 +4,7 @@ require 'active_support/time'
 class MessageEncryptorTest < Test::Unit::TestCase
   def setup
     @encryptor = ActiveSupport::MessageEncryptor.new(ActiveSupport::SecureRandom.hex(64))
-    @data = {:some=>"data", :now=>Time.now}
+    @data = { :some => "data", :now => Time.local(2010) }
   end
   
   def test_simple_round_tripping
diff --git a/activesupport/test/message_verifier_test.rb b/activesupport/test/message_verifier_test.rb
index 714a3b3a39..4821311244 100644
--- a/activesupport/test/message_verifier_test.rb
+++ b/activesupport/test/message_verifier_test.rb
@@ -12,7 +12,7 @@ require 'active_support/time'
 class MessageVerifierTest < Test::Unit::TestCase
   def setup
     @verifier = ActiveSupport::MessageVerifier.new("Hey, I'm a secret!")
-    @data = {:some=>"data", :now=>Time.now}
+    @data = { :some => "data", :now => Time.local(2010) }
   end
 
   def test_simple_round_tripping
-- 
cgit v1.2.3


From 48c1d8c341e1fe09111424131f7d223ad032b7e1 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 28 Mar 2010 23:21:19 -0700
Subject: Provide a better error if the parsed REXML document has no root
 [#3803 state:resolved]

---
 activesupport/lib/active_support/xml_mini/rexml.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/xml_mini/rexml.rb b/activesupport/lib/active_support/xml_mini/rexml.rb
index 3db48ce5a3..863d66a91d 100644
--- a/activesupport/lib/active_support/xml_mini/rexml.rb
+++ b/activesupport/lib/active_support/xml_mini/rexml.rb
@@ -27,7 +27,13 @@ module ActiveSupport
         data.ungetc(char)
         silence_warnings { require 'rexml/document' } unless defined?(REXML::Document)
         doc = REXML::Document.new(data)
-        merge_element!({}, doc.root)
+
+        if doc.root
+          merge_element!({}, doc.root)
+        else
+          raise REXML::ParseException,
+            "The document #{doc.to_s.inspect} does not have a valid root"
+        end
       end
     end
 
-- 
cgit v1.2.3


From 67d1cec4c8a65846cc3b2779bc5eca7b8b73e6fc Mon Sep 17 00:00:00 2001
From: Andrew White <andyw@pixeltrix.co.uk>
Date: Mon, 22 Feb 2010 10:46:45 +0000
Subject: Add the ability to specify table_name_prefix on individual modules

Signed-off-by: wycats <wycats@gmail.com>
---
 activerecord/lib/active_record/base.rb        |  9 ++++++++-
 activerecord/test/cases/modules_test.rb       | 28 +++++++++++++++++++++++++++
 activerecord/test/models/company_in_module.rb | 17 ++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 21b89694fc..289c95ad8f 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -338,6 +338,9 @@ module ActiveRecord #:nodoc:
     # Accessor for the name of the prefix string to prepend to every table name. So if set to "basecamp_", all
     # table names will be named like "basecamp_projects", "basecamp_people", etc. This is a convenient way of creating a namespace
     # for tables in a shared database. By default, the prefix is the empty string.
+    #
+    # If you are organising your models within modules you can add a prefix to the models within a namespace by defining
+    # a singleton method in the parent module called table_name_prefix which returns your chosen prefix.
     cattr_accessor :table_name_prefix, :instance_writer => false
     @@table_name_prefix = ""
 
@@ -765,7 +768,7 @@ module ActiveRecord #:nodoc:
               contained = contained.singularize if parent.pluralize_table_names
               contained << '_'
             end
-            name = "#{table_name_prefix}#{contained}#{undecorated_table_name(base.name)}#{table_name_suffix}"
+            name = "#{modularized_table_name_prefix}#{contained}#{undecorated_table_name(base.name)}#{table_name_suffix}"
           end
 
         @quoted_table_name = nil
@@ -773,6 +776,10 @@ module ActiveRecord #:nodoc:
         name
       end
 
+      def modularized_table_name_prefix #:nodoc:
+        (parents.detect{ |p| p.respond_to?(:table_name_prefix) } || self).table_name_prefix
+      end
+
       # Defines the column name for use with single table inheritance
       # -- can be set in subclasses like so: self.inheritance_column = "type_id"
       def inheritance_column
diff --git a/activerecord/test/cases/modules_test.rb b/activerecord/test/cases/modules_test.rb
index d781a229f4..7209966bf8 100644
--- a/activerecord/test/cases/modules_test.rb
+++ b/activerecord/test/cases/modules_test.rb
@@ -82,4 +82,32 @@ class ModulesTest < ActiveRecord::TestCase
       end
     end
   end
+
+  def test_module_table_name_prefix
+    assert_equal 'prefixed_companies', MyApplication::Business::Prefixed::Company.table_name, 'inferred table_name for ActiveRecord model in module with table_name_prefix'
+    assert_equal 'prefixed_companies', MyApplication::Business::Prefixed::Nested::Company.table_name, 'table_name for ActiveRecord model in nested module with a parent table_name_prefix'
+    assert_equal 'companies', MyApplication::Business::Prefixed::Firm.table_name, 'explicit table_name for ActiveRecord model in module with table_name_prefix should not be prefixed'
+  end
+
+  def test_module_table_name_prefix_with_global_prefix
+    classes = [ MyApplication::Business::Company,
+                MyApplication::Business::Firm,
+                MyApplication::Business::Client,
+                MyApplication::Business::Client::Contact,
+                MyApplication::Business::Developer,
+                MyApplication::Business::Project,
+                MyApplication::Business::Prefixed::Company,
+                MyApplication::Business::Prefixed::Nested::Company,
+                MyApplication::Billing::Account ]
+
+    ActiveRecord::Base.table_name_prefix = 'global_'
+    classes.each(&:reset_table_name)
+    assert_equal 'global_companies', MyApplication::Business::Company.table_name, 'inferred table_name for ActiveRecord model in module without table_name_prefix'
+    assert_equal 'prefixed_companies', MyApplication::Business::Prefixed::Company.table_name, 'inferred table_name for ActiveRecord model in module with table_name_prefix'
+    assert_equal 'prefixed_companies', MyApplication::Business::Prefixed::Nested::Company.table_name, 'table_name for ActiveRecord model in nested module with a parent table_name_prefix'
+    assert_equal 'companies', MyApplication::Business::Prefixed::Firm.table_name, 'explicit table_name for ActiveRecord model in module with table_name_prefix should not be prefixed'
+  ensure
+    ActiveRecord::Base.table_name_prefix = ''
+    classes.each(&:reset_table_name)
+  end
 end
diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb
index cdda7a44d4..83d71b6909 100644
--- a/activerecord/test/models/company_in_module.rb
+++ b/activerecord/test/models/company_in_module.rb
@@ -32,6 +32,23 @@ module MyApplication
       has_and_belongs_to_many :developers
     end
 
+    module Prefixed
+      def self.table_name_prefix
+        'prefixed_'
+      end
+
+      class Company < ActiveRecord::Base
+      end
+
+      class Firm < Company
+        self.table_name = 'companies'
+      end
+
+      module Nested
+        class Company < ActiveRecord::Base
+        end
+      end
+    end
   end
 
   module Billing
-- 
cgit v1.2.3


From 5f7bc47303933ec67700f6390c98d889f6d9b0d1 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Sun, 28 Mar 2010 23:45:38 -0700
Subject: Rename modularized_table_name_prefix to full_table_name_prefix [#4032
 state:resolved]

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

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 289c95ad8f..4d9493e82f 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -768,7 +768,7 @@ module ActiveRecord #:nodoc:
               contained = contained.singularize if parent.pluralize_table_names
               contained << '_'
             end
-            name = "#{modularized_table_name_prefix}#{contained}#{undecorated_table_name(base.name)}#{table_name_suffix}"
+            name = "#{full_table_name_prefix}#{contained}#{undecorated_table_name(base.name)}#{table_name_suffix}"
           end
 
         @quoted_table_name = nil
@@ -776,7 +776,7 @@ module ActiveRecord #:nodoc:
         name
       end
 
-      def modularized_table_name_prefix #:nodoc:
+      def full_table_name_prefix #:nodoc:
         (parents.detect{ |p| p.respond_to?(:table_name_prefix) } || self).table_name_prefix
       end
 
-- 
cgit v1.2.3


From 53ddbfc460f5a54d5b81e7bfbc1c5828f90488c1 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Mon, 29 Mar 2010 11:24:35 -0300
Subject: Warn scoped order and limit are ignored. [#4123 state:resolved]

---
 activerecord/lib/active_record/relation/batches.rb |  6 +++++-
 activerecord/test/cases/batches_test.rb            | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index cb57b445e5..1c61e7d450 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -50,6 +50,10 @@ module ActiveRecord
     def find_in_batches(options = {})
       relation = self
 
+       if orders.present? || taken.present?
+         ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
+       end
+
       if (finder_options = options.except(:start, :batch_size)).present?
         raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?
         raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
@@ -77,4 +81,4 @@ module ActiveRecord
       "#{@klass.table_name}.#{@klass.primary_key} ASC"
     end
   end
-end
\ No newline at end of file
+end
diff --git a/activerecord/test/cases/batches_test.rb b/activerecord/test/cases/batches_test.rb
index e417d8a803..83deabb5b7 100644
--- a/activerecord/test/cases/batches_test.rb
+++ b/activerecord/test/cases/batches_test.rb
@@ -8,7 +8,7 @@ class EachTest < ActiveRecord::TestCase
     @posts = Post.order("id asc")
     @total = Post.count
   end
-  
+
   def test_each_should_excecute_one_query_per_batch
     assert_queries(Post.count + 1) do
       Post.find_each(:batch_size => 1) do |post|
@@ -28,7 +28,17 @@ class EachTest < ActiveRecord::TestCase
       Post.find_each(:limit => 1) { |post| post }
     end
   end
-  
+
+  def test_warn_if_limit_scope_is_set
+    ActiveRecord::Base.logger.expects(:warn)
+    Post.limit(1).find_each { |post| post }
+  end
+
+  def test_warn_if_order_scope_is_set
+    ActiveRecord::Base.logger.expects(:warn)
+    Post.order("title").find_each { |post| post }
+  end
+
   def test_find_in_batches_should_return_batches
     assert_queries(Post.count + 1) do
       Post.find_in_batches(:batch_size => 1) do |batch|
@@ -58,4 +68,4 @@ class EachTest < ActiveRecord::TestCase
       Post.find_in_batches(:batch_size => post_count + 1) {|batch| assert_kind_of Array, batch }
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 0d6f97e702ba19f81e4c30246928e21b5a6b1456 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 08:05:32 -0700
Subject: Bump mail to 2.1.5.3

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

diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 8d6475cea9..410df0e106 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
 
   s.add_dependency('actionpack',  version)
-  s.add_dependency('mail',        '~> 2.1.5.2')
+  s.add_dependency('mail',        '~> 2.1.5.3')
   s.add_dependency('text-format', '~> 1.0.0')
 end
-- 
cgit v1.2.3


From 7006aa1a853e90f5883b3dc5913b4e310789bc6f Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Mon, 29 Mar 2010 12:30:13 -0300
Subject: Arel now handles ranges with excluded end.

---
 activerecord/lib/active_record/relation/predicate_builder.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb
index 7e83eccbb5..711df16bf1 100644
--- a/activerecord/lib/active_record/relation/predicate_builder.rb
+++ b/activerecord/lib/active_record/relation/predicate_builder.rb
@@ -27,12 +27,7 @@ module ActiveRecord
             values = value.to_a
             attribute.in(values)
           when Range
-            # TODO : Arel should handle ranges with excluded end.
-            if value.exclude_end?
-              [attribute.gteq(value.begin), attribute.lt(value.end)]
-            else
-              attribute.in(value)
-            end
+            attribute.in(value)
           else
             attribute.eq(value)
           end
-- 
cgit v1.2.3


From 36a5e78c14d9c0a929b19939b7841c504ef0467a Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 08:56:40 -0700
Subject: Add missed changelog for table_name_prefix

---
 activerecord/CHANGELOG | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 214ec8c1d8..e379f4f967 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,9 +1,11 @@
-*Edge*
+*Rails 3.0.0 [Beta 2] (pending)*
+
+* To prefix the table names of all models in a module, define self.table_name_prefix on the module.  #4032 [Andrew White]
 
 * Silenced "SHOW FIELDS" and "SET SQL_AUTO_IS_NULL=0" statements from the MySQL driver to improve log signal to noise ration in development [DHH]
 
 
-*Rails 3.0 [Beta] (February 4th, 2010)*
+*Rails 3.0.0 [Beta 1] (February 4th, 2010)*
 
 * PostgreSQLAdapter: set time_zone to UTC when Base.default_timezone == :utc so that Postgres doesn't incorrectly offset-adjust values inserted into TIMESTAMP WITH TIME ZONE columns. #3777 [Jack Christensen]
 
-- 
cgit v1.2.3


From 94ced0854370490d3da91fd77b247c1b0922ac99 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 08:57:43 -0700
Subject: ruby-debug19 doesn't install cleanly on 1.9.2 trunk

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

diff --git a/Gemfile b/Gemfile
index 951137b243..7c6720ac7f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ group :mri do
   if RUBY_VERSION < '1.9'
     gem "system_timer"
     gem "ruby-debug", ">= 0.10.3"
-  else
+  elsif RUBY_VERSION < '1.9.2'
     gem "ruby-debug19"
   end
 end
-- 
cgit v1.2.3


From 9a865ee25ea01c68015b46e69ca0589f0024a0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 29 Mar 2010 18:36:28 +0200
Subject: Revert "Reorganized app/test directory. [#3057 state:resolved]"

This reverts commit a0dc6755db71b33aebccdb95fd0dd7097c934c04.
---
 railties/CHANGELOG                                 |  2 -
 .../templates/test/controllers/.empty_directory    |  0
 .../app/templates/test/functional/.empty_directory |  0
 .../app/templates/test/helpers/.empty_directory    |  0
 .../templates/test/integration/.empty_directory    |  0
 .../app/templates/test/models/.empty_directory     |  0
 .../rails/app/templates/test/unit/.empty_directory |  0
 .../test_unit/controller/controller_generator.rb   |  2 +-
 .../test_unit/helper/helper_generator.rb           |  2 +-
 .../test_unit/integration/integration_generator.rb |  2 +-
 .../test_unit/mailer/mailer_generator.rb           |  2 +-
 .../test_unit/mailer/templates/controller_test.rb  | 20 ---------
 .../test_unit/mailer/templates/functional_test.rb  | 20 +++++++++
 .../generators/test_unit/model/model_generator.rb  |  2 +-
 .../test_unit/observer/observer_generator.rb       |  2 +-
 .../test_unit/scaffold/scaffold_generator.rb       |  2 +-
 railties/lib/rails/tasks/framework.rake            | 47 +---------------------
 railties/lib/rails/test_unit/testing.rake          | 36 +++++++----------
 railties/test/generators/app_generator_test.rb     |  6 +--
 .../test/generators/controller_generator_test.rb   |  8 ++--
 railties/test/generators/helper_generator_test.rb  |  2 +-
 .../generators/integration_test_generator_test.rb  |  2 +-
 railties/test/generators/mailer_generator_test.rb  |  2 +-
 railties/test/generators/model_generator_test.rb   |  2 +-
 .../test/generators/observer_generator_test.rb     |  2 +-
 .../test/generators/resource_generator_test.rb     | 10 ++---
 .../scaffold_controller_generator_test.rb          |  8 ++--
 .../test/generators/scaffold_generator_test.rb     | 12 +++---
 28 files changed, 70 insertions(+), 123 deletions(-)
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory
 create mode 100644 railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory
 create mode 100644 railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory
 delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory
 create mode 100644 railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory
 delete mode 100644 railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb
 create mode 100644 railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 9cd6c53bc5..0b67479742 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,7 +1,5 @@
 *Edge*
 
-* Reorganized app/test directory. Run rake update:test_directory to reorganize your apps [Rizwan Reza]
-
 * Added "rake about" as a replacement for script/about [DHH]
 
 * Removed all the default commands in script/* and replaced them with script/rails and a rails command that'll act the same when run from within the app [DHH]. Example:
diff --git a/railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/controllers/.empty_directory
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/functional/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/helpers/.empty_directory
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/integration/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/models/.empty_directory
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory b/railties/lib/rails/generators/rails/app/templates/test/unit/.empty_directory
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
index db99e55e9e..20f3bd8965 100644
--- a/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/test_unit/controller/controller_generator.rb
@@ -8,7 +8,7 @@ module TestUnit
 
       def create_test_files
         template 'functional_test.rb',
-                 File.join('test/controllers', class_path, "#{file_name}_controller_test.rb")
+                 File.join('test/functional', class_path, "#{file_name}_controller_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
index d4c287540c..4ea80bf7be 100644
--- a/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/test_unit/helper/helper_generator.rb
@@ -6,7 +6,7 @@ module TestUnit
       check_class_collision :suffix => "HelperTest"
 
       def create_helper_files
-        template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb")
+        template 'helper_test.rb', File.join('test/unit/helpers', class_path, "#{file_name}_helper_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
index af45998bc1..32d0fac029 100644
--- a/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
+++ b/railties/lib/rails/generators/test_unit/integration/integration_generator.rb
@@ -6,7 +6,7 @@ module TestUnit
       check_class_collision :suffix => "Test"
 
       def create_test_files
-        template 'integration_test.rb', File.join('test/controllers', class_path, "#{file_name}_test.rb")
+        template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
index 894d24049c..1a49286d41 100644
--- a/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/mailer/mailer_generator.rb
@@ -7,7 +7,7 @@ module TestUnit
       check_class_collision :suffix => "Test"
 
       def create_test_files
-        template "controller_test.rb", File.join('test/controllers', class_path, "#{file_name}_test.rb")
+        template "functional_test.rb", File.join('test/functional', class_path, "#{file_name}_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb
deleted file mode 100644
index 80ac7f0feb..0000000000
--- a/railties/lib/rails/generators/test_unit/mailer/templates/controller_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'test_helper'
-
-class <%= class_name %>Test < ActionMailer::TestCase
-<% for action in actions -%>
-  test "<%= action %>" do
-    mail = <%= class_name %>.<%= action %>
-    assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
-    assert_equal ["to@example.org"], mail.to
-    assert_equal ["from@example.com"], mail.from
-    assert_match "Hi", mail.body.encoded
-  end
-
-<% end -%>
-<% if actions.blank? -%>
-  # replace this with your real tests
-  test "the truth" do
-    assert true
-  end
-<% end -%>
-end
diff --git a/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
new file mode 100644
index 0000000000..80ac7f0feb
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/mailer/templates/functional_test.rb
@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class <%= class_name %>Test < ActionMailer::TestCase
+<% for action in actions -%>
+  test "<%= action %>" do
+    mail = <%= class_name %>.<%= action %>
+    assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
+    assert_equal ["to@example.org"], mail.to
+    assert_equal ["from@example.com"], mail.from
+    assert_match "Hi", mail.body.encoded
+  end
+
+<% end -%>
+<% if actions.blank? -%>
+  # replace this with your real tests
+  test "the truth" do
+    assert true
+  end
+<% end -%>
+end
diff --git a/railties/lib/rails/generators/test_unit/model/model_generator.rb b/railties/lib/rails/generators/test_unit/model/model_generator.rb
index 17c431ae81..609b815683 100644
--- a/railties/lib/rails/generators/test_unit/model/model_generator.rb
+++ b/railties/lib/rails/generators/test_unit/model/model_generator.rb
@@ -9,7 +9,7 @@ module TestUnit
       check_class_collision :suffix => "Test"
 
       def create_test_file
-        template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
+        template 'unit_test.rb', File.join('test/unit', class_path, "#{file_name}_test.rb")
       end
 
       hook_for :fixture_replacement
diff --git a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
index 5db111ec68..6cc1158c21 100644
--- a/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
+++ b/railties/lib/rails/generators/test_unit/observer/observer_generator.rb
@@ -6,7 +6,7 @@ module TestUnit
       check_class_collision :suffix => "ObserverTest"
 
       def create_test_files
-        template 'unit_test.rb',  File.join('test/observers', class_path, "#{file_name}_observer_test.rb")
+        template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_observer_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
index 5d1ac1dde4..c0315c7fe6 100644
--- a/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb
@@ -11,7 +11,7 @@ module TestUnit
 
       def create_test_files
         template 'functional_test.rb',
-                 File.join('test/controllers', controller_class_path, "#{controller_file_name}_controller_test.rb")
+                 File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb")
       end
     end
   end
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake
index a3109a9243..738f7f5301 100644
--- a/railties/lib/rails/tasks/framework.rake
+++ b/railties/lib/rails/tasks/framework.rake
@@ -17,7 +17,7 @@ namespace :rails do
   end
 
   desc "Update both configs, scripts and public/javascripts from Rails"
-  task :update => [ "update:configs", "update:javascripts", "update:scripts", "update:application_controller", "update:test_directory" ]
+  task :update => [ "update:configs", "update:javascripts", "update:scripts", "update:application_controller" ]
 
   desc "Applies the template supplied by LOCATION=/path/to/template"
   task :template do
@@ -72,50 +72,5 @@ namespace :rails do
         puts "#{old_style} has been renamed to #{new_style}, update your SCM as necessary"
       end
     end
-
-    desc "Move test directories to new locations"
-    task :test_directory do
-      if File.exists?(Rails.root.join('test'))
-        FileUtils.mkdir(Rails.root.join('test/controllers')) unless File.exists?(Rails.root.join('test/controllers'))
-        [Rails.root.join('test/functional'), Rails.root.join('test/integration')].each do |controller_test_dir|
-          if File.exists?(controller_test_dir)
-            puts "#{controller_test_dir} exists"
-            FileUtils.mv(Dir["#{controller_test_dir}/**/*"], Rails.root.join('test/controllers'), :force => true)
-            FileUtils.rm_rf(controller_test_dir)
-          end
-        end
-
-        if File.exists?(Rails.root.join('test/unit/helpers'))
-          FileUtils.mkdir(Rails.root.join('test/helpers')) unless File.exists?(Rails.root.join('test/helpers'))
-          FileUtils.mv(Dir[Rails.root.join('test/unit/helpers/**/*')], Rails.root.join('test/helpers'), :force => true)
-        else
-          unless File.exists?(Rails.root.join('test/helpers'))
-            FileUtils.mkdir(Rails.root.join('test/helpers'))
-          end
-        end
-        
-        if File.exists?(Rails.root.join('test/unit'))
-          observer_tests = "#{Rails.root}/test/unit/**/*_observer_test.rb"
-          unless observer_tests.empty?
-            FileUtils.mkdir(Rails.root.join('test/observers')) unless File.exists?(Rails.root.join('test/observers'))
-            FileUtils.mv(observer_tests, Rails.root.join('test/observers'), :force => true)
-          end
-          FileUtils.mkdir(Rails.root.join('test/models')) unless File.exists?(Rails.root.join('test/models'))
-          FileUtils.mv(Dir[Rails.root.join('test/unit/*')], Rails.root.join('test/models'), :force => true)
-          FileUtils.rm_rf(Rails.root.join('test/unit'))
-        end
-      end
-      
-      puts <<-TEST
-      
-      All test directories have been updated:
-      
-      test/functional                   ->      test/controllers
-      test/functional                   ->      test/controllers
-      test/unit/helpers                 ->      test/helpers
-      test/unit/**/*_observer_test.rb   ->      test/observers
-      test/unit                         ->      test/models
-      TEST
-    end
   end
 end
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 4f34707f53..57857fb911 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -40,7 +40,7 @@ end
 
 desc 'Run all unit, functional and integration tests'
 task :test do
-  errors = %w(test:models test:controllers test:helpers).collect do |task|
+  errors = %w(test:units test:functionals test:integration).collect do |task|
     begin
       Rake::Task[task].invoke
       nil
@@ -55,10 +55,8 @@ namespace :test do
   Rake::TestTask.new(:recent => "db:test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
-      recent_tests('app/models/**/*.rb', 'test/models', since) +
-      recent_tests('app/models/**/*_observer.rb', 'test/observers', since) +
-      recent_tests('app/controllers/**/*.rb', 'test/controllers', since) +
-      recent_tests('app/helpers/**/*.rb', 'test/helpers', since)
+      recent_tests('app/models/**/*.rb', 'test/unit', since) +
+      recent_tests('app/controllers/**/*.rb', 'test/functional', since)
 
     t.libs << 'test'
     t.test_files = touched.uniq
@@ -76,39 +74,35 @@ namespace :test do
       end
 
       models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
-      observers   = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*_observer\.rb$/ }
       controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
-      helpers     = changed_since_checkin.select { |path| path =~ /app[\\\/]helpers[\\\/].*\.rb$/ }
 
-      model_tests      = models.map { |model| "test/models/#{File.basename(model, '.rb')}_test.rb" }
-      observer_tests   = observers.map { |observer| "test/observers/#{File.basename(observer, '.rb')}_test.rb" }
-      controller_tests = controllers.map { |controller| "test/controllers/#{File.basename(controller, '.rb')}_test.rb" }
-      helper_tests     = helpers.map { |helper| "test/helpers/#{File.basename(helper, '.rb')}_test.rb" }
+      unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
+      functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
 
-      (model_tests + observer_tests + controller_tests + helper_tests).uniq
+      unit_tests.uniq + functional_tests.uniq
     end
 
     t.libs << 'test'
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
-  Rake::TestTask.new(:models => "db:test:prepare") do |t|
+  Rake::TestTask.new(:units => "db:test:prepare") do |t|
     t.libs << "test"
-    t.pattern = ['test/models/**/*_test.rb', 'test/observers/**/*_test.rb']
+    t.pattern = 'test/unit/**/*_test.rb'
   end
-  Rake::Task['test:models'].comment = "Run the unit tests in test/models and test/observers"
+  Rake::Task['test:units'].comment = "Run the unit tests in test/unit"
 
-  Rake::TestTask.new(:controllers => "db:test:prepare") do |t|
+  Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/controllers/**/*_test.rb'
+    t.pattern = 'test/functional/**/*_test.rb'
   end
-  Rake::Task['test:controllers'].comment = "Run the functional and integration tests in test/controllers"
+  Rake::Task['test:functionals'].comment = "Run the functional tests in test/functional"
 
-  Rake::TestTask.new(:helpers => "db:test:prepare") do |t|
+  Rake::TestTask.new(:integration => "db:test:prepare") do |t|
     t.libs << "test"
-    t.pattern = 'test/helpers/**/*_test.rb'
+    t.pattern = 'test/integration/**/*_test.rb'
   end
-  Rake::Task['test:helpers'].comment = "Run the unit tests in test/helpers"
+  Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
 
   Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
     t.libs << 'test'
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 51676ff4c2..95ca2acf2c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -37,11 +37,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
       public/javascripts
       public/stylesheets
       script/rails
-      test/controllers
       test/fixtures
-      test/helpers
-      test/models
+      test/functional
+      test/integration
       test/performance
+      test/unit
       vendor
       vendor/plugins
       tmp/sessions
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index 2974f35dd9..be99dc068d 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -28,23 +28,23 @@ class ControllerGeneratorTest < Rails::Generators::TestCase
   def test_invokes_helper
     run_generator
     assert_file "app/helpers/account_helper.rb"
-    assert_file "test/helpers/account_helper_test.rb"
+    assert_file "test/unit/helpers/account_helper_test.rb"
   end
 
   def test_does_not_invoke_helper_if_required
     run_generator ["account", "--skip-helper"]
     assert_no_file "app/helpers/account_helper.rb"
-    assert_no_file "test/helpers/account_helper_test.rb"
+    assert_no_file "test/unit/helpers/account_helper_test.rb"
   end
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/controllers/account_controller_test.rb"
+    assert_file "test/functional/account_controller_test.rb"
   end
 
   def test_does_not_invoke_test_framework_if_required
     run_generator ["account", "--no-test-framework"]
-    assert_no_file "test/controllers/account_controller_test.rb"
+    assert_no_file "test/functional/account_controller_test.rb"
   end
 
   def test_invokes_default_template_engine
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index b82a72bdd4..f0bfebd57f 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -15,7 +15,7 @@ class HelperGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
+    assert_file "test/unit/helpers/admin_helper_test.rb", /class AdminHelperTest < ActionView::TestCase/
   end
 
   def test_logs_if_the_test_framework_cannot_be_found
diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb
index 170507458f..cf282a0911 100644
--- a/railties/test/generators/integration_test_generator_test.rb
+++ b/railties/test/generators/integration_test_generator_test.rb
@@ -7,6 +7,6 @@ class IntegrationTestGeneratorTest < Rails::Generators::TestCase
 
   def test_integration_test_skeleton_is_created
     run_generator
-    assert_file "test/controllers/integration_test.rb", /class IntegrationTest < ActionController::IntegrationTest/
+    assert_file "test/integration/integration_test.rb", /class IntegrationTest < ActionController::IntegrationTest/
   end
 end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index c91e2199b7..81d6afa221 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -28,7 +28,7 @@ class MailerGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/controllers/notifier_test.rb" do |test|
+    assert_file "test/functional/notifier_test.rb" do |test|
       assert_match /class NotifierTest < ActionMailer::TestCase/, test
       assert_match /test "foo"/, test
       assert_match /test "bar"/, test
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 5cd86bf95c..f5cfd8eeca 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -153,7 +153,7 @@ class ModelGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/models/account_test.rb", /class AccountTest < ActiveSupport::TestCase/
+    assert_file "test/unit/account_test.rb", /class AccountTest < ActiveSupport::TestCase/
     assert_file "test/fixtures/accounts.yml", /name: MyString/, /age: 1/
   end
 
diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb
index cbf987f10c..45fe8dfbd3 100644
--- a/railties/test/generators/observer_generator_test.rb
+++ b/railties/test/generators/observer_generator_test.rb
@@ -17,7 +17,7 @@ class ObserverGeneratorTest < Rails::Generators::TestCase
 
   def test_invokes_default_test_framework
     run_generator
-    assert_file "test/observers/account_observer_test.rb", /class AccountObserverTest < ActiveSupport::TestCase/
+    assert_file "test/unit/account_observer_test.rb", /class AccountObserverTest < ActiveSupport::TestCase/
   end
 
   def test_logs_if_the_test_framework_cannot_be_found
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 79fd081018..96fd7a0a72 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -18,7 +18,7 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
 
     %w(
       app/models/account.rb
-      test/models/account_test.rb
+      test/unit/account_test.rb
       test/fixtures/accounts.yml
     ).each { |path| assert_file path }
 
@@ -33,10 +33,10 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   def test_resource_controller_with_pluralized_class_name
     run_generator
     assert_file "app/controllers/accounts_controller.rb", /class AccountsController < ApplicationController/
-    assert_file "test/controllers/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/
+    assert_file "test/functional/accounts_controller_test.rb", /class AccountsControllerTest < ActionController::TestCase/
 
     assert_file "app/helpers/accounts_helper.rb", /module AccountsHelper/
-    assert_file "test/helpers/accounts_helper_test.rb", /class AccountsHelperTest < ActionView::TestCase/
+    assert_file "test/unit/helpers/accounts_helper_test.rb", /class AccountsHelperTest < ActionView::TestCase/
   end
 
   def test_resource_controller_with_actions
@@ -70,14 +70,14 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
   def test_plural_names_are_singularized
     content = run_generator ["accounts".freeze]
     assert_file "app/models/account.rb", /class Account < ActiveRecord::Base/
-    assert_file "test/models/account_test.rb", /class AccountTest/
+    assert_file "test/unit/account_test.rb", /class AccountTest/
     assert_match /Plural version of the model detected, using singularized version. Override with --force-plural./, content
   end
 
   def test_plural_names_can_be_forced
     content = run_generator ["accounts", "--force-plural"]
     assert_file "app/models/accounts.rb", /class Accounts < ActiveRecord::Base/
-    assert_file "test/models/accounts_test.rb", /class AccountsTest/
+    assert_file "test/unit/accounts_test.rb", /class AccountsTest/
     assert_no_match /Plural version of the model detected/, content
   end
 
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 3cc3d49ee9..77ed63b1bb 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -54,7 +54,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_helper_are_invoked_with_a_pluralized_name
     run_generator
     assert_file "app/helpers/users_helper.rb", /module UsersHelper/
-    assert_file "test/helpers/users_helper_test.rb", /class UsersHelperTest < ActionView::TestCase/
+    assert_file "test/unit/helpers/users_helper_test.rb", /class UsersHelperTest < ActionView::TestCase/
   end
 
   def test_views_are_generated
@@ -72,7 +72,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_functional_tests
     run_generator
 
-    assert_file "test/controllers/users_controller_test.rb" do |content|
+    assert_file "test/functional/users_controller_test.rb" do |content|
       assert_match /class UsersControllerTest < ActionController::TestCase/, content
       assert_match /test "should get index"/, content
     end
@@ -85,7 +85,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
       assert_no_match /def index/, content
     end
 
-    assert_file "test/controllers/users_controller_test.rb" do |content|
+    assert_file "test/functional/users_controller_test.rb" do |content|
       assert_no_match /test "should get index"/, content
     end
 
@@ -95,7 +95,7 @@ class ScaffoldControllerGeneratorTest < Rails::Generators::TestCase
   def test_skip_helper_if_required
     run_generator ["User", "name:string", "age:integer", "--no-helper"]
     assert_no_file "app/helpers/users_helper.rb"
-    assert_no_file "test/helpers/users_helper_test.rb"
+    assert_no_file "test/unit/helpers/users_helper_test.rb"
   end
 
   def test_skip_layout_if_required
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 2137f6654d..6cf2efca45 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -12,7 +12,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Model
     assert_file "app/models/product_line.rb", /class ProductLine < ActiveRecord::Base/
-    assert_file "test/models/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/
+    assert_file "test/unit/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/
     assert_file "test/fixtures/product_lines.yml"
     assert_migration "db/migrate/create_product_lines.rb"
 
@@ -59,7 +59,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
       end
     end
 
-    assert_file "test/controllers/product_lines_controller_test.rb",
+    assert_file "test/functional/product_lines_controller_test.rb",
                 /class ProductLinesControllerTest < ActionController::TestCase/
 
     # Views
@@ -74,7 +74,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Helpers
     assert_file "app/helpers/product_lines_helper.rb"
-    assert_file "test/helpers/product_lines_helper_test.rb"
+    assert_file "test/unit/helpers/product_lines_helper_test.rb"
 
     # Stylesheets
     assert_file "public/stylesheets/scaffold.css"
@@ -86,7 +86,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Model
     assert_no_file "app/models/product_line.rb"
-    assert_no_file "test/models/product_line_test.rb"
+    assert_no_file "test/unit/product_line_test.rb"
     assert_no_file "test/fixtures/product_lines.yml"
     assert_no_migration "db/migrate/create_product_lines.rb"
 
@@ -97,7 +97,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Controller
     assert_no_file "app/controllers/product_lines_controller.rb"
-    assert_no_file "test/controllers/product_lines_controller_test.rb"
+    assert_no_file "test/functional/product_lines_controller_test.rb"
 
     # Views
     assert_no_file "app/views/product_lines"
@@ -105,7 +105,7 @@ class ScaffoldGeneratorTest < Rails::Generators::TestCase
 
     # Helpers
     assert_no_file "app/helpers/product_lines_helper.rb"
-    assert_no_file "test/helpers/product_lines_helper_test.rb"
+    assert_no_file "test/unit/helpers/product_lines_helper_test.rb"
 
     # Stylesheets (should not be removed)
     assert_file "public/stylesheets/scaffold.css"
-- 
cgit v1.2.3


From 74efe4c2532bf4680e7d03c5ea43cd07d4b4d403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 29 Mar 2010 18:46:04 +0200
Subject: Revert "Update USAGE docs for generators."

This reverts commit d31e03f3566471f2ad04dc6dace889fae962f7a8.
---
 railties/lib/rails/generators/rails/controller/USAGE          | 2 +-
 railties/lib/rails/generators/rails/helper/USAGE              | 2 +-
 railties/lib/rails/generators/rails/mailer/USAGE              | 2 +-
 railties/lib/rails/generators/rails/model/USAGE               | 2 +-
 railties/lib/rails/generators/rails/observer/USAGE            | 2 +-
 railties/lib/rails/generators/rails/scaffold_controller/USAGE | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/railties/lib/rails/generators/rails/controller/USAGE b/railties/lib/rails/generators/rails/controller/USAGE
index fc990e7684..70618a3906 100644
--- a/railties/lib/rails/generators/rails/controller/USAGE
+++ b/railties/lib/rails/generators/rails/controller/USAGE
@@ -13,6 +13,6 @@ Example:
 
     Credit card controller with URLs like /credit_card/debit.
         Controller:      app/controllers/credit_card_controller.rb
-        Functional Test: test/controllers/credit_card_controller_test.rb
+        Functional Test: test/functional/credit_card_controller_test.rb
         Views:           app/views/credit_card/debit.html.erb [...]
         Helper:          app/helpers/credit_card_helper.rb
diff --git a/railties/lib/rails/generators/rails/helper/USAGE b/railties/lib/rails/generators/rails/helper/USAGE
index 30e323a858..c0ddb0f606 100644
--- a/railties/lib/rails/generators/rails/helper/USAGE
+++ b/railties/lib/rails/generators/rails/helper/USAGE
@@ -13,5 +13,5 @@ Example:
 
     Credit card helper.
         Helper:     app/helpers/credit_card_helper.rb
-        Test:       test/helpers/credit_card_helper_test.rb
+        Test:       test/unit/helpers/credit_card_helper_test.rb
 
diff --git a/railties/lib/rails/generators/rails/mailer/USAGE b/railties/lib/rails/generators/rails/mailer/USAGE
index 87e069442f..a08d459739 100644
--- a/railties/lib/rails/generators/rails/mailer/USAGE
+++ b/railties/lib/rails/generators/rails/mailer/USAGE
@@ -11,5 +11,5 @@ Example:
     creates a Notifications mailer class, views, test, and fixtures:
         Mailer:     app/mailers/notifications.rb
         Views:      app/views/notifications/signup.erb [...]
-        Test:       test/controllers/notifications_test.rb
+        Test:       test/functional/notifications_test.rb
         Fixtures:   test/fixtures/notifications/signup [...]
diff --git a/railties/lib/rails/generators/rails/model/USAGE b/railties/lib/rails/generators/rails/model/USAGE
index ac09adc01d..d97e9ac103 100644
--- a/railties/lib/rails/generators/rails/model/USAGE
+++ b/railties/lib/rails/generators/rails/model/USAGE
@@ -21,7 +21,7 @@ Examples:
         For ActiveRecord and TestUnit it creates:
 
             Model:      app/models/account.rb
-            Test:       test/models/account_test.rb
+            Test:       test/unit/account_test.rb
             Fixtures:   test/fixtures/accounts.yml
             Migration:  db/migrate/XXX_add_accounts.rb
 
diff --git a/railties/lib/rails/generators/rails/observer/USAGE b/railties/lib/rails/generators/rails/observer/USAGE
index 1d2de7f17f..d8f32a6a48 100644
--- a/railties/lib/rails/generators/rails/observer/USAGE
+++ b/railties/lib/rails/generators/rails/observer/USAGE
@@ -9,4 +9,4 @@ Example:
 
     For ActiveRecord and TestUnit it creates:
         Observer:   app/models/account_observer.rb
-        TestUnit:   test/observers/account_observer_test.rb
+        TestUnit:   test/unit/account_observer_test.rb
diff --git a/railties/lib/rails/generators/rails/scaffold_controller/USAGE b/railties/lib/rails/generators/rails/scaffold_controller/USAGE
index 419f302f54..673f69bc81 100644
--- a/railties/lib/rails/generators/rails/scaffold_controller/USAGE
+++ b/railties/lib/rails/generators/rails/scaffold_controller/USAGE
@@ -15,6 +15,6 @@ Example:
 
     Credit card controller with URLs like /credit_card/debit.
         Controller:      app/controllers/credit_cards_controller.rb
-        Functional Test: test/controllers/credit_cards_controller_test.rb
+        Functional Test: test/functional/credit_cards_controller_test.rb
         Views:           app/views/credit_cards/index.html.erb [...]
         Helper:          app/helpers/credit_cards_helper.rb
-- 
cgit v1.2.3


From da238dafd7c242eb75ae37e6243b61baf763e3d0 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 13:59:06 -0700
Subject: Ruby 1.9: use ruby-debug19. [#3949 state:resolved]

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

diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 06e23db5f1..9e3423d189 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -8,7 +8,7 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require_library_or_gem 'ruby-debug'
+        require_library_or_gem(RUBY_VERSION < '1.9' ? 'ruby-debug' : 'ruby-debug19')
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
-- 
cgit v1.2.3


From a509b0b18fd02d1d712248ce94e1d36750d58565 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Mon, 29 Mar 2010 14:07:12 -0700
Subject: Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]"

This wasn't the issue here; we need to beef up the docs and speak to
Wayne and Mark about installation.

This reverts commit da238dafd7c242eb75ae37e6243b61baf763e3d0.
---
 railties/lib/rails/rack/debugger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 9e3423d189..06e23db5f1 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -8,7 +8,7 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require_library_or_gem(RUBY_VERSION < '1.9' ? 'ruby-debug' : 'ruby-debug19')
+        require_library_or_gem 'ruby-debug'
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
-- 
cgit v1.2.3


From 63026541b209cc11ffd74cf3ca04b89d1e437737 Mon Sep 17 00:00:00 2001
From: Ernie Miller <ernie@metautonomo.us>
Date: Mon, 29 Mar 2010 16:38:44 -0400
Subject: Fix honoring :primary_key option when joining or eager loading a
 belongs_to association

[#765 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activerecord/lib/active_record/association_preload.rb       |  2 +-
 activerecord/lib/active_record/associations.rb              |  2 +-
 .../test/cases/associations/belongs_to_associations_test.rb | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb
index 6725d4e88b..c94b2ff564 100644
--- a/activerecord/lib/active_record/association_preload.rb
+++ b/activerecord/lib/active_record/association_preload.rb
@@ -324,7 +324,7 @@ module ActiveRecord
           klass = klass_name.constantize
 
           table_name = klass.quoted_table_name
-          primary_key = klass.primary_key
+          primary_key = reflection.options[:primary_key] || klass.primary_key
           column_type = klass.columns.detect{|c| c.name == primary_key}.type
 
           ids = id_map.keys.map do |id|
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index ee87cb9b41..7406daf837 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -2031,7 +2031,7 @@ module ActiveRecord
                   [aliased_table[foreign_key].eq(parent_table[reflection.options[:primary_key] || parent.primary_key])]
                 end
               when :belongs_to
-                [aliased_table[reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name])]
+                [aliased_table[options[:primary_key] || reflection.klass.primary_key].eq(parent_table[options[:foreign_key] || reflection.primary_key_name])]
               end
 
               unless klass.descends_from_active_record?
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 163ac025dd..c57760d658 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -32,6 +32,12 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal companies(:first_firm).name, client.firm_with_primary_key.name
   end
 
+  def test_belongs_to_with_primary_key_joins_on_correct_column
+    sql = Client.joins(:firm_with_primary_key).to_sql
+    assert_no_match /"firm_with_primary_keys_companies"\."id"/, sql
+    assert_match /"firm_with_primary_keys_companies"\."name"/, sql
+  end
+
   def test_proxy_assignment
     account = Account.find(1)
     assert_nothing_raised { account.firm = account.firm }
@@ -61,6 +67,13 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
     assert_equal apple.name, citibank.firm_name
   end
 
+  def test_eager_loading_with_primary_key
+    apple = Firm.create("name" => "Apple")
+    citibank = Client.create("name" => "Citibank", :firm_name => "Apple")
+    citibank_result = Client.find(:first, :conditions => {:name => "Citibank"}, :include => :firm_with_primary_key)
+    assert_not_nil citibank_result.instance_variable_get("@firm_with_primary_key")
+  end
+
   def test_no_unexpected_aliasing
     first_firm = companies(:first_firm)
     another_firm = companies(:another_firm)
-- 
cgit v1.2.3


From e30363617cea5b51de2bb2e535c70092554514d0 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 15:48:36 -0700
Subject: Revert "Hash#symbolize_keys(!) optimizations"

Was slower in common case.

[#3891 state:open]

This reverts commit 2060977b767061a42eb8db2d5c3a30d205a94123.
---
 activesupport/lib/active_support/core_ext/hash/keys.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/core_ext/hash/keys.rb b/activesupport/lib/active_support/core_ext/hash/keys.rb
index e4d429fc2b..045a6944fa 100644
--- a/activesupport/lib/active_support/core_ext/hash/keys.rb
+++ b/activesupport/lib/active_support/core_ext/hash/keys.rb
@@ -22,7 +22,7 @@ class Hash
   # to +to_sym+.
   def symbolize_keys!
     keys.each do |key|
-      self[(key.to_sym rescue key)] = delete(key) if key.respond_to?(:to_sym) && !key.is_a?(Fixnum)
+      self[(key.to_sym rescue key) || key] = delete(key)
     end
     self
   end
-- 
cgit v1.2.3


From af8852d1ad904b6b8925dd2ac7d6cece11f7bbba Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 16:25:52 -0700
Subject: Work without bundler

---
 railties/lib/rails/tasks/documentation.rake | 77 +++++++++++++++++------------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1c5db25952..ff66b71dad 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,7 +1,11 @@
 namespace :doc do
   def gem_path(gem_name)
-    @specs ||= Bundler.load.specs
-    @specs.find{|s| s.name == gem_name}.full_gem_path
+    if defined? Bundler
+      @specs ||= Bundler.load.specs
+      @specs.find{|s| s.name == gem_name}.full_gem_path
+    else
+      "#{ENV['RAILS_PATH']}/#{gem_name}"
+    end
   end
 
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
@@ -16,42 +20,53 @@ namespace :doc do
     rdoc.rdoc_files.include('lib/**/*.rb')
   }
 
-  desc 'Generate documentation for the Rails framework.'
-  Rake::RDocTask.new("rails") { |rdoc|
-    rdoc.rdoc_dir = 'doc/api'
-    rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-    rdoc.title    = "Rails Framework Documentation"
-    rdoc.options << '--line-numbers' << '--inline-source'
-    rdoc.rdoc_files.include('README')
-
-    %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('actionmailer')}/#{file}")
+  desc 'Generate documentation for the Rails framework. Uses gem paths or the RAILS_PATH environment variable.'
+  path = ENV['RAILS_PATH']
+  unless defined?(Bundler) || (path && File.directory?(path))
+    task :rails do
+    if path
+      $stderr.puts "Skipping doc:rails, missing Rails directory at #{path}"
+    else
+      $stderr.puts "Skipping doc:rails, RAILS_PATH environment variable is not set"
     end
+  else
+    desc 'Generate documentation for the Rails framework.'
+    Rake::RDocTask.new("rails") { |rdoc|
+      rdoc.rdoc_dir = 'doc/api'
+      rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+      rdoc.title    = "Rails Framework Documentation"
+      rdoc.options << '--line-numbers' << '--inline-source'
+      rdoc.rdoc_files.include('README')
+
+      %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('actionmailer')}/#{file}")
+      end
 
-    %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('actionpack')}/#{file}")
-    end
+      %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('actionpack')}/#{file}")
+      end
 
-    %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('activemodel')}/#{file}")
-    end
+      %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('activemodel')}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('activerecord')}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('activerecord')}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('activeresource')}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('activeresource')}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('activesupport')}/#{file}")
-    end
+      %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('activesupport')}/#{file}")
+      end
 
-    %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
-      rdoc.rdoc_files.include("#{gem_path('railties')}/#{file}")
-    end
-  }
+      %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+        rdoc.rdoc_files.include("#{gem_path('railties')}/#{file}")
+      end
+    }
+  end
 
   plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
 
-- 
cgit v1.2.3


From 4fbcde43e3122914334d706ea9d4d30151a1368d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 29 Mar 2010 13:59:06 -0700
Subject: Ruby 1.9: use ruby-debug19. [#3949 state:resolved]

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

diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 06e23db5f1..9e3423d189 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -8,7 +8,7 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require_library_or_gem 'ruby-debug'
+        require_library_or_gem(RUBY_VERSION < '1.9' ? 'ruby-debug' : 'ruby-debug19')
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
-- 
cgit v1.2.3


From b94c4080e5ba738b76b44d954bd8b13ff13e8688 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Mon, 29 Mar 2010 14:07:12 -0700
Subject: Revert "Ruby 1.9: use ruby-debug19. [#3949 state:resolved]"

This wasn't the issue here; we need to beef up the docs and speak to
Wayne and Mark about installation.

This reverts commit da238dafd7c242eb75ae37e6243b61baf763e3d0.
---
 railties/lib/rails/rack/debugger.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index 9e3423d189..06e23db5f1 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -8,7 +8,7 @@ module Rails
 
         ARGV.clear # clear ARGV so that rails server options aren't passed to IRB
 
-        require_library_or_gem(RUBY_VERSION < '1.9' ? 'ruby-debug' : 'ruby-debug19')
+        require_library_or_gem 'ruby-debug'
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)
         puts "=> Debugger enabled"
-- 
cgit v1.2.3


From 56bed512f92050f95701eca4f918086a8f1cda1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 30 Mar 2010 01:04:34 +0200
Subject: Fix dom_id for ActiveRecord [#4296 state:resolved]

---
 .../lib/action_controller/record_identifier.rb     |  4 ++--
 .../active_record/attribute_methods/primary_key.rb | 22 ++++++----------------
 activerecord/lib/active_record/base.rb             |  3 +--
 activerecord/test/cases/pk_test.rb                 |  6 ++++++
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
index 3f966b1b64..7fdaffe3eb 100644
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ b/actionpack/lib/action_controller/record_identifier.rb
@@ -76,8 +76,8 @@ module ActionController
     # method that replaces all characters that are invalid inside DOM ids, with valid ones. You need to
     # make sure yourself that your dom ids are valid, in case you overwrite this method.
     def record_key_for_dom_id(record)
-      return record.id unless record.respond_to?(:to_model)
-      key = record.to_model.to_key
+      record = record.to_model if record.respond_to?(:to_model)
+      key = record.to_key
       key ? sanitize_dom_id(key.join('_')) : key
     end
 
diff --git a/activerecord/lib/active_record/attribute_methods/primary_key.rb b/activerecord/lib/active_record/attribute_methods/primary_key.rb
index 095814b635..411330dda2 100644
--- a/activerecord/lib/active_record/attribute_methods/primary_key.rb
+++ b/activerecord/lib/active_record/attribute_methods/primary_key.rb
@@ -3,6 +3,12 @@ module ActiveRecord
     module PrimaryKey
       extend ActiveSupport::Concern
 
+      # Returns this record's primary key value wrapped in an Array
+      # or nil if the record is a new_record?
+      def to_key
+        new_record? ? nil : [ send(self.class.primary_key) ]
+      end
+
       module ClassMethods
         # Defines the primary key field -- can be overridden in subclasses. Overwriting will negate any effect of the
         # primary_key_prefix_type setting, though.
@@ -39,22 +45,6 @@ module ActiveRecord
         end
         alias :primary_key= :set_primary_key
       end
-
-      module InstanceMethods
-
-        # Returns this record's primary key value wrapped in an Array
-        # or nil if the record is a new_record?
-        # This is done to comply with the AMo interface that expects
-        # every AMo compliant object to respond_to?(:to_key) and return
-        # an Enumerable object from that call, or nil if new_record?
-        # This method also takes custom primary keys specified via
-        # the +set_primary_key+ into account.
-        def to_key
-          new_record? ? nil : [ self.primary_key ]
-        end
-
-      end
-
     end
   end
 end
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 4d9493e82f..80f8569644 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2223,6 +2223,7 @@ module ActiveRecord #:nodoc:
     extend QueryCache::ClassMethods
     extend ActiveSupport::Benchmarkable
 
+    include ActiveModel::Conversion
     include Validations
     include Locking::Optimistic, Locking::Pessimistic
     include AttributeMethods
@@ -2232,12 +2233,10 @@ module ActiveRecord #:nodoc:
     include AttributeMethods::Dirty
     include Callbacks, ActiveModel::Observing, Timestamp
     include Associations, AssociationPreload, NamedScope
-    include ActiveModel::Conversion
 
     # AutosaveAssociation needs to be included before Transactions, because we want
     # #save_with_autosave_associations to be wrapped inside a transaction.
     include AutosaveAssociation, NestedAttributes
-
     include Aggregations, Transactions, Reflection, Serialization
 
     NilClass.add_whiner(self) if NilClass.respond_to?(:add_whiner)
diff --git a/activerecord/test/cases/pk_test.rb b/activerecord/test/cases/pk_test.rb
index 5bba1d5625..33ad5992de 100644
--- a/activerecord/test/cases/pk_test.rb
+++ b/activerecord/test/cases/pk_test.rb
@@ -23,6 +23,12 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal keyboard.to_key, [keyboard.id]
   end
 
+  def test_to_key_with_primary_key_after_destroy
+    topic = Topic.find(1)
+    topic.destroy
+    assert_equal topic.to_key, [1]
+  end
+
   def test_integer_key
     topic = Topic.find(1)
     assert_equal(topics(:first).author_name, topic.author_name)
-- 
cgit v1.2.3


From 331327d3919a633679dd3f434d13173fa8df010f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 30 Mar 2010 01:33:51 +0200
Subject: Just inspect load paths to generate the documentation.

---
 railties/lib/rails/tasks/documentation.rake | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index ff66b71dad..eadf7afc52 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,11 +1,6 @@
 namespace :doc do
   def gem_path(gem_name)
-    if defined? Bundler
-      @specs ||= Bundler.load.specs
-      @specs.find{|s| s.name == gem_name}.full_gem_path
-    else
-      "#{ENV['RAILS_PATH']}/#{gem_name}"
-    end
+    File.dirname($LOAD_PATH.grep(/#{gem_name}[\w\-\.]*\/lib$/).first)
   end
 
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
-- 
cgit v1.2.3


From 4aded43b73ff94dbf06b4a2d2075651ce454e1d5 Mon Sep 17 00:00:00 2001
From: wycats <wycats@gmail.com>
Date: Mon, 29 Mar 2010 17:08:08 -0700
Subject: Replace the placeholder base_hook API with on_load. To specify some
 code that should run during framework load do:

ActiveSupport.on_load(:action_controller) do
  # Code run in the context of AC::Base
end
---
 actionmailer/lib/action_mailer/base.rb             |  2 +-
 actionmailer/lib/action_mailer/railtie.rb          |  6 ++---
 actionpack/lib/action_controller/base.rb           |  3 +--
 actionpack/lib/action_controller/railtie.rb        | 10 ++++----
 actionpack/lib/action_view/base.rb                 |  2 +-
 .../lib/action_view/helpers/active_model_helper.rb |  2 +-
 actionpack/lib/action_view/helpers/form_helper.rb  |  2 +-
 actionpack/lib/action_view/railtie.rb              |  4 +--
 activerecord/lib/active_record.rb                  |  6 ++---
 activerecord/lib/active_record/base.rb             |  2 +-
 activerecord/lib/active_record/railtie.rb          | 16 ++++++------
 .../lib/active_support/dependencies/autoload.rb    |  4 ---
 activesupport/lib/active_support/i18n.rb           |  2 +-
 .../lib/active_support/lazy_load_hooks.rb          | 30 ++++++++--------------
 activesupport/lib/active_support/railtie.rb        |  2 +-
 railties/lib/rails/application/routes_reloader.rb  |  2 +-
 railties/lib/rails/engine.rb                       |  9 +++++--
 17 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 793cd53518..af7255ae4f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -291,7 +291,7 @@ module ActionMailer #:nodoc:
       :parts_order  => [ "text/plain", "text/enriched", "text/html" ]
     }.freeze
 
-    ActionMailer.run_base_hooks(self)
+    ActiveSupport.run_load_hooks(:action_mailer, self)
 
     class << self
 
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index 2703367fdb..882e078d1b 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -6,18 +6,18 @@ module ActionMailer
     config.action_mailer = ActiveSupport::OrderedOptions.new
 
     initializer "action_mailer.url_for", :before => :load_environment_config do |app|
-      ActionMailer.base_hook { include app.routes.url_helpers }
+      ActiveSupport.on_load(:action_mailer) { include app.routes.url_helpers }
     end
 
     require "action_mailer/railties/log_subscriber"
     log_subscriber :action_mailer, ActionMailer::Railties::LogSubscriber.new
 
     initializer "action_mailer.logger" do
-      ActionMailer.base_hook { self.logger ||= Rails.logger }
+      ActiveSupport.on_load(:action_mailer) { self.logger ||= Rails.logger }
     end
 
     initializer "action_mailer.set_configs" do |app|
-      ActionMailer.base_hook do
+      ActiveSupport.on_load(:action_mailer) do
         app.config.action_mailer.each do |k,v|
           send "#{k}=", v
         end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 5797282b41..46a175d2fa 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -64,8 +64,7 @@ module ActionController
       filter
     end
 
-    ActionController.run_base_hooks(self)
-
+    ActiveSupport.run_load_hooks(:action_controller, self)
   end
 end
 
diff --git a/actionpack/lib/action_controller/railtie.rb b/actionpack/lib/action_controller/railtie.rb
index 0ec89928af..29d8523ee1 100644
--- a/actionpack/lib/action_controller/railtie.rb
+++ b/actionpack/lib/action_controller/railtie.rb
@@ -41,7 +41,7 @@ module ActionController
     log_subscriber :action_controller, ActionController::Railties::LogSubscriber.new
 
     initializer "action_controller.logger" do
-      ActionController.base_hook { self.logger ||= Rails.logger }
+      ActiveSupport.on_load(:action_controller) { self.logger ||= Rails.logger }
     end
 
     initializer "action_controller.set_configs" do |app|
@@ -53,23 +53,23 @@ module ActionController
       ac.stylesheets_dir = paths.public.stylesheets.to_a.first
       ac.secret          = app.config.cookie_secret
 
-      ActionController.base_hook do
+      ActiveSupport.on_load(:action_controller) do
         self.config.merge!(ac)
       end
     end
 
     initializer "action_controller.initialize_framework_caches" do
-      ActionController.base_hook { self.cache_store ||= RAILS_CACHE }
+      ActiveSupport.on_load(:action_controller) { self.cache_store ||= RAILS_CACHE }
     end
 
     initializer "action_controller.set_helpers_path" do |app|
-      ActionController.base_hook do
+      ActiveSupport.on_load(:action_controller) do
         self.helpers_path = app.config.paths.app.helpers.to_a
       end
     end
 
     initializer "action_controller.url_helpers" do |app|
-      ActionController.base_hook do
+      ActiveSupport.on_load(:action_controller) do
         extend ::ActionController::Railties::UrlHelpers.with(app.routes)
       end
 
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 919b1e3470..a9b0715b2e 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -173,7 +173,7 @@ module ActionView #:nodoc:
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
-    ActionView.run_base_hooks(self)
+    ActiveSupport.run_load_hooks(:action_view, self)
 
     attr_accessor :base_path, :assigns, :template_extension, :lookup_context
     attr_internal :captures, :request, :controller, :template, :config
diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index bbfac32322..44e193f18e 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -6,7 +6,7 @@ require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/object/blank'
 
 module ActionView
-  ActionView.base_hook do
+  ActiveSupport.on_load(:action_view) do
     class ActionView::Base
       @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"fieldWithErrors\">#{html_tag}</div>".html_safe }
       cattr_accessor :field_error_proc
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 7b5b3ae000..89560d0b49 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1221,7 +1221,7 @@ module ActionView
     end
   end
 
-  ActionView.base_hook do
+  ActiveSupport.on_load(:action_view) do
     class ActionView::Base
       cattr_accessor :default_form_builder
       @@default_form_builder = ::ActionView::Helpers::FormBuilder
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 9cf007cd2b..c606a71e18 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -10,14 +10,14 @@ module ActionView
 
     initializer "action_view.cache_asset_timestamps" do |app|
       unless app.config.cache_classes
-        ActionView.base_hook do
+        ActiveSupport.on_load(:action_view) do
           ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
         end
       end
     end
 
     initializer "action_view.set_configs" do |app|
-      ActionView.base_hook do
+      ActiveSupport.on_load(:action_view) do
         app.config.action_view.each do |k,v|
           send "#{k}=", v
         end
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 5942640c85..8a1aa50e24 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -111,10 +111,10 @@ module ActiveRecord
 
   autoload :TestCase
   autoload :TestFixtures, 'active_record/fixtures'
+end
 
-  base_hook do
-    Arel::Table.engine = Arel::Sql::Engine.new(self)
-  end
+ActiveSupport.on_load(:active_record) do
+  Arel::Table.engine = Arel::Sql::Engine.new(self)
 end
 
 I18n.load_path << File.dirname(__FILE__) + '/active_record/locale/en.yml'
\ No newline at end of file
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 80f8569644..75576f146a 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2245,4 +2245,4 @@ end
 
 # TODO: Remove this and make it work with LAZY flag
 require 'active_record/connection_adapters/abstract_adapter'
-ActiveRecord.run_base_hooks(ActiveRecord::Base)
+ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb
index de47461c73..04c4a9c153 100644
--- a/activerecord/lib/active_record/railtie.rb
+++ b/activerecord/lib/active_record/railtie.rb
@@ -23,18 +23,18 @@ module ActiveRecord
     log_subscriber :active_record, ActiveRecord::Railties::LogSubscriber.new
 
     initializer "active_record.initialize_timezone" do
-      ActiveRecord.base_hook do
+      ActiveSupport.on_load(:active_record) do
         self.time_zone_aware_attributes = true
         self.default_timezone = :utc
       end
     end
 
     initializer "active_record.logger" do
-      ActiveRecord.base_hook { self.logger ||= ::Rails.logger }
+      ActiveSupport.on_load(:active_record) { self.logger ||= ::Rails.logger }
     end
 
     initializer "active_record.set_configs" do |app|
-      ActiveRecord.base_hook do
+      ActiveSupport.on_load(:active_record) do
         app.config.active_record.each do |k,v|
           send "#{k}=", v
         end
@@ -44,7 +44,7 @@ module ActiveRecord
     # This sets the database configuration from Configuration#database_configuration
     # and then establishes the connection.
     initializer "active_record.initialize_database" do |app|
-      ActiveRecord.base_hook do
+      ActiveSupport.on_load(:active_record) do
         self.configurations = app.config.database_configuration
         establish_connection
       end
@@ -53,7 +53,7 @@ module ActiveRecord
     # Expose database runtime to controller for logging.
     initializer "active_record.log_runtime" do |app|
       require "active_record/railties/controller_runtime"
-      ActionController.base_hook do
+      ActiveSupport.on_load(:action_controller) do
         include ActiveRecord::Railties::ControllerRuntime
       end
     end
@@ -71,9 +71,9 @@ module ActiveRecord
     end
 
     initializer "active_record.load_observers" do
-      ActiveRecord.base_hook { instantiate_observers }
+      ActiveSupport.on_load(:active_record) { instantiate_observers }
 
-      ActiveRecord.base_hook do
+      ActiveSupport.on_load(:active_record) do
         ActionDispatch::Callbacks.to_prepare(:activerecord_instantiate_observers) do
           ActiveRecord::Base.instantiate_observers
         end
@@ -81,7 +81,7 @@ module ActiveRecord
     end
 
     initializer "active_record.set_dispatch_hooks", :before => :set_clear_dependencies_hook do |app|
-      ActiveRecord.base_hook do
+      ActiveSupport.on_load(:active_record) do
         unless app.config.cache_classes
           ActionDispatch::Callbacks.after do
             ActiveRecord::Base.reset_subclasses
diff --git a/activesupport/lib/active_support/dependencies/autoload.rb b/activesupport/lib/active_support/dependencies/autoload.rb
index f669f4a77e..4c771da096 100644
--- a/activesupport/lib/active_support/dependencies/autoload.rb
+++ b/activesupport/lib/active_support/dependencies/autoload.rb
@@ -3,10 +3,6 @@ require "active_support/lazy_load_hooks"
 
 module ActiveSupport
   module Autoload
-    def self.extended(base)
-      base.extend(LazyLoadHooks)
-    end
-
     @@autoloads = {}
     @@under_path = nil
     @@at_path = nil
diff --git a/activesupport/lib/active_support/i18n.rb b/activesupport/lib/active_support/i18n.rb
index 034d7d8ddc..11af48d67e 100644
--- a/activesupport/lib/active_support/i18n.rb
+++ b/activesupport/lib/active_support/i18n.rb
@@ -1,3 +1,3 @@
 require 'i18n'
 I18n.load_path << "#{File.dirname(__FILE__)}/locale/en.yml"
-ActiveSupport.run_base_hooks(:i18n)
\ No newline at end of file
+ActiveSupport.run_load_hooks(:i18n)
\ No newline at end of file
diff --git a/activesupport/lib/active_support/lazy_load_hooks.rb b/activesupport/lib/active_support/lazy_load_hooks.rb
index 36acfda524..642a4c105c 100644
--- a/activesupport/lib/active_support/lazy_load_hooks.rb
+++ b/activesupport/lib/active_support/lazy_load_hooks.rb
@@ -1,25 +1,17 @@
 module ActiveSupport
-  module LazyLoadHooks
-    def _setup_base_hooks
-      @base_hooks ||= Hash.new {|h,k| h[k] = [] }
-      @base ||= {}
-    end
-
-    def base_hook(name = nil, &block)
-      _setup_base_hooks
+  @load_hooks = Hash.new {|h,k| h[k] = [] }
+  @loaded = {}
 
-      if base = @base[name]
-        base.instance_eval(&block)
-      else
-        @base_hooks[name] << block
-      end
+  def self.on_load(name, &block)
+    if base = @loaded[name]
+      base.instance_eval(&block)
+    else
+      @load_hooks[name] << block
     end
+  end
 
-    def run_base_hooks(base, name = nil)
-      _setup_base_hooks
-
-      @base_hooks[name].each { |hook| base.instance_eval(&hook) } if @base_hooks
-      @base[name] = base
-    end
+  def self.run_load_hooks(name, base = Object)
+    @load_hooks[name].each { |hook| base.instance_eval(&hook) }
+    @loaded[name] = base
   end
 end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
index e45d16ee96..b8d54ff839 100644
--- a/activesupport/lib/active_support/railtie.rb
+++ b/activesupport/lib/active_support/railtie.rb
@@ -35,7 +35,7 @@ module I18n
     config.i18n.load_path = []
 
     initializer "i18n.initialize" do
-      ActiveSupport.base_hook(:i18n) do
+      ActiveSupport.on_load(:i18n) do
         I18n.reload!
 
         ActionDispatch::Callbacks.to_prepare do
diff --git a/railties/lib/rails/application/routes_reloader.rb b/railties/lib/rails/application/routes_reloader.rb
index a5154f4bba..a2b3622df8 100644
--- a/railties/lib/rails/application/routes_reloader.rb
+++ b/railties/lib/rails/application/routes_reloader.rb
@@ -27,7 +27,7 @@ module Rails
 
         routes.clear!
         paths.each { |path| load(path) }
-        ActionController.base_hook { routes.finalize! }
+        ActiveSupport.on_load(:action_controller) { routes.finalize! }
 
         nil
       ensure
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 85cae75bce..e9013348b5 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -180,8 +180,13 @@ module Rails
 
     initializer :add_view_paths do
       views = paths.app.views.to_a
-      ActionController.base_hook { prepend_view_path(views) } if defined?(ActionController)
-      ActionMailer.base_hook { prepend_view_path(views) } if defined?(ActionMailer)
+      ActiveSupport.on_load(:action_controller) do
+        prepend_view_path(views)
+      end
+
+      ActiveSupport.on_load(:action_mailer) do
+        prepend_view_path(views)
+      end
     end
 
     initializer :add_metals do |app|
-- 
cgit v1.2.3


From bc298152f8cc507549a9df9363e8da1900578932 Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Tue, 30 Mar 2010 14:31:16 +1300
Subject: Fix syntax error and avoid the use of unless/else.

---
 railties/lib/rails/tasks/documentation.rake | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index eadf7afc52..1b44f9a46c 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -17,14 +17,7 @@ namespace :doc do
 
   desc 'Generate documentation for the Rails framework. Uses gem paths or the RAILS_PATH environment variable.'
   path = ENV['RAILS_PATH']
-  unless defined?(Bundler) || (path && File.directory?(path))
-    task :rails do
-    if path
-      $stderr.puts "Skipping doc:rails, missing Rails directory at #{path}"
-    else
-      $stderr.puts "Skipping doc:rails, RAILS_PATH environment variable is not set"
-    end
-  else
+  if defined?(Bundler) || (path && File.directory?(path))
     desc 'Generate documentation for the Rails framework.'
     Rake::RDocTask.new("rails") { |rdoc|
       rdoc.rdoc_dir = 'doc/api'
@@ -61,6 +54,14 @@ namespace :doc do
         rdoc.rdoc_files.include("#{gem_path('railties')}/#{file}")
       end
     }
+  else
+    task :rails do
+      if path = ENV['RAILS_PATH']
+        $stderr.puts "Skipping doc:rails, missing Rails directory at #{path.inspect}"
+      else
+        $stderr.puts "Skipping doc:rails, RAILS_PATH environment variable is not set"
+      end
+    end
   end
 
   plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
-- 
cgit v1.2.3


From f9e84a9e5ad35f8159a2edaffc8edb2535fbac40 Mon Sep 17 00:00:00 2001
From: postmodern <postmodern.mod3@gmail.com>
Date: Mon, 29 Mar 2010 23:42:52 -0700
Subject: Changed gem_path to yield the path found in $LOAD_PATH to a block.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* This allows gems not found in $LOAD_PATH to be safely ignored by the
  rails documentation task.

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/lib/rails/tasks/documentation.rake | 48 ++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index 1b44f9a46c..f15efbc30a 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,6 +1,10 @@
 namespace :doc do
   def gem_path(gem_name)
-    File.dirname($LOAD_PATH.grep(/#{gem_name}[\w\-\.]*\/lib$/).first)
+    path = $LOAD_PATH.grep(/#{gem_name}[\w\-\.]*\/lib$/).first
+
+    if path
+      yield File.dirname(path)
+    end
   end
 
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
@@ -26,32 +30,46 @@ namespace :doc do
       rdoc.options << '--line-numbers' << '--inline-source'
       rdoc.rdoc_files.include('README')
 
-      %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('actionmailer')}/#{file}")
+      gem_path('actionmailer') do |actionmailer|
+        %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+          rdoc.rdoc_files.include("#{actionmailer}/#{file}")
+        end
       end
 
-      %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('actionpack')}/#{file}")
+      gem_path('actionpack') do |actionpack|
+        %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+          rdoc.rdoc_files.include("#{actionpack}/#{file}")
+        end
       end
 
-      %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('activemodel')}/#{file}")
+      gem_path('activemodel') do |activemodel|
+        %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+          rdoc.rdoc_files.include("#{activemodel}/#{file}")
+        end
       end
 
-      %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('activerecord')}/#{file}")
+      gem_path('activerecord') do |activerecord|
+        %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
+          rdoc.rdoc_files.include("#{activerecord}/#{file}")
+        end
       end
 
-      %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('activeresource')}/#{file}")
+      gem_path('activeresource') do |activeresource|
+        %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+          rdoc.rdoc_files.include("#{activeresource}/#{file}")
+        end
       end
 
-      %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('activesupport')}/#{file}")
+      gem_path('activesupport') do |activesupport|
+        %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
+          rdoc.rdoc_files.include("#{activesupport}/#{file}")
+        end
       end
 
-      %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
-        rdoc.rdoc_files.include("#{gem_path('railties')}/#{file}")
+      gem_path('railties') do |railties|
+        %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+          rdoc.rdoc_files.include("#{railties}/#{file}")
+        end
       end
     }
   else
-- 
cgit v1.2.3


From ebcc4c5e746edcebdb58b27d3d54a51e685dd43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 30 Mar 2010 10:00:46 +0200
Subject: Remove if/else branch when generating the documentation since we are
 simply inspecting the load path.

---
 railties/lib/rails/tasks/documentation.rake | 89 ++++++++++++-----------------
 1 file changed, 37 insertions(+), 52 deletions(-)

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index f15efbc30a..f73e333e83 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,10 +1,7 @@
 namespace :doc do
   def gem_path(gem_name)
     path = $LOAD_PATH.grep(/#{gem_name}[\w\-\.]*\/lib$/).first
-
-    if path
-      yield File.dirname(path)
-    end
+    yield File.dirname(path) if path
   end
 
   desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb or title with TITLE=\"Custom Title\""
@@ -19,68 +16,56 @@ namespace :doc do
     rdoc.rdoc_files.include('lib/**/*.rb')
   }
 
-  desc 'Generate documentation for the Rails framework. Uses gem paths or the RAILS_PATH environment variable.'
-  path = ENV['RAILS_PATH']
-  if defined?(Bundler) || (path && File.directory?(path))
-    desc 'Generate documentation for the Rails framework.'
-    Rake::RDocTask.new("rails") { |rdoc|
-      rdoc.rdoc_dir = 'doc/api'
-      rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-      rdoc.title    = "Rails Framework Documentation"
-      rdoc.options << '--line-numbers' << '--inline-source'
-      rdoc.rdoc_files.include('README')
-
-      gem_path('actionmailer') do |actionmailer|
-        %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
-          rdoc.rdoc_files.include("#{actionmailer}/#{file}")
-        end
-      end
+  desc 'Generate documentation for the Rails framework.'
+  Rake::RDocTask.new("rails") { |rdoc|
+    rdoc.rdoc_dir = 'doc/api'
+    rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+    rdoc.title    = "Rails Framework Documentation"
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('README')
 
-      gem_path('actionpack') do |actionpack|
-        %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
-          rdoc.rdoc_files.include("#{actionpack}/#{file}")
-        end
+    gem_path('actionmailer') do |actionmailer|
+      %w(README CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|
+        rdoc.rdoc_files.include("#{actionmailer}/#{file}")
       end
+    end
 
-      gem_path('activemodel') do |activemodel|
-        %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
-          rdoc.rdoc_files.include("#{activemodel}/#{file}")
-        end
+    gem_path('actionpack') do |actionpack|
+      %w(README CHANGELOG MIT-LICENSE lib/action_controller/**/*.rb lib/action_view/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{actionpack}/#{file}")
       end
+    end
 
-      gem_path('activerecord') do |activerecord|
-        %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
-          rdoc.rdoc_files.include("#{activerecord}/#{file}")
-        end
+    gem_path('activemodel') do |activemodel|
+      %w(README CHANGELOG MIT-LICENSE lib/active_model/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{activemodel}/#{file}")
       end
+    end
 
-      gem_path('activeresource') do |activeresource|
-        %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
-          rdoc.rdoc_files.include("#{activeresource}/#{file}")
-        end
+    gem_path('activerecord') do |activerecord|
+      %w(README CHANGELOG lib/active_record/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{activerecord}/#{file}")
       end
+    end
 
-      gem_path('activesupport') do |activesupport|
-        %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
-          rdoc.rdoc_files.include("#{activesupport}/#{file}")
-        end
+    gem_path('activeresource') do |activeresource|
+      %w(README CHANGELOG lib/active_resource.rb lib/active_resource/*).each do |file|
+        rdoc.rdoc_files.include("#{activeresource}/#{file}")
       end
+    end
 
-      gem_path('railties') do |railties|
-        %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
-          rdoc.rdoc_files.include("#{railties}/#{file}")
-        end
+    gem_path('activesupport') do |activesupport|
+      %w(README CHANGELOG lib/active_support/**/*.rb).each do |file|
+        rdoc.rdoc_files.include("#{activesupport}/#{file}")
       end
-    }
-  else
-    task :rails do
-      if path = ENV['RAILS_PATH']
-        $stderr.puts "Skipping doc:rails, missing Rails directory at #{path.inspect}"
-      else
-        $stderr.puts "Skipping doc:rails, RAILS_PATH environment variable is not set"
+    end
+
+    gem_path('railties') do |railties|
+      %w(README CHANGELOG lib/{*.rb,commands/*.rb,generators/*.rb}).each do |file|
+        rdoc.rdoc_files.include("#{railties}/#{file}")
       end
     end
-  end
+  }
 
   plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
 
-- 
cgit v1.2.3


From ce3864aa36e1afa1492bc2fd37fa96948f745861 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@ubuntu.(none)>
Date: Tue, 30 Mar 2010 01:55:06 -0700
Subject: periods are not metacharacters within character classes

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

diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake
index f73e333e83..957c375f6a 100644
--- a/railties/lib/rails/tasks/documentation.rake
+++ b/railties/lib/rails/tasks/documentation.rake
@@ -1,6 +1,6 @@
 namespace :doc do
   def gem_path(gem_name)
-    path = $LOAD_PATH.grep(/#{gem_name}[\w\-\.]*\/lib$/).first
+    path = $LOAD_PATH.grep(/#{gem_name}[\w.-]*\/lib$/).first
     yield File.dirname(path) if path
   end
 
-- 
cgit v1.2.3


From ffcd44144a10d41e175dedfcebb48e6b275726a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 30 Mar 2010 14:32:17 +0200
Subject: Remove deprecated model_subclass since it was never published.

---
 .../rails/model_subclass/model_subclass_generator.rb         | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb

diff --git a/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb b/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb
deleted file mode 100644
index 99fd2f45bc..0000000000
--- a/railties/lib/rails/generators/rails/model_subclass/model_subclass_generator.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module Rails
-  module Generators
-    # TODO Deprecate me in a release > Rails 3.0
-    class ModelSubclassGenerator < Base
-      desc "model_subclass is deprecated. Invoke model with --parent option instead."
-
-      def say_deprecation_warn
-         say self.class.desc
-      end
-    end
-  end
-end
-- 
cgit v1.2.3


From 41b45d56553316f175660fe6e2923409adee37e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 30 Mar 2010 14:41:22 +0200
Subject: Bring rdoc tasks back to plugins.

---
 .../lib/rails/generators/rails/plugin/templates/Rakefile.tt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt b/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
index e94c0bfc77..733e321c94 100644
--- a/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
+++ b/railties/lib/rails/generators/rails/plugin/templates/Rakefile.tt
@@ -1,10 +1,23 @@
+require 'rake'
 require 'rake/testtask'
+require 'rake/rdoctask'
 
 desc 'Default: run unit tests.'
 task :default => :test
 
 desc 'Test the <%= file_name %> plugin.'
 Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
 end
+
+desc 'Generate documentation for the <%= file_name %> plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = '<%= class_name %>'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 8d99ec9a4dcef5918c4487a0d94ef0a9622fe8c9 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Tue, 30 Mar 2010 10:41:56 -0300
Subject: Named scopes shouldn't test equality using to_a if it's not an Array,
 this was causing records to be loaded before they were needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/lib/active_record/named_scope.rb |  9 ++++++++-
 activerecord/test/cases/named_scope_test.rb   | 12 +++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb
index aac00cc54a..9abf979cd0 100644
--- a/activerecord/lib/active_record/named_scope.rb
+++ b/activerecord/lib/active_record/named_scope.rb
@@ -167,7 +167,14 @@ module ActiveRecord
       end
 
       def ==(other)
-        other.respond_to?(:to_ary) ? to_a == other.to_a : false
+        case other
+        when Scope
+          to_sql == other.to_sql
+        when Relation
+          other == self
+        when Array
+          to_a == other.to_a
+        end
       end
 
       private
diff --git a/activerecord/test/cases/named_scope_test.rb b/activerecord/test/cases/named_scope_test.rb
index 40c724b87e..2396ca10b0 100644
--- a/activerecord/test/cases/named_scope_test.rb
+++ b/activerecord/test/cases/named_scope_test.rb
@@ -374,14 +374,14 @@ class NamedScopeTest < ActiveRecord::TestCase
     class << Topic
       def public_method; end
       public :public_method
-      
+
       def protected_method; end
       protected :protected_method
-      
+
       def private_method; end
       private :private_method
     end
-    
+
     [:public_method, :protected_method, :private_method].each do |reserved_method|
       assert Topic.respond_to?(reserved_method, true)
       ActiveRecord::Base.logger.expects(:warn)
@@ -407,6 +407,12 @@ class NamedScopeTest < ActiveRecord::TestCase
     assert_equal topics(:second), approved[0]
     assert approved.loaded?
   end
+
+  def test_nested_named_scopes_queries_size
+    assert_queries(1) do
+      Topic.approved.by_lifo.replied.written_before(Time.now).all
+    end
+  end
 end
 
 class DynamicScopeMatchTest < ActiveRecord::TestCase
-- 
cgit v1.2.3


From 37102a52373c368c1da18f916bfda1c4c4489fee Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Tue, 30 Mar 2010 11:10:07 -0300
Subject: Fix failing test in MySQL.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../test/cases/associations/belongs_to_associations_test.rb   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index c57760d658..62121b93cb 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -34,8 +34,13 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
 
   def test_belongs_to_with_primary_key_joins_on_correct_column
     sql = Client.joins(:firm_with_primary_key).to_sql
-    assert_no_match /"firm_with_primary_keys_companies"\."id"/, sql
-    assert_match /"firm_with_primary_keys_companies"\."name"/, sql
+    if current_adapter?(:MysqlAdapter)
+      assert_no_match /`firm_with_primary_keys_companies`\.`id`/, sql
+      assert_match /`firm_with_primary_keys_companies`\.`name`/, sql
+    else
+      assert_no_match /"firm_with_primary_keys_companies"\."id"/, sql
+      assert_match /"firm_with_primary_keys_companies"\."name"/, sql
+    end
   end
 
   def test_proxy_assignment
@@ -457,7 +462,7 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase
       Author.belongs_to :special_author_address, :dependent => :nullify
     end
   end
-  
+
   def test_invalid_belongs_to_dependent_option_restrict_raises_exception
     assert_raise ArgumentError do
       Author.belongs_to :special_author_address, :dependent => :restrict
-- 
cgit v1.2.3


From 17f0c1e9e8a5bfa7c4d2e1632c3b8b91f4678f03 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 30 Mar 2010 13:58:18 -0500
Subject: Fix stack overflow bug in integration test router helpers

---
 .../action_dispatch/testing/assertions/routing.rb  |  2 +-
 actionpack/test/controller/integration_test.rb     | 47 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 1bb81ede3b..08f3d90e18 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -168,7 +168,7 @@ module ActionDispatch
 
       # ROUTES TODO: These assertions should really work in an integration context
       def method_missing(selector, *args, &block)
-        if @controller && @router.named_routes.helpers.include?(selector)
+        if @controller && @router && @router.named_routes.helpers.include?(selector)
           @controller.send(selector, *args, &block)
         else
           super
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index c9782856bd..1e2ee06adc 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -430,3 +430,50 @@ class MetalIntegrationTest < ActionController::IntegrationTest
     assert_equal 'http://www.example.com/foo', url_for(:controller => "foo")
   end
 end
+
+class ApplicationIntegrationTest < ActionController::IntegrationTest
+  class TestController < ActionController::Base
+    def index
+      render :text => "index"
+    end
+  end
+
+  def self.call(env)
+    routes.call(env)
+  end
+
+  def self.routes
+    @routes ||= ActionDispatch::Routing::RouteSet.new
+  end
+
+  routes.draw do
+    match 'foo', :to => 'application_integration_test/test#index', :as => :foo
+    match 'bar', :to => 'application_integration_test/test#index', :as => :bar
+  end
+
+  def app
+    self.class
+  end
+
+  test "includes route helpers" do
+    assert_equal '/foo', foo_path
+    assert_equal '/bar', bar_path
+  end
+
+  test "route helpers after controller access" do
+    get '/foo'
+    assert_equal '/foo', foo_path
+
+    get '/bar'
+    assert_equal '/bar', bar_path
+  end
+
+  test "missing route helper before controller access" do
+    assert_raise(NameError) { missing_path }
+  end
+
+  test "missing route helper after controller access" do
+    get '/foo'
+    assert_raise(NameError) { missing_path }
+  end
+end
-- 
cgit v1.2.3


From cdf8c35ffdfb39f4de4b030576b1abb06c482668 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 30 Mar 2010 14:05:42 -0500
Subject: Consistent routing language

---
 .../lib/action_controller/railties/url_helpers.rb  |   6 +-
 actionpack/lib/action_controller/test_case.rb      |  10 +-
 .../action_dispatch/testing/assertions/routing.rb  |  20 +--
 actionpack/test/abstract_unit.rb                   |  15 +-
 .../test/activerecord/polymorphic_routes_test.rb   | 164 ++++++++++-----------
 actionpack/test/controller/caching_test.rb         |   6 +-
 actionpack/test/controller/resources_test.rb       |  14 +-
 actionpack/test/controller/test_test.rb            |   8 +-
 actionpack/test/controller/url_rewriter_test.rb    |  28 ++--
 actionpack/test/controller/webservice_test.rb      |   2 +-
 actionpack/test/template/test_case_test.rb         |   2 +-
 11 files changed, 137 insertions(+), 138 deletions(-)

diff --git a/actionpack/lib/action_controller/railties/url_helpers.rb b/actionpack/lib/action_controller/railties/url_helpers.rb
index 5f95e1c621..9df5665542 100644
--- a/actionpack/lib/action_controller/railties/url_helpers.rb
+++ b/actionpack/lib/action_controller/railties/url_helpers.rb
@@ -1,14 +1,14 @@
 module ActionController
   module Railties
     module UrlHelpers
-      def self.with(router)
+      def self.with(routes)
         Module.new do
           define_method(:inherited) do |klass|
             super(klass)
-            klass.send(:include, router.url_helpers)
+            klass.send(:include, routes.url_helpers)
           end
         end
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 306db4a431..2d4cf2fafb 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -118,9 +118,9 @@ module ActionController
       end
     end
 
-    def assign_parameters(router, controller_path, action, parameters = {})
+    def assign_parameters(routes, controller_path, action, parameters = {})
       parameters = parameters.symbolize_keys.merge(:controller => controller_path, :action => action)
-      extra_keys = router.extra_keys(parameters)
+      extra_keys = routes.extra_keys(parameters)
       non_path_parameters = get? ? query_parameters : request_parameters
       parameters.each do |key, value|
         if value.is_a? Fixnum
@@ -322,7 +322,7 @@ module ActionController
     def process(action, parameters = nil, session = nil, flash = nil, http_method = 'GET')
       # Sanity check for required instance variables so we can give an
       # understandable error message.
-      %w(@router @controller @request @response).each do |iv_name|
+      %w(@routes @controller @request @response).each do |iv_name|
         if !(instance_variable_names.include?(iv_name) || instance_variable_names.include?(iv_name.to_sym)) || instance_variable_get(iv_name).nil?
           raise "#{iv_name} is nil: make sure you set it in your test's setup method."
         end
@@ -338,7 +338,7 @@ module ActionController
       @request.env['REQUEST_METHOD'] = http_method
 
       parameters ||= {}
-      @request.assign_parameters(@router, @controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
+      @request.assign_parameters(@routes, @controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
 
       @request.session = ActionController::TestSession.new(session) unless session.nil?
       @request.session["flash"] = @request.flash.update(flash || {})
@@ -447,7 +447,7 @@ module ActionController
             :relative_url_root => nil,
             :_path_segments => @request.symbolized_path_parameters)
 
-          url, query_string = @router.url_for(options).split("?", 2)
+          url, query_string = @routes.url_for(options).split("?", 2)
 
           @request.env["SCRIPT_NAME"] = @controller.config.relative_url_root
           @request.env["PATH_INFO"] = url
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 08f3d90e18..b7e9b0c95a 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -80,7 +80,7 @@ module ActionDispatch
         expected_path = "/#{expected_path}" unless expected_path[0] == ?/
         # Load routes.rb if it hasn't been loaded.
 
-        generated_path, extra_keys = @router.generate_extras(options, defaults)
+        generated_path, extra_keys = @routes.generate_extras(options, defaults)
         found_extras = options.reject {|k, v| ! extra_keys.include? k}
 
         msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
@@ -125,7 +125,7 @@ module ActionDispatch
       end
 
       # A helper to make it easier to test different route configurations.
-      # This method temporarily replaces @router
+      # This method temporarily replaces @routes
       # with a new RouteSet instance.
       #
       # The new instance is yielded to the passed block. Typically the block
@@ -142,9 +142,9 @@ module ActionDispatch
       #   end
       #
       def with_routing
-        old_routes, @router = @router, ActionDispatch::Routing::RouteSet.new
+        old_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new
         old_controller, @controller = @controller, @controller.clone if @controller
-        _router = @router
+        _routes = @routes
 
         # Unfortunately, there is currently an abstraction leak between AC::Base
         # and AV::Base which requires having the URL helpers in both AC and AV.
@@ -153,14 +153,14 @@ module ActionDispatch
         #
         # TODO: Make this unnecessary
         if @controller
-          @controller.singleton_class.send(:include, _router.url_helpers)
+          @controller.singleton_class.send(:include, _routes.url_helpers)
           @controller.view_context_class = Class.new(@controller.view_context_class) do
-            include _router.url_helpers
+            include _routes.url_helpers
           end
         end
-        yield @router
+        yield @routes
       ensure
-        @router = old_routes
+        @routes = old_routes
         if @controller
           @controller = old_controller
         end
@@ -168,7 +168,7 @@ module ActionDispatch
 
       # ROUTES TODO: These assertions should really work in an integration context
       def method_missing(selector, *args, &block)
-        if @controller && @router && @router.named_routes.helpers.include?(selector)
+        if @controller && @routes && @routes.named_routes.helpers.include?(selector)
           @controller.send(selector, *args, &block)
         else
           super
@@ -185,7 +185,7 @@ module ActionDispatch
           request.env["REQUEST_METHOD"] = request_method.to_s.upcase if request_method
           request.path = path
 
-          params = @router.recognize_path(path, { :method => request.method })
+          params = @routes.recognize_path(path, { :method => request.method })
           request.path_parameters = params.with_indifferent_access
 
           request
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 5b2ff3e871..143491a640 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -95,7 +95,7 @@ module ActiveSupport
         map.connect ':controller/:action/:id'
       end
 
-      ActionController::IntegrationTest.app.router.draw do |map|
+      ActionController::IntegrationTest.app.routes.draw do |map|
         # FIXME: match ':controller(/:action(/:id))'
         map.connect ':controller/:action/:id'
       end
@@ -104,12 +104,11 @@ module ActiveSupport
 end
 
 class RoutedRackApp
-  attr_reader :router
-  alias routes router
+  attr_reader :routes
 
-  def initialize(router, &blk)
-    @router = router
-    @stack = ActionDispatch::MiddlewareStack.new(&blk).build(@router)
+  def initialize(routes, &blk)
+    @routes = routes
+    @stack = ActionDispatch::MiddlewareStack.new(&blk).build(@routes)
   end
 
   def call(env)
@@ -234,7 +233,7 @@ module ActionView
     # Must repeat the setup because AV::TestCase is a duplication
     # of AC::TestCase
     setup do
-      @router = SharedTestRoutes
+      @routes = SharedTestRoutes
     end
   end
 end
@@ -250,7 +249,7 @@ module ActionController
     include ActionDispatch::TestProcess
 
     setup do
-      @router = SharedTestRoutes
+      @routes = SharedTestRoutes
     end
   end
 end
diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 5643ad5ad6..9f5e8ec657 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -40,12 +40,12 @@ class PolymorphicRoutesTest < ActionController::TestCase
   end
 
   def test_with_record
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url(@project)
     end
   end
-  
+
   def test_with_class
     with_test_routes do
       assert_equal "http://example.com/projects", polymorphic_url(@project.class)
@@ -53,67 +53,67 @@ class PolymorphicRoutesTest < ActionController::TestCase
   end
 
   def test_with_new_record
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/projects", polymorphic_url(@project)
     end
   end
 
   def test_with_destroyed_record
-    with_test_routes do 
+    with_test_routes do
       @project.destroy
       assert_equal "http://example.com/projects", polymorphic_url(@project)
     end
   end
 
   def test_with_record_and_action
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/projects/new", polymorphic_url(@project, :action => 'new')
     end
   end
 
   def test_url_helper_prefixed_with_new
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/projects/new", new_polymorphic_url(@project)
     end
   end
 
   def test_url_helper_prefixed_with_edit
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}/edit", edit_polymorphic_url(@project)
     end
   end
-  
+
   def test_url_helper_prefixed_with_edit_with_url_options
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}/edit?param1=10", edit_polymorphic_url(@project, :param1 => '10')
     end
   end
-  
+
   def test_url_helper_with_url_options
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}?param1=10", polymorphic_url(@project, :param1 => '10')
     end
   end
 
   def test_format_option
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}.pdf", polymorphic_url(@project, :format => :pdf)
     end
   end
-  
+
   def test_format_option_with_url_options
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}.pdf?param1=10", polymorphic_url(@project, :format => :pdf, :param1 => '10')
     end
   end
-  
+
   def test_id_and_format_option
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}.pdf", polymorphic_url(:id => @project, :format => :pdf)
     end
@@ -126,14 +126,14 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/projects/#{@project.id}/tasks/#{@task.id}", polymorphic_url([@project, @task])
     end
   end
-  
+
   def test_with_nested_unsaved
     with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}/tasks", polymorphic_url([@project, @task])
     end
   end
-  
+
   def test_with_nested_destroyed
     with_test_routes do
       @project.save
@@ -141,63 +141,63 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/projects/#{@project.id}/tasks", polymorphic_url([@project, @task])
     end
   end
-  
+
   def test_with_nested_class
     with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}/tasks", polymorphic_url([@project, @task.class])
     end
   end
-  
+
   def test_class_with_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       assert_equal "http://example.com/admin/projects", polymorphic_url([:admin, @project.class])
     end
   end
-  
+
   def test_new_with_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       assert_equal "http://example.com/admin/projects/new", polymorphic_url([:admin, @project], :action => 'new')
     end
   end
-  
+
   def test_unsaved_with_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       assert_equal "http://example.com/admin/projects", polymorphic_url([:admin, @project])
     end
   end
-  
+
   def test_nested_unsaved_with_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       @project.save
       assert_equal "http://example.com/admin/projects/#{@project.id}/tasks", polymorphic_url([:admin, @project, @task])
     end
   end
-  
+
   def test_nested_with_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       @project.save
       @task.save
       assert_equal "http://example.com/admin/projects/#{@project.id}/tasks/#{@task.id}", polymorphic_url([:admin, @project, @task])
     end
   end
-  
+
   def test_ordering_of_nesting_and_namespace
-    with_admin_and_site_test_routes do 
+    with_admin_and_site_test_routes do
       @project.save
       @task.save
       @step.save
       assert_equal "http://example.com/admin/projects/#{@project.id}/site/tasks/#{@task.id}/steps/#{@step.id}", polymorphic_url([:admin, @project, :site, @task, @step])
     end
   end
-  
+
   def test_nesting_with_array_ending_in_singleton_resource
     with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}/bid", polymorphic_url([@project, :bid])
     end
   end
-  
+
   def test_nesting_with_array_containing_singleton_resource
     with_test_routes do
       @project.save
@@ -205,7 +205,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/projects/#{@project.id}/bid/tasks/#{@task.id}", polymorphic_url([@project, :bid, @task])
     end
   end
-  
+
   def test_nesting_with_array_containing_singleton_resource_and_format
     with_test_routes do
       @project.save
@@ -213,7 +213,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/projects/#{@project.id}/bid/tasks/#{@task.id}.pdf", polymorphic_url([@project, :bid, @task], :format => :pdf)
     end
   end
-  
+
   def test_nesting_with_array_containing_namespace_and_singleton_resource
     with_admin_test_routes do
       @project.save
@@ -221,47 +221,47 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/admin/projects/#{@project.id}/bid/tasks/#{@task.id}", polymorphic_url([:admin, @project, :bid, @task])
     end
   end
-  
+
   def test_nesting_with_array_containing_nil
     with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}/bid", polymorphic_url([@project, nil, :bid])
     end
   end
-  
+
   def test_with_array_containing_single_object
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url([nil, @project])
     end
   end
-  
+
   def test_with_array_containing_single_name
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects", polymorphic_url([:projects])
     end
   end
-  
+
   def test_with_array_containing_symbols
     with_test_routes do
       assert_equal "http://example.com/series/new", polymorphic_url([:new, :series])
     end
   end
-  
+
   def test_with_hash
-    with_test_routes do 
+    with_test_routes do
       @project.save
       assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url(:id => @project)
     end
   end
-  
+
   def test_polymorphic_path_accepts_options
-    with_test_routes do 
+    with_test_routes do
       assert_equal "/projects/new", polymorphic_path(@project, :action => 'new')
     end
   end
-  
+
   def test_polymorphic_path_does_not_modify_arguments
     with_admin_test_routes do
       @project.save
@@ -275,108 +275,108 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal original_args, [object_array, options]
     end
   end
-  
+
   # Tests for names where .plural.singular doesn't round-trip
   def test_with_irregular_plural_record
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       assert_equal "http://example.com/taxes/#{@tax.id}", polymorphic_url(@tax)
     end
   end
-  
+
   def test_with_irregular_plural_class
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/taxes", polymorphic_url(@tax.class)
     end
   end
-  
+
   def test_with_irregular_plural_new_record
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/taxes", polymorphic_url(@tax)
     end
   end
 
   def test_with_irregular_plural_destroyed_record
     with_test_routes do
-      @tax.destroy 
+      @tax.destroy
       assert_equal "http://example.com/taxes", polymorphic_url(@tax)
     end
   end
-  
+
   def test_with_irregular_plural_record_and_action
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/taxes/new", polymorphic_url(@tax, :action => 'new')
     end
   end
-  
+
   def test_irregular_plural_url_helper_prefixed_with_new
-    with_test_routes do 
+    with_test_routes do
       assert_equal "http://example.com/taxes/new", new_polymorphic_url(@tax)
     end
   end
-  
+
   def test_irregular_plural_url_helper_prefixed_with_edit
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       assert_equal "http://example.com/taxes/#{@tax.id}/edit", edit_polymorphic_url(@tax)
     end
   end
-  
+
   def test_with_nested_irregular_plurals
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       @fax.save
       assert_equal "http://example.com/taxes/#{@tax.id}/faxes/#{@fax.id}", polymorphic_url([@tax, @fax])
     end
   end
-  
+
   def test_with_nested_unsaved_irregular_plurals
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       assert_equal "http://example.com/taxes/#{@tax.id}/faxes", polymorphic_url([@tax, @fax])
     end
   end
-  
+
   def test_new_with_irregular_plural_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       assert_equal "http://example.com/admin/taxes/new", polymorphic_url([:admin, @tax], :action => 'new')
     end
   end
-  
+
   def test_class_with_irregular_plural_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       assert_equal "http://example.com/admin/taxes", polymorphic_url([:admin, @tax.class])
     end
   end
-  
+
   def test_unsaved_with_irregular_plural_array_and_namespace
-    with_admin_test_routes do 
+    with_admin_test_routes do
       assert_equal "http://example.com/admin/taxes", polymorphic_url([:admin, @tax])
     end
   end
-  
+
   def test_nesting_with_irregular_plurals_and_array_ending_in_singleton_resource
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       assert_equal "http://example.com/taxes/#{@tax.id}/bid", polymorphic_url([@tax, :bid])
     end
   end
-  
+
   def test_with_array_containing_single_irregular_plural_object
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       assert_equal "http://example.com/taxes/#{@tax.id}", polymorphic_url([nil, @tax])
     end
   end
-  
+
   def test_with_array_containing_single_name_irregular_plural
-    with_test_routes do 
+    with_test_routes do
       @tax.save
       assert_equal "http://example.com/taxes", polymorphic_url([:taxes])
     end
   end
-  
- # Tests for uncountable names  
+
+ # Tests for uncountable names
   def test_uncountable_resource
     with_test_routes do
       @series.save
@@ -400,11 +400,11 @@ class PolymorphicRoutesTest < ActionController::TestCase
         map.resources :series
       end
 
-      self.class.send(:include, @router.url_helpers)
+      self.class.send(:include, @routes.url_helpers)
       yield
     end
   end
-  
+
   def with_admin_test_routes(options = {})
     with_routing do |set|
       set.draw do |map|
@@ -422,11 +422,11 @@ class PolymorphicRoutesTest < ActionController::TestCase
         end
       end
 
-      self.class.send(:include, @router.url_helpers)
+      self.class.send(:include, @routes.url_helpers)
       yield
     end
   end
-  
+
   def with_admin_and_site_test_routes(options = {})
     with_routing do |set|
       set.draw do |map|
@@ -441,7 +441,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
         end
       end
 
-      self.class.send(:include, @router.url_helpers)
+      self.class.send(:include, @routes.url_helpers)
       yield
     end
   end
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index f0ad652d50..217260fdcd 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -81,9 +81,9 @@ class PageCachingTest < ActionController::TestCase
         match '/', :to => 'posts#index', :as => :main
       end
       @params[:format] = 'rss'
-      assert_equal '/posts.rss', @router.url_for(@params)
+      assert_equal '/posts.rss', @routes.url_for(@params)
       @params[:format] = nil
-      assert_equal '/', @router.url_for(@params)
+      assert_equal '/', @routes.url_for(@params)
     end
   end
 
@@ -518,7 +518,7 @@ class ActionCacheTest < ActionController::TestCase
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       @controller = ActionCachingTestController.new
-      @controller.singleton_class.send(:include, @router.url_helpers)
+      @controller.singleton_class.send(:include, @routes.url_helpers)
       @request.host = 'hostname.com'
     end
 
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 17c645c04c..a9d1c55c05 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -126,7 +126,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_with_custom_conditions
     with_restful_routing :messages, :conditions => { :subdomain => 'app' } do
-      assert @router.recognize_path("/messages", :method => :get, :subdomain => 'app')
+      assert @routes.recognize_path("/messages", :method => :get, :subdomain => 'app')
     end
   end
 
@@ -395,7 +395,7 @@ class ResourcesTest < ActionController::TestCase
       assert_restful_routes_for :messages do |options|
         assert_recognizes(options.merge(:action => "new"), :path => "/messages/new", :method => :get)
         assert_raise(ActionController::RoutingError) do
-          @router.recognize_path("/messages/new", :method => :post)
+          @routes.recognize_path("/messages/new", :method => :post)
         end
       end
     end
@@ -505,7 +505,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_restful_routes_dont_generate_duplicates
     with_restful_routing :messages do
-      routes = @router.routes
+      routes = @routes.routes
       routes.each do |route|
         routes.each do |r|
           next if route === r # skip the comparison instance
@@ -1169,8 +1169,8 @@ class ResourcesTest < ActionController::TestCase
         options[:shallow_options] = options[:options]
       end
 
-      new_action    = @router.resources_path_names[:new] || "new"
-      edit_action   = @router.resources_path_names[:edit] || "edit"
+      new_action    = @routes.resources_path_names[:new] || "new"
+      edit_action   = @routes.resources_path_names[:edit] || "edit"
 
       if options[:path_names]
         new_action  = options[:path_names][:new] if options[:path_names][:new]
@@ -1237,7 +1237,7 @@ class ResourcesTest < ActionController::TestCase
       end
 
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
-      @controller.singleton_class.send(:include, @router.url_helpers)
+      @controller.singleton_class.send(:include, @routes.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :index, options[:options]
@@ -1307,7 +1307,7 @@ class ResourcesTest < ActionController::TestCase
     def assert_singleton_named_routes_for(singleton_name, options = {})
       (options[:options] ||= {})[:controller] ||= singleton_name.to_s.pluralize
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
-      @controller.singleton_class.send(:include, @router.url_helpers)
+      @controller.singleton_class.send(:include, @routes.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :show, options[:options]
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index f6ba275849..8910454b8b 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -478,8 +478,8 @@ XML
   end
 
   def test_with_routing_places_routes_back
-    assert @router
-    routes_id = @router.object_id
+    assert @routes
+    routes_id = @routes.object_id
 
     begin
       with_routing { raise 'fail' }
@@ -487,8 +487,8 @@ XML
     rescue RuntimeError
     end
 
-    assert @router
-    assert_equal routes_id, @router.object_id
+    assert @routes
+    assert_equal routes_id, @routes.object_id
   end
 
   def test_remote_addr
diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index 7b46a48a1d..a8d7b75372 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -10,8 +10,8 @@ class UrlRewriterTests < ActionController::TestCase
       }
     end
 
-    def rewrite(router, options)
-      router.url_for(@options.merge(options))
+    def rewrite(routes, options)
+      routes.url_for(@options.merge(options))
     end
   end
 
@@ -23,63 +23,63 @@ class UrlRewriterTests < ActionController::TestCase
 
   def test_port
     assert_equal('http://test.host:1271/c/a/i',
-      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :port => 1271)
+      @rewriter.rewrite(@routes, :controller => 'c', :action => 'a', :id => 'i', :port => 1271)
     )
   end
 
   def test_protocol_with_and_without_separator
     assert_equal('https://test.host/c/a/i',
-      @rewriter.rewrite(@router, :protocol => 'https', :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@routes, :protocol => 'https', :controller => 'c', :action => 'a', :id => 'i')
     )
 
     assert_equal('https://test.host/c/a/i',
-      @rewriter.rewrite(@router, :protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@routes, :protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
     )
   end
 
   def test_user_name_and_password
     assert_equal(
       'http://david:secret@test.host/c/a/i',
-      @rewriter.rewrite(@router, :user => "david", :password => "secret", :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@routes, :user => "david", :password => "secret", :controller => 'c', :action => 'a', :id => 'i')
     )
   end
 
   def test_user_name_and_password_with_escape_codes
     assert_equal(
       'http://openid.aol.com%2Fnextangler:one+two%3F@test.host/c/a/i',
-      @rewriter.rewrite(@router, :user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
+      @rewriter.rewrite(@routes, :user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
     )
   end
 
   def test_anchor
     assert_equal(
       'http://test.host/c/a/i#anchor',
-      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
+      @rewriter.rewrite(@routes, :controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
     )
   end
 
   def test_anchor_should_call_to_param
     assert_equal(
       'http://test.host/c/a/i#anchor',
-      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anchor'))
+      @rewriter.rewrite(@routes, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anchor'))
     )
   end
 
   def test_anchor_should_be_cgi_escaped
     assert_equal(
       'http://test.host/c/a/i#anc%2Fhor',
-      @rewriter.rewrite(@router, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anc/hor'))
+      @rewriter.rewrite(@routes, :controller => 'c', :action => 'a', :id => 'i', :anchor => Struct.new(:to_param).new('anc/hor'))
     )
   end
 
   def test_trailing_slash
     options = {:controller => 'foo', :action => 'bar', :id => '3', :only_path => true}
-    assert_equal '/foo/bar/3', @rewriter.rewrite(@router, options)
-    assert_equal '/foo/bar/3?query=string', @rewriter.rewrite(@router, options.merge({:query => 'string'}))
+    assert_equal '/foo/bar/3', @rewriter.rewrite(@routes, options)
+    assert_equal '/foo/bar/3?query=string', @rewriter.rewrite(@routes, options.merge({:query => 'string'}))
     options.update({:trailing_slash => true})
-    assert_equal '/foo/bar/3/', @rewriter.rewrite(@router, options)
+    assert_equal '/foo/bar/3/', @rewriter.rewrite(@routes, options)
     options.update({:query => 'string'})
-    assert_equal '/foo/bar/3/?query=string', @rewriter.rewrite(@router, options)
+    assert_equal '/foo/bar/3/?query=string', @rewriter.rewrite(@routes, options)
   end
 end
 
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index 05545395fb..5942950b15 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -245,7 +245,7 @@ class WebServiceTest < ActionController::IntegrationTest
   private
     def with_params_parsers(parsers = {})
       old_session = @integration_session
-      @app = ActionDispatch::ParamsParser.new(app.router, parsers)
+      @app = ActionDispatch::ParamsParser.new(app.routes, parsers)
       reset!
       yield
     ensure
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 195a6ea3ae..c1a38a25de 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -114,7 +114,7 @@ module ActionView
       end
 
       test "is able to use routes" do
-        controller.request.assign_parameters(@router, 'foo', 'index')
+        controller.request.assign_parameters(@routes, 'foo', 'index')
         assert_equal '/foo', url_for
         assert_equal '/bar', url_for(:controller => 'bar')
       end
-- 
cgit v1.2.3


From 53e16d8011fa2b356595775fbd93c9e3210b4b8a Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 30 Mar 2010 14:18:08 -0500
Subject: Missed a few spots in railties

---
 railties/lib/rails/test_help.rb             | 2 +-
 railties/test/rails_info_controller_test.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index 6522c94ad6..3ce4e2c780 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -30,7 +30,7 @@ end
 
 class ActionController::TestCase
   setup do
-    @router = Rails.application.routes
+    @routes = Rails.application.routes
   end
 end
 
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 05ec359f61..aa76979c27 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -15,9 +15,9 @@ class InfoControllerTest < ActionController::TestCase
       match '/rails/info/properties' => "rails/info#properties"
     end
     @controller.stubs(:consider_all_requests_local? => false, :local_request? => true)
-    @router = Rails.application.routes
+    @routes = Rails.application.routes
 
-    Rails::InfoController.send(:include, @router.url_helpers)
+    Rails::InfoController.send(:include, @routes.url_helpers)
   end
 
   test "info controller does not allow remote requests" do
-- 
cgit v1.2.3


From 772a0226fdbedcc16432e1fb42552678f282e973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 31 Mar 2010 00:11:10 +0200
Subject: Add a test which ensures slugs in :id work.

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

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 10cc4dfb4f..e58653cb8c 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -533,6 +533,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_resource_with_slugs_in_ids
+    with_test_routes do
+      get '/posts/rails-rocks'
+      assert_equal 'posts#show', @response.body
+      assert_equal '/posts/rails-rocks', post_path(:id => 'rails-rocks')
+    end
+  end
+
   def test_resources_for_uncountable_names
     with_test_routes do
       assert_equal '/sheep', sheep_index_path
-- 
cgit v1.2.3


From 7212c29802e34fe7368d5b484a479c31fad49c5d Mon Sep 17 00:00:00 2001
From: Juanjo Bazan <jjbazan@gmail.com>
Date: Tue, 30 Mar 2010 23:18:44 +0200
Subject: new assertion: assert_blank

Signed-off-by: Xavier Noria <fxn@hashref.com>
---
 .../lib/active_support/testing/assertions.rb       |  7 ++++++
 activesupport/test/test_test.rb                    | 28 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index c529b92240..30a22fcc0e 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -62,6 +62,13 @@ module ActiveSupport
       def assert_no_difference(expression, message = nil, &block)
         assert_difference expression, 0, message, &block
       end
+      
+      # Test if an expression is blank. Passes if object.blank? is true.
+      #
+      #   assert_blank [] # => true
+      def assert_blank(object)
+        assert object.blank?, "#{object.inspect} is not blank"
+      end
     end
   end
 end
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 1928da51ca..390670570d 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -86,6 +86,34 @@ class AssertDifferenceTest < ActiveSupport::TestCase
   end
 end
 
+class EmptyTrue
+  def empty?() true; end
+end
+
+class EmptyFalse
+  def empty?() false; end
+end
+
+class AssertBlankTest < ActiveSupport::TestCase
+  BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
+  NOT_BLANK   = [ EmptyFalse.new, Object.new, true, 0, 1, 'j', [nil], { nil => 0 } ]
+  
+  def test_assert_blank_true
+    BLANK.each { |v| assert_blank v }
+  end
+  
+  def test_assert_blank_false
+    NOT_BLANK.each { |v|
+      begin 
+        assert_blank v
+        fail 'should not get to here'
+      rescue Exception => e
+        assert_match(/is not blank/, e.message) 
+      end  
+    }
+  end
+end
+
 # These should always pass
 if ActiveSupport::Testing.const_defined?(:Default)
   class NotTestingThingsTest < Test::Unit::TestCase
-- 
cgit v1.2.3


From 589deb39c79cac40eec40d4ee3d86fac16c1f31f Mon Sep 17 00:00:00 2001
From: Juanjo Bazan <jjbazan@gmail.com>
Date: Tue, 30 Mar 2010 23:39:00 +0200
Subject: New assertion: assert_present [#4299 state:committed]

Signed-off-by: Xavier Noria <fxn@hashref.com>
---
 .../lib/active_support/testing/assertions.rb       |  7 +++++++
 activesupport/test/test_test.rb                    | 22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index 30a22fcc0e..e01aa80877 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -69,6 +69,13 @@ module ActiveSupport
       def assert_blank(object)
         assert object.blank?, "#{object.inspect} is not blank"
       end
+      
+      # Test if an expression is not blank. Passes if object.present? is true.
+      #
+      #   assert_present {:data => 'x' } # => true
+      def assert_present(object)
+        assert object.present?, "#{object.inspect} is blank"
+      end
     end
   end
 end
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 390670570d..f9482c8e90 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -96,7 +96,7 @@ end
 
 class AssertBlankTest < ActiveSupport::TestCase
   BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
-  NOT_BLANK   = [ EmptyFalse.new, Object.new, true, 0, 1, 'j', [nil], { nil => 0 } ]
+  NOT_BLANK = [ EmptyFalse.new, Object.new, true, 0, 1, 'x', [nil], { nil => 0 } ]
   
   def test_assert_blank_true
     BLANK.each { |v| assert_blank v }
@@ -114,6 +114,26 @@ class AssertBlankTest < ActiveSupport::TestCase
   end
 end
 
+class AssertPresentTest < ActiveSupport::TestCase
+  BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
+  NOT_BLANK = [ EmptyFalse.new, Object.new, true, 0, 1, 'x', [nil], { nil => 0 } ]
+  
+  def test_assert_blank_true
+    NOT_BLANK.each { |v| assert_present v }
+  end
+  
+  def test_assert_blank_false
+    BLANK.each { |v|
+      begin 
+        assert_present v
+        fail 'should not get to here'
+      rescue Exception => e
+        assert_match(/is blank/, e.message) 
+      end  
+    }
+  end
+end
+
 # These should always pass
 if ActiveSupport::Testing.const_defined?(:Default)
   class NotTestingThingsTest < Test::Unit::TestCase
-- 
cgit v1.2.3


From 1412ad437eabc76098c698fa10f92d6f3247bb58 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Tue, 30 Mar 2010 15:54:20 -0700
Subject: adds and entry for assert_blank and assert_present to CHANGELOG

---
 activesupport/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 56c81cf63b..3822abcab6 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.0 (pending)*
 
+* New assertions assert_blank and assert_present.  #4299 [Juanjo Bazan] 
+
 * Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.  [Jeremy Kemper]
 
 * JSON backend for YAJL. Preferred if available.  #2666 [Brian Lopez]
-- 
cgit v1.2.3


From 7d0eea179b15c888d8e66654ea7922a9d70831e5 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 30 Mar 2010 20:24:43 -0300
Subject: Don't cache the utc_offset we are already caching the timezone [#4301
 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/values/time_zone.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 3cb4d89e02..945cdd5278 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -198,10 +198,12 @@ module ActiveSupport
       @name = name
       @utc_offset = utc_offset
       @tzinfo = tzinfo
+      @current_period = nil
     end
 
     def utc_offset
-      @utc_offset ||= tzinfo.current_period.utc_offset
+      @current_period ||= tzinfo.current_period
+      @current_period.utc_offset
     end
 
     # Returns the offset of this time zone as a formatted string, of the
@@ -362,13 +364,14 @@ module ActiveSupport
                  "Wellington" ],
        [ 46_800, "Nuku'alofa" ]].
       each do |offset, *places|
-        places.sort.each do |place|
+        places.each do |place|
           place.freeze
           zone = new(place, offset)
           ZONES << zone
           ZONES_MAP[place] = zone
         end
       end
+      ZONES.sort!
       ZONES.freeze
       ZONES_MAP.freeze
 
-- 
cgit v1.2.3


From c10958fbddb22052e7cbe5fe6b825cda3cb26e48 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 30 Mar 2010 20:53:44 -0300
Subject: avoid method redefined; discarding old empty? warning [#4302
 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/test/abstract_unit.rb       | 1 +
 activesupport/test/core_ext/blank_test.rb | 8 --------
 activesupport/test/empty_bool.rb          | 7 +++++++
 activesupport/test/test_test.rb           | 8 --------
 4 files changed, 8 insertions(+), 16 deletions(-)
 create mode 100644 activesupport/test/empty_bool.rb

diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index 67f652325e..ea6ebca3ce 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -10,6 +10,7 @@ $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
 
 require 'test/unit'
 require 'active_support/core_ext/kernel/reporting'
+require 'empty_bool'
 
 silence_warnings { require 'mocha' }
 
diff --git a/activesupport/test/core_ext/blank_test.rb b/activesupport/test/core_ext/blank_test.rb
index ed6c625a0a..97c6b213ba 100644
--- a/activesupport/test/core_ext/blank_test.rb
+++ b/activesupport/test/core_ext/blank_test.rb
@@ -1,14 +1,6 @@
 require 'abstract_unit'
 require 'active_support/core_ext/object/blank'
 
-class EmptyTrue
-  def empty?() true; end
-end
-
-class EmptyFalse
-  def empty?() false; end
-end
-
 class BlankTest < Test::Unit::TestCase
   BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
   NOT   = [ EmptyFalse.new, Object.new, true, 0, 1, 'a', [nil], { nil => 0 } ]
diff --git a/activesupport/test/empty_bool.rb b/activesupport/test/empty_bool.rb
new file mode 100644
index 0000000000..005b3523ef
--- /dev/null
+++ b/activesupport/test/empty_bool.rb
@@ -0,0 +1,7 @@
+class EmptyTrue
+  def empty?() true; end
+end
+
+class EmptyFalse
+  def empty?() false; end
+end
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index f9482c8e90..3092fe01ae 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -86,14 +86,6 @@ class AssertDifferenceTest < ActiveSupport::TestCase
   end
 end
 
-class EmptyTrue
-  def empty?() true; end
-end
-
-class EmptyFalse
-  def empty?() false; end
-end
-
 class AssertBlankTest < ActiveSupport::TestCase
   BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
   NOT_BLANK = [ EmptyFalse.new, Object.new, true, 0, 1, 'x', [nil], { nil => 0 } ]
-- 
cgit v1.2.3


From 62151dd272fa59f19d8e0df7e21600b06d865539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 31 Mar 2010 12:59:10 +0200
Subject: Deprecate cookie_verifier_secret in favor of config.cookie_secret
 allowing signed cookies to work again.

---
 actionpack/lib/action_controller/deprecated/base.rb  | 12 ++++++++++++
 actionpack/lib/action_controller/metal/cookies.rb    |  1 -
 actionpack/lib/action_dispatch/middleware/cookies.rb |  6 +++---
 actionpack/test/controller/cookie_test.rb            |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb
index bbde570ca9..2fd60aacc7 100644
--- a/actionpack/lib/action_controller/deprecated/base.rb
+++ b/actionpack/lib/action_controller/deprecated/base.rb
@@ -66,6 +66,18 @@ module ActionController
         Rails.application.config.action_dispatch.ip_spoofing_check
       end
 
+      def cookie_verifier_secret=(value)
+        ActiveSupport::Deprecation.warn "ActionController::Base.cookie_verifier_secret= is deprecated. " <<
+          "Please configure it on your application with config.cookie_secret=", caller
+        ActionController::Base.config.secret = value
+      end
+
+      def cookie_verifier_secret
+        ActiveSupport::Deprecation.warn "ActionController::Base.cookie_verifier_secret is deprecated. " <<
+          "Please use ActionController::Base.config.secret instead.", caller
+        ActionController::Base.config.secret
+      end
+
       def trusted_proxies=(value)
         ActiveSupport::Deprecation.warn "ActionController::Base.trusted_proxies= is deprecated. " <<
           "Please configure it on your application with config.action_dispatch.trusted_proxies=", caller
diff --git a/actionpack/lib/action_controller/metal/cookies.rb b/actionpack/lib/action_controller/metal/cookies.rb
index 7aa687b52c..75e5d40a63 100644
--- a/actionpack/lib/action_controller/metal/cookies.rb
+++ b/actionpack/lib/action_controller/metal/cookies.rb
@@ -6,7 +6,6 @@ module ActionController #:nodoc:
 
     included do
       helper_method :cookies
-      cattr_accessor :cookie_verifier_secret
     end
     
     private
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb
index ab7130ab08..cb0d12cab1 100644
--- a/actionpack/lib/action_dispatch/middleware/cookies.rb
+++ b/actionpack/lib/action_dispatch/middleware/cookies.rb
@@ -168,12 +168,12 @@ module ActionDispatch
 
     class SignedCookieJar < CookieJar #:nodoc:
       def initialize(parent_jar)
-        unless ActionController::Base.cookie_verifier_secret
-          raise "You must set ActionController::Base.cookie_verifier_secret to use signed cookies"
+        unless ActionController::Base.config.secret
+          raise "You must set ActionController::Base.config.secret"
         end
 
         @parent_jar = parent_jar
-        @verifier = ActiveSupport::MessageVerifier.new(ActionController::Base.cookie_verifier_secret)
+        @verifier = ActiveSupport::MessageVerifier.new(ActionController::Base.config.secret)
       end
 
       def [](name)
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index 36498d13a9..278cae1415 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-ActionController::Base.cookie_verifier_secret = "thisISverySECRET123"
+ActionController::Base.config.secret = "thisISverySECRET123"
 
 class CookieTest < ActionController::TestCase
   class TestController < ActionController::Base
-- 
cgit v1.2.3


From 607f945b1dc42bc7df85063bd6b1118759c0d8a4 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Wed, 31 Mar 2010 04:40:51 -0700
Subject: adds missing require for blank? and present?

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

diff --git a/activesupport/lib/active_support/testing/assertions.rb b/activesupport/lib/active_support/testing/assertions.rb
index e01aa80877..33793f0688 100644
--- a/activesupport/lib/active_support/testing/assertions.rb
+++ b/activesupport/lib/active_support/testing/assertions.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/array/wrap'
+require 'active_support/core_ext/object/blank'
 
 module ActiveSupport
   module Testing
-- 
cgit v1.2.3


From 5562abb4e985dc6f57b0643fc655e93e495602da Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Wed, 31 Mar 2010 12:55:49 +0100
Subject: Dont try to load the record from the db if preloading didn't find
 anything

---
 activerecord/lib/active_record/association_preload.rb | 5 +++++
 activerecord/test/cases/associations/eager_test.rb    | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb
index c94b2ff564..95bbaf00cf 100644
--- a/activerecord/lib/active_record/association_preload.rb
+++ b/activerecord/lib/active_record/association_preload.rb
@@ -159,6 +159,11 @@ module ActiveRecord
             association_proxy.__send__(:set_inverse_instance, associated_record, mapped_record)
           end
         end
+
+        id_to_record_map.each do |id, records|
+          next if seen_keys.include?(id.to_s)
+          records.each {|record| record.send("set_#{reflection_name}_target", nil) }            
+        end
       end
 
       # Given a collection of ActiveRecord objects, constructs a Hash which maps
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 42a891bc3b..79e5ecf4ce 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -833,4 +833,10 @@ class EagerAssociationTest < ActiveRecord::TestCase
     end
   end
 
+  def test_preloading_empty_polymorphic_parent
+    t = Tagging.create!(:taggable_type => 'Post', :taggable_id => Post.maximum(:id) + 1, :tag => tags(:general))
+
+    assert_queries(2) { @tagging = Tagging.preload(:taggable).find(t.id) }
+    assert_no_queries { assert ! @tagging.taggable }
+  end
 end
-- 
cgit v1.2.3


From 05337f61f93d4b28fea2cb269483aff0fa4f2545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 31 Mar 2010 16:00:10 +0200
Subject: yield always return an array, so we don't need to use .key?

---
 actionpack/lib/action_view/template/resolver.rb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb
index 8e8afaa43f..a223b3a55f 100644
--- a/actionpack/lib/action_view/template/resolver.rb
+++ b/actionpack/lib/action_view/template/resolver.rb
@@ -35,12 +35,7 @@ module ActionView
 
     def cached(key, prefix, name, partial)
       return yield unless key && caching?
-      scope = @cached[key][prefix][name]
-      if scope.key?(partial)
-        scope[partial]
-      else
-        scope[partial] = yield
-      end
+      @cached[key][prefix][name][partial] ||= yield
     end
   end
 
-- 
cgit v1.2.3


From db28d407f76a790a31e27bf51560e23425dd6944 Mon Sep 17 00:00:00 2001
From: Ravinder Singh <ravinderrana30@gmail.com>
Date: Wed, 31 Mar 2010 15:28:48 +0530
Subject: Create tmp directories if required before starting server [#3907
 state:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 railties/lib/rails/commands/server.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index c57660c0d1..3f74cd49fc 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -54,6 +54,11 @@ module Rails
       trap(:INT) { exit }
       puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
 
+      #Create required tmp directories if not found
+      %w(cache pids sessions sockets).each do |dir_to_make|
+        FileUtils.mkdir_p(Rails.root.join('tmp', dir_to_make))
+      end
+
       super
     ensure
       # The '-h' option calls exit before @options is set.
-- 
cgit v1.2.3