Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb

34 files changed, 1180 insertions, 543 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 2d133ca0b2..db02beee35 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -23,6 +23,10 @@
 
 * Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. [Yehuda Katz, Carl Lerche]
 
+*Rails 3.0.2 (unreleased)*
+
+* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
+
 *Rails 3.0.1 (October 15, 2010)*
 
 * No Changes, just a version bump.
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index 7b0d80614d..f169ab7c3a 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -81,27 +81,29 @@ module AbstractController
         class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
           # Append a before, after or around filter. See _insert_callbacks
           # for details on the allowed parameters.
-          def #{filter}_filter(*names, &blk)                                                    # def before_filter(*names, &blk)
-            _insert_callbacks(names, blk) do |name, options|                                    #   _insert_callbacks(names, blk) do |name, options}
-              set_callback(:process_action, :#{filter}, name, options)                          #     set_callback(:process_action, :before_filter, name, options)
-            end                                                                                 #   end
-          end                                                                                   # end
+          def #{filter}_filter(*names, &blk)
+            _insert_callbacks(names, blk) do |name, options|
+              options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after}
+              set_callback(:process_action, :#{filter}, name, options)
+            end
+          end
 
           # Prepend a before, after or around filter. See _insert_callbacks
           # for details on the allowed parameters.
-          def prepend_#{filter}_filter(*names, &blk)                                            # def prepend_before_filter(*names, &blk)
-            _insert_callbacks(names, blk) do |name, options|                                    #   _insert_callbacks(names, blk) do |name, options|
-              set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true))  #     set_callback(:process_action, :before, name, options.merge(:prepend => true))
-            end                                                                                 #   end
-          end                                                                                   # end
+          def prepend_#{filter}_filter(*names, &blk)
+            _insert_callbacks(names, blk) do |name, options|
+              options[:if] = (Array.wrap(options[:if]) << "!halted") if #{filter == :after}
+              set_callback(:process_action, :#{filter}, name, options.merge(:prepend => true))
+            end
+          end
 
           # Skip a before, after or around filter. See _insert_callbacks
           # for details on the allowed parameters.
-          def skip_#{filter}_filter(*names, &blk)                                               # def skip_before_filter(*names, &blk)
-            _insert_callbacks(names, blk) do |name, options|                                    #   _insert_callbacks(names, blk) do |name, options|
-              skip_callback(:process_action, :#{filter}, name, options)                         #     skip_callback(:process_action, :before, name, options)
-            end                                                                                 #   end
-          end                                                                                   # end
+          def skip_#{filter}_filter(*names, &blk)
+            _insert_callbacks(names, blk) do |name, options|
+              skip_callback(:process_action, :#{filter}, name, options)
+            end
+          end
 
           # *_filter is the same as append_*_filter
           alias_method :append_#{filter}_filter, :#{filter}_filter
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 4da82f958a..9c9eed2c6d 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -2,6 +2,7 @@ module ActionDispatch
   module Http
     module URL
       mattr_accessor :tld_length
+      self.tld_length = 1
 
       # Returns the complete URL used for this request.
       def url
@@ -67,7 +68,7 @@ module ActionDispatch
 
       # Returns the \domain part of a \host, such as "rubyonrails.org" in "www.rubyonrails.org". You can specify
       # a different <tt>tld_length</tt>, such as 2 to catch rubyonrails.co.uk in "www.rubyonrails.co.uk".
-      def domain(tld_length = 1)
+      def domain(tld_length = @@tld_length)
         return nil unless named_host?(host)
 
         host.split('.').last(1 + tld_length).join('.')
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 1bbb4f1f92..879ccc5791 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -66,6 +66,18 @@ module ActionDispatch
             end
 
             @options.merge!(default_controller_and_action(to_shorthand))
+
+            requirements.each do |name, requirement|
+              # segment_keys.include?(k.to_s) || k == :controller
+              next unless Regexp === requirement && !constraints[name]
+
+              if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
+                raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
+              end
+              if requirement.multiline?
+                raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
+              end
+            end
           end
 
           # match "account/overview"
@@ -113,15 +125,6 @@ module ActionDispatch
             @requirements ||= (@options[:constraints].is_a?(Hash) ? @options[:constraints] : {}).tap do |requirements|
               requirements.reverse_merge!(@scope[:constraints]) if @scope[:constraints]
               @options.each { |k, v| requirements[k] = v if v.is_a?(Regexp) }
-
-              requirements.each do |_, requirement|
-                if requirement.source =~ %r{\A(\\A|\^)|(\\Z|\\z|\$)\Z}
-                  raise ArgumentError, "Regexp anchor characters are not allowed in routing requirements: #{requirement.inspect}"
-                end
-                if requirement.multiline?
-                  raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}"
-                end
-              end
             end
           end
 
@@ -164,10 +167,10 @@ module ActionDispatch
                 raise ArgumentError, "missing :action"
               end
 
-              { :controller => controller, :action => action }.tap do |hash|
-                hash.delete(:controller) if hash[:controller].blank?
-                hash.delete(:action)     if hash[:action].blank?
-              end
+              hash = {}
+              hash[:controller] = controller unless controller.blank?
+              hash[:action]     = action unless action.blank?
+              hash
             end
           end
 
@@ -263,6 +266,23 @@ module ActionDispatch
           self
         end
 
+        # Mount a Rack-based application to be used within the application.
+        #
+        # mount SomeRackApp, :at => "some_route"
+        #
+        # Alternatively:
+        #
+        # mount(SomeRackApp => "some_route")
+        #
+        # All mounted applications come with routing helpers to access them.
+        # These are named after the class specified, so for the above example
+        # the helper is either +some_rack_app_path+ or +some_rack_app_url+.
+        # To customize this helper's name, use the +:as+ option:
+        #
+        # mount(SomeRackApp => "some_route", :as => "exciting")
+        #
+        # This will generate the +exciting_path+ and +exciting_url+ helpers
+        # which can be used to navigate to this mounted app.
         def mount(app, options = nil)
           if options
             path = options.delete(:at)
@@ -324,21 +344,41 @@ module ActionDispatch
 
       module HttpHelpers
         # Define a route that only recognizes HTTP GET.
+        # For supported arguments, see +match+.
+        #
+        # Example:
+        #
+        # get 'bacon', :to => 'food#bacon'
         def get(*args, &block)
           map_method(:get, *args, &block)
         end
 
         # Define a route that only recognizes HTTP POST.
+        # For supported arguments, see +match+.
+        #
+        # Example:
+        #
+        # post 'bacon', :to => 'food#bacon'
         def post(*args, &block)
           map_method(:post, *args, &block)
         end
 
         # Define a route that only recognizes HTTP PUT.
+        # For supported arguments, see +match+.
+        #
+        # Example:
+        #
+        # put 'bacon', :to => 'food#bacon'
         def put(*args, &block)
           map_method(:put, *args, &block)
         end
 
-        # Define a route that only recognizes HTTP DELETE.
+        # Define a route that only recognizes HTTP PUT.
+        # For supported arguments, see +match+.
+        #
+        # Example:
+        #
+        # delete 'broccoli', :to => 'food#broccoli'
         def delete(*args, &block)
           map_method(:delete, *args, &block)
         end
@@ -407,22 +447,22 @@ module ActionDispatch
       #   PUT	    /admin/photos/1
       #   DELETE  /admin/photos/1
       #
-      # If you want to route /photos (without the prefix /admin) to
+      # If you want to route /posts (without the prefix /admin) to
       # Admin::PostsController, you could use
       #
       #   scope :module => "admin" do
-      #     resources :posts, :comments
+      #     resources :posts
       #   end
       #
       # or, for a single case
       #
       #   resources :posts, :module => "admin"
       #
-      # If you want to route /admin/photos to PostsController
+      # If you want to route /admin/posts to PostsController
       # (without the Admin:: module prefix), you could use
       #
       #   scope "/admin" do
-      #     resources :posts, :comments
+      #     resources :posts
       #   end
       #
       # or, for a single case
@@ -448,10 +488,51 @@ module ActionDispatch
 
         # Used to route <tt>/photos</tt> (without the prefix <tt>/admin</tt>)
         # to Admin::PostsController:
+        # === Supported options
+        # [:module]
+        #   If you want to route /posts (without the prefix /admin) to
+        #   Admin::PostsController, you could use
         #
-        #   scope :module => "admin" do
-        #     resources :posts
-        #   end
+        #     scope :module => "admin" do
+        #       resources :posts
+        #     end
+        #
+        # [:path]
+        #   If you want to prefix the route, you could use
+        #
+        #     scope :path => "/admin" do
+        #       resources :posts
+        #     end
+        #
+        #   This will prefix all of the +posts+ resource's requests with '/admin'
+        #
+        # [:as]
+        #  Prefixes the routing helpers in this scope with the specified label.
+        #
+        #    scope :as => "sekret" do
+        #      resources :posts
+        #    end
+        #
+        # Helpers such as +posts_path+ will now be +sekret_posts_path+
+        #
+        # [:shallow_path]
+        #
+        #   Prefixes nested shallow routes with the specified path.
+        #
+        #   scope :shallow_path => "sekret" do
+        #     resources :posts do
+        #       resources :comments, :shallow => true
+        #     end
+        #
+        #   The +comments+ resource here will have the following routes generated for it:
+        #
+        #     post_comments    GET    /sekret/posts/:post_id/comments(.:format)
+        #     post_comments    POST   /sekret/posts/:post_id/comments(.:format)
+        #     new_post_comment GET    /sekret/posts/:post_id/comments/new(.:format)
+        #     edit_comment     GET    /sekret/comments/:id/edit(.:format)
+        #     comment          GET    /sekret/comments/:id(.:format)
+        #     comment          PUT    /sekret/comments/:id(.:format)
+        #     comment          DELETE /sekret/comments/:id(.:format)
         def scope(*args)
           options = args.extract_options!
           options = options.dup
@@ -488,22 +569,139 @@ module ActionDispatch
           @scope[:blocks]  = recover[:block]
         end
 
+        # Scopes routes to a specific controller
+        #
+        # Example:
+        #   controller "food" do
+        #     match "bacon", :action => "bacon"
+        #   end
         def controller(controller, options={})
           options[:controller] = controller
           scope(options) { yield }
         end
 
+        # Scopes routes to a specific namespace. For example:
+        #
+        #   namespace :admin do
+        #     resources :posts
+        #   end
+        #
+        # This generates the following routes:
+        #
+        #     admin_posts GET    /admin/posts(.:format)          {:action=>"index", :controller=>"admin/posts"}
+        #     admin_posts POST   /admin/posts(.:format)          {:action=>"create", :controller=>"admin/posts"}
+        #  new_admin_post GET    /admin/posts/new(.:format)      {:action=>"new", :controller=>"admin/posts"}
+        # edit_admin_post GET    /admin/posts/:id/edit(.:format) {:action=>"edit", :controller=>"admin/posts"}
+        #      admin_post GET    /admin/posts/:id(.:format)      {:action=>"show", :controller=>"admin/posts"}
+        #      admin_post PUT    /admin/posts/:id(.:format)      {:action=>"update", :controller=>"admin/posts"}
+        #      admin_post DELETE /admin/posts/:id(.:format)      {:action=>"destroy", :controller=>"admin/posts"}
+        # === Supported options
+        #
+        # The +:path+, +:as+, +:module+, +:shallow_path+ and +:shallow_prefix+ all default to the name of the namespace.
+        #
+        # [:path]
+        #   The path prefix for the routes.
+        #
+        #   namespace :admin, :path => "sekret" do
+        #     resources :posts
+        #   end
+        #
+        #   All routes for the above +resources+ will be accessible through +/sekret/posts+, rather than +/admin/posts+
+        #
+        # [:module]
+        #   The namespace for the controllers.
+        #
+        #   namespace :admin, :module => "sekret" do
+        #     resources :posts
+        #   end
+        #
+        #   The +PostsController+ here should go in the +Sekret+ namespace and so it should be defined like this:
+        #
+        #   class Sekret::PostsController < ApplicationController
+        #     # code go here
+        #   end
+        #
+        # [:as]
+        #   Changes the name used in routing helpers for this namespace.
+        #
+        #     namespace :admin, :as => "sekret" do
+        #       resources :posts
+        #     end
+        #
+        # Routing helpers such as +admin_posts_path+ will now be +sekret_posts_path+.
+        #
+        # [:shallow_path]
+        #   See the +scope+ method.
         def namespace(path, options = {})
           path = path.to_s
           options = { :path => path, :as => path, :module => path,
                       :shallow_path => path, :shallow_prefix => path }.merge!(options)
           scope(options) { yield }
         end
-
+        
+        # === Parameter Restriction
+        # Allows you to constrain the nested routes based on a set of rules.
+        # For instance, in order to change the routes to allow for a dot character in the +id+ parameter:
+        #
+        #   constraints(:id => /\d+\.\d+) do
+        #     resources :posts
+        #   end
+        #
+        # Now routes such as +/posts/1+ will no longer be valid, but +/posts/1.1+ will be.
+        # The +id+ parameter must match the constraint passed in for this example.
+        # 
+        # You may use this to also resrict other parameters:
+        #
+        #   resources :posts do
+        #     constraints(:post_id => /\d+\.\d+) do
+        #       resources :comments
+        #     end
+        #
+        # === Restricting based on IP
+        #
+        # Routes can also be constrained to an IP or a certain range of IP addresses:
+        #
+        #   constraints(:ip => /192.168.\d+.\d+/) do
+        #     resources :posts
+        #   end
+        #
+        # Any user connecting from the 192.168.* range will be able to see this resource,
+        # where as any user connecting outside of this range will be told there is no such route.
+        #
+        # === Dynamic request matching
+        #
+        # Requests to routes can be constrained based on specific critera:
+        #
+        #    constraints(lambda { |req| req.env["HTTP_USER_AGENT"] =~ /iPhone/ }) do
+        #      resources :iphones
+        #    end
+        #
+        # You are able to move this logic out into a class if it is too complex for routes.
+        # This class must have a +matches?+ method defined on it which either returns +true+
+        # if the user should be given access to that route, or +false+ if the user should not.
+        #
+        #    class Iphone
+        #      def self.matches(request)
+        #        request.env["HTTP_USER_AGENT"] =~ /iPhone/
+        #      end
+        #    end
+        #
+        # An expected place for this code would be +lib/constraints+.
+        #
+        # This class is then used like this:
+        #
+        #    constraints(Iphone) do
+        #      resources :iphones
+        #    end
         def constraints(constraints = {})
           scope(:constraints => constraints) { yield }
         end
 
+        # Allows you to set default parameters for a route, such as this:
+        # defaults :id => 'home' do
+        #   match 'scoped_pages/(:id)', :to => 'pages#show'
+        # end
+        # Using this, the +:id+ parameter here will default to 'home'.
         def defaults(defaults = {})
           scope(:defaults => defaults) { yield }
         end
@@ -771,6 +969,14 @@ module ActionDispatch
         #   GET     /photos/:id/edit
         #   PUT     /photos/:id
         #   DELETE  /photos/:id
+        # === Supported options
+        # [:path_names]
+        #   Allows you to change the paths of the seven default actions.
+        #   Paths not specified are not changed.
+        #
+        #     resources :posts, :path_names => { :new => "brand_new" }
+        #
+        #   The above example will now change /posts/new to /posts/brand_new
         def resources(*resources, &block)
           options = resources.extract_options!
 
diff --git a/actionpack/lib/action_dispatch/routing/route.rb b/actionpack/lib/action_dispatch/routing/route.rb
index f91a48e16c..08a8408f25 100644
--- a/actionpack/lib/action_dispatch/routing/route.rb
+++ b/actionpack/lib/action_dispatch/routing/route.rb
@@ -30,7 +30,8 @@ module ActionDispatch
         if method = conditions[:request_method]
           case method
           when Regexp
-            method.source.upcase
+            source = method.source.upcase
+            source =~ /\A\^[-A-Z|]+\$\Z/ ? source[1..-2] : source
           else
             method.to_s.upcase
           end
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index 73e16daa29..170ceb299a 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -3,8 +3,8 @@ module ActionPack
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    BUILD = "beta"
+    PRE   = "beta"
 
-    STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
 end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index a728fde748..f6b2d4f3f4 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -1,10 +1,6 @@
-require 'thread'
-require 'cgi'
-require 'action_view/helpers/url_helper'
-require 'action_view/helpers/tag_helper'
-require 'active_support/core_ext/file'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/string/output_safety'
+require 'action_view/helpers/asset_tag_helpers/javascript_tag_helpers'
+require 'action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers'
+require 'action_view/helpers/asset_tag_helpers/asset_paths'
 
 module ActionView
   # = Action View Asset Tag Helpers
@@ -195,20 +191,8 @@ module ActionView
     #   RewriteEngine On
     #   RewriteRule ^/release-\d+/(images|javascripts|stylesheets)/(.*)$ /$1/$2 [L]
     module AssetTagHelper
-      mattr_reader :javascript_expansions
-      @@javascript_expansions = { }
-
-      mattr_reader :stylesheet_expansions
-      @@stylesheet_expansions = {}
-
-      # You can enable or disable the asset tag timestamps cache.
-      # With the cache enabled, the asset tag helper methods will make fewer
-      # expensive file system calls. However this prevents you from modifying
-      # any asset files while the server is running.
-      #
-      #   ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
-      mattr_accessor :cache_asset_timestamps
-
+      include JavascriptTagHelpers
+      include StylesheetTagHelpers
       # Returns a link tag that browsers and news readers can use to auto-detect
       # an RSS or ATOM feed. The +type+ can either be <tt>:rss</tt> (default) or
       # <tt>:atom</tt>. Control the link options in url_for format using the
@@ -242,260 +226,6 @@ module ActionView
         )
       end
 
-      # Computes the path to a javascript asset in the public javascripts directory.
-      # If the +source+ filename has no extension, .js will be appended (except for explicit URIs)
-      # Full paths from the document root will be passed through.
-      # Used internally by javascript_include_tag to build the script path.
-      #
-      # ==== Examples
-      #   javascript_path "xmlhr" # => /javascripts/xmlhr.js
-      #   javascript_path "dir/xmlhr.js" # => /javascripts/dir/xmlhr.js
-      #   javascript_path "/dir/xmlhr" # => /dir/xmlhr.js
-      #   javascript_path "http://www.railsapplication.com/js/xmlhr" # => http://www.railsapplication.com/js/xmlhr
-      #   javascript_path "http://www.railsapplication.com/js/xmlhr.js" # => http://www.railsapplication.com/js/xmlhr.js
-      def javascript_path(source)
-        compute_public_path(source, 'javascripts', 'js')
-      end
-      alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
-
-      # Returns an HTML script tag for each of the +sources+ provided. You
-      # can pass in the filename (.js extension is optional) of JavaScript files
-      # that exist in your <tt>public/javascripts</tt> directory for inclusion into the
-      # current page or you can pass the full path relative to your document
-      # root. To include the Prototype and Scriptaculous JavaScript libraries in
-      # your application, pass <tt>:defaults</tt> as the source. When using
-      # <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in
-      # <tt>public/javascripts</tt> it will be included as well. You can modify the
-      # HTML attributes of the script tag by passing a hash as the last argument.
-      #
-      # ==== Examples
-      #   javascript_include_tag "xmlhr" # =>
-      #     <script type="text/javascript" src="/javascripts/xmlhr.js?1284139606"></script>
-      #
-      #   javascript_include_tag "xmlhr.js" # =>
-      #     <script type="text/javascript" src="/javascripts/xmlhr.js?1284139606"></script>
-      #
-      #   javascript_include_tag "common.javascript", "/elsewhere/cools" # =>
-      #     <script type="text/javascript" src="/javascripts/common.javascript?1284139606"></script>
-      #     <script type="text/javascript" src="/elsewhere/cools.js?1423139606"></script>
-      #
-      #   javascript_include_tag "http://www.railsapplication.com/xmlhr" # =>
-      #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr.js?1284139606"></script>
-      #
-      #   javascript_include_tag "http://www.railsapplication.com/xmlhr.js" # =>
-      #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr.js?1284139606"></script>
-      #
-      #   javascript_include_tag :defaults # =>
-      #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/effects.js?1284139606"></script>
-      #     ...
-      #     <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
-      #
-      # * = The application.js file is only referenced if it exists
-      #
-      # You can also include all javascripts in the +javascripts+ directory using <tt>:all</tt> as the source:
-      #
-      #   javascript_include_tag :all # =>
-      #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/effects.js?1284139606"></script>
-      #     ...
-      #     <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/shop.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/checkout.js?1284139606"></script>
-      #
-      # Note that the default javascript files will be included first. So Prototype and Scriptaculous are available to
-      # all subsequently included files.
-      #
-      # If you want Rails to search in all the subdirectories under javascripts, you should explicitly set <tt>:recursive</tt>:
-      #
-      #   javascript_include_tag :all, :recursive => true
-      #
-      # == Caching multiple javascripts into one
-      #
-      # You can also cache multiple javascripts into one file, which requires less HTTP connections to download and can better be
-      # compressed by gzip (leading to faster transfers). Caching will only happen if config.perform_caching
-      # is set to <tt>true</tt> (which is the case by default for the Rails production environment, but not for the development
-      # environment).
-      #
-      # ==== Examples
-      #   javascript_include_tag :all, :cache => true # when config.perform_caching is false =>
-      #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/effects.js?1284139606"></script>
-      #     ...
-      #     <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/shop.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/checkout.js?1284139606"></script>
-      #
-      #   javascript_include_tag :all, :cache => true # when config.perform_caching is true =>
-      #     <script type="text/javascript" src="/javascripts/all.js?1344139789"></script>
-      #
-      #   javascript_include_tag "prototype", "cart", "checkout", :cache => "shop" # when config.perform_caching is false =>
-      #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
-      #     <script type="text/javascript" src="/javascripts/cart.js?1289139157"></script>
-      #     <script type="text/javascript" src="/javascripts/checkout.js?1299139816"></script>
-      #
-      #   javascript_include_tag "prototype", "cart", "checkout", :cache => "shop" # when config.perform_caching is true =>
-      #     <script type="text/javascript" src="/javascripts/shop.js?1299139816"></script>
-      #
-      # The <tt>:recursive</tt> option is also available for caching:
-      #
-      #   javascript_include_tag :all, :cache => true, :recursive => true
-      def javascript_include_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        concat  = options.delete("concat")
-        cache   = concat || options.delete("cache")
-        recursive = options.delete("recursive")
-
-        if concat || (config.perform_caching && cache)
-          joined_javascript_name = (cache == true ? "all" : cache) + ".js"
-          joined_javascript_path = File.join(joined_javascript_name[/^#{File::SEPARATOR}/] ? config.assets_dir : config.javascripts_dir, joined_javascript_name)
-
-          unless config.perform_caching && File.exists?(joined_javascript_path)
-            write_asset_file_contents(joined_javascript_path, compute_javascript_paths(sources, recursive))
-          end
-          javascript_src_tag(joined_javascript_name, options)
-        else
-          sources = expand_javascript_sources(sources, recursive)
-          ensure_javascript_sources!(sources) if cache
-          sources.collect { |source| javascript_src_tag(source, options) }.join("\n").html_safe
-        end
-      end
-
-      # Register one or more javascript files to be included when <tt>symbol</tt>
-      # is passed to <tt>javascript_include_tag</tt>. This method is typically intended
-      # to be called from plugin initialization to register javascript files
-      # that the plugin installed in <tt>public/javascripts</tt>.
-      #
-      #   ActionView::Helpers::AssetTagHelper.register_javascript_expansion :monkey => ["head", "body", "tail"]
-      #
-      #   javascript_include_tag :monkey # =>
-      #     <script type="text/javascript" src="/javascripts/head.js"></script>
-      #     <script type="text/javascript" src="/javascripts/body.js"></script>
-      #     <script type="text/javascript" src="/javascripts/tail.js"></script>
-      def self.register_javascript_expansion(expansions)
-        @@javascript_expansions.merge!(expansions)
-      end
-
-      # Register one or more stylesheet files to be included when <tt>symbol</tt>
-      # is passed to <tt>stylesheet_link_tag</tt>. This method is typically intended
-      # to be called from plugin initialization to register stylesheet files
-      # that the plugin installed in <tt>public/stylesheets</tt>.
-      #
-      #   ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :monkey => ["head", "body", "tail"]
-      #
-      #   stylesheet_link_tag :monkey # =>
-      #     <link href="/stylesheets/head.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/body.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/tail.css"  media="screen" rel="stylesheet" type="text/css" />
-      def self.register_stylesheet_expansion(expansions)
-        @@stylesheet_expansions.merge!(expansions)
-      end
-
-      # Computes the path to a stylesheet asset in the public stylesheets directory.
-      # If the +source+ filename has no extension, <tt>.css</tt> will be appended (except for explicit URIs).
-      # Full paths from the document root will be passed through.
-      # Used internally by +stylesheet_link_tag+ to build the stylesheet path.
-      #
-      # ==== Examples
-      #   stylesheet_path "style" # => /stylesheets/style.css
-      #   stylesheet_path "dir/style.css" # => /stylesheets/dir/style.css
-      #   stylesheet_path "/dir/style.css" # => /dir/style.css
-      #   stylesheet_path "http://www.railsapplication.com/css/style" # => http://www.railsapplication.com/css/style
-      #   stylesheet_path "http://www.railsapplication.com/css/style.css" # => http://www.railsapplication.com/css/style.css
-      def stylesheet_path(source)
-        compute_public_path(source, 'stylesheets', 'css')
-      end
-      alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
-
-      # Returns a stylesheet link tag for the sources specified as arguments. If
-      # you don't specify an extension, <tt>.css</tt> will be appended automatically.
-      # You can modify the link attributes by passing a hash as the last argument.
-      #
-      # ==== Examples
-      #   stylesheet_link_tag "style" # =>
-      #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "style.css" # =>
-      #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "http://www.railsapplication.com/style.css" # =>
-      #     <link href="http://www.railsapplication.com/style.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "style", :media => "all" # =>
-      #     <link href="/stylesheets/style.css" media="all" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "style", :media => "print" # =>
-      #     <link href="/stylesheets/style.css" media="print" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "random.styles", "/css/stylish" # =>
-      #     <link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/css/stylish.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      # You can also include all styles in the stylesheets directory using <tt>:all</tt> as the source:
-      #
-      #   stylesheet_link_tag :all # =>
-      #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      # If you want Rails to search in all the subdirectories under stylesheets, you should explicitly set <tt>:recursive</tt>:
-      #
-      #   stylesheet_link_tag :all, :recursive => true
-      #
-      # == Caching multiple stylesheets into one
-      #
-      # You can also cache multiple stylesheets into one file, which requires less HTTP connections and can better be
-      # compressed by gzip (leading to faster transfers). Caching will only happen if config.perform_caching
-      # is set to true (which is the case by default for the Rails production environment, but not for the development
-      # environment). Examples:
-      #
-      # ==== Examples
-      #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is false =>
-      #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is true =>
-      #     <link href="/stylesheets/all.css"  media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "shop", "cart", "checkout", :cache => "payment" # when config.perform_caching is false =>
-      #     <link href="/stylesheets/shop.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/cart.css"  media="screen" rel="stylesheet" type="text/css" />
-      #     <link href="/stylesheets/checkout.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_link_tag "shop", "cart", "checkout", :cache => "payment" # when config.perform_caching is true =>
-      #     <link href="/stylesheets/payment.css"  media="screen" rel="stylesheet" type="text/css" />
-      #
-      # The <tt>:recursive</tt> option is also available for caching:
-      #
-      #   stylesheet_link_tag :all, :cache => true, :recursive => true
-      #
-      # To force concatenation (even in development mode) set <tt>:concat</tt> to true. This is useful if
-      # you have too many stylesheets for IE to load.
-      #
-      #   stylesheet_link_tag :all, :concat => true
-      #
-      def stylesheet_link_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        concat  = options.delete("concat")
-        cache   = concat || options.delete("cache")
-        recursive = options.delete("recursive")
-
-        if concat || (config.perform_caching && cache)
-          joined_stylesheet_name = (cache == true ? "all" : cache) + ".css"
-          joined_stylesheet_path = File.join(joined_stylesheet_name[/^#{File::SEPARATOR}/] ? config.assets_dir : config.stylesheets_dir, joined_stylesheet_name)
-
-          unless config.perform_caching && File.exists?(joined_stylesheet_path)
-            write_asset_file_contents(joined_stylesheet_path, compute_stylesheet_paths(sources, recursive))
-          end
-          stylesheet_tag(joined_stylesheet_name, options)
-        else
-          sources = expand_stylesheet_sources(sources, recursive)
-          ensure_stylesheet_sources!(sources) if cache
-          sources.collect { |source| stylesheet_tag(source, options) }.join("\n").html_safe
-        end
-      end
-
       # Web browsers cache favicons. If you just throw a <tt>favicon.ico</tt> into the document
       # root of your application and it changes later, clients that have it in their cache
       # won't see the update. Using this helper prevents that because it appends an asset ID:
@@ -544,7 +274,7 @@ module ActionView
       # The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and
       # plugin authors are encouraged to do so.
       def image_path(source)
-        compute_public_path(source, 'images')
+        asset_paths.compute_public_path(source, 'images')
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
@@ -559,7 +289,7 @@ module ActionView
       #   video_path("/trailers/hd.avi")                              # => /trailers/hd.avi
       #   video_path("http://www.railsapplication.com/vid/hd.avi") # => http://www.railsapplication.com/vid/hd.avi
       def video_path(source)
-        compute_public_path(source, 'videos')
+        asset_paths.compute_public_path(source, 'videos')
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
@@ -569,12 +299,12 @@ module ActionView
       #
       # ==== Examples
       #   audio_path("horse")                                            # => /audios/horse
-      #   audio_path("horse.wav")                                        # => /audios/horse.avi
-      #   audio_path("sounds/horse.wav")                                 # => /audios/sounds/horse.avi
-      #   audio_path("/sounds/horse.wav")                                # => /sounds/horse.avi
+      #   audio_path("horse.wav")                                        # => /audios/horse.wav
+      #   audio_path("sounds/horse.wav")                                 # => /audios/sounds/horse.wav
+      #   audio_path("/sounds/horse.wav")                                # => /sounds/horse.wav
       #   audio_path("http://www.railsapplication.com/sounds/horse.wav") # => http://www.railsapplication.com/sounds/horse.wav
       def audio_path(source)
-        compute_public_path(source, 'audios')
+        asset_paths.compute_public_path(source, 'audios')
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
@@ -703,213 +433,8 @@ module ActionView
 
       private
 
-        def rewrite_extension(source, dir, ext)
-          source_ext = File.extname(source)
-
-          if source_ext.empty?
-            "#{source}.#{ext}"
-          elsif ext != source_ext[1..-1]
-            with_ext = "#{source}.#{ext}"
-            with_ext if File.exist?(File.join(config.assets_dir, dir, with_ext))
-          end || source
-        end
-
-        def rewrite_host_and_protocol(source, has_request)
-          host = compute_asset_host(source)
-          if has_request && host && !is_uri?(host)
-            host = "#{controller.request.protocol}#{host}"
-          end
-          "#{host}#{source}"
-        end
-
-        def rewrite_relative_url_root(source, relative_url_root)
-          relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
-        end
-
-        # Add the the extension +ext+ if not present. Return full URLs otherwise untouched.
-        # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
-        # roots. Rewrite the asset path for cache-busting asset ids. Include
-        # asset host, if configured, with the correct request protocol.
-        def compute_public_path(source, dir, ext = nil, include_host = true)
-          return source if is_uri?(source)
-
-          source = rewrite_extension(source, dir, ext) if ext
-          source = "/#{dir}/#{source}" unless source[0] == ?/
-          if controller.respond_to?(:env) && controller.env["action_dispatch.asset_path"]
-            source = rewrite_asset_path(source, controller.env["action_dispatch.asset_path"])
-          end
-          source = rewrite_asset_path(source, config.asset_path)
-
-          has_request = controller.respond_to?(:request)
-          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request && include_host
-          source = rewrite_host_and_protocol(source, has_request) if include_host
-
-          source
-        end
-
-        def is_uri?(path)
-          path =~ %r{^[-a-z]+://|^cid:}
-        end
-
-        # Pick an asset host for this source. Returns +nil+ if no host is set,
-        # the host if no wildcard is set, the host interpolated with the
-        # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
-        # or the value returned from invoking the proc if it's a proc or the value from
-        # invoking call if it's an object responding to call.
-        def compute_asset_host(source)
-          if host = config.asset_host
-            if host.is_a?(Proc) || host.respond_to?(:call)
-              case host.is_a?(Proc) ? host.arity : host.method(:call).arity
-              when 2
-                request = controller.respond_to?(:request) && controller.request
-                host.call(source, request)
-              else
-                host.call(source)
-              end
-            else
-              (host =~ /%d/) ? host % (source.hash % 4) : host
-            end
-          end
-        end
-
-        @@asset_timestamps_cache = {}
-        @@asset_timestamps_cache_guard = Mutex.new
-
-        # Use the RAILS_ASSET_ID environment variable or the source's
-        # modification time as its cache-busting asset id.
-        def rails_asset_id(source)
-          if asset_id = ENV["RAILS_ASSET_ID"]
-            asset_id
-          else
-            if @@cache_asset_timestamps && (asset_id = @@asset_timestamps_cache[source])
-              asset_id
-            else
-              path = File.join(config.assets_dir, source)
-              asset_id = File.exist?(path) ? File.mtime(path).to_i.to_s : ''
-
-              if @@cache_asset_timestamps
-                @@asset_timestamps_cache_guard.synchronize do
-                  @@asset_timestamps_cache[source] = asset_id
-                end
-              end
-
-              asset_id
-            end
-          end
-        end
-
-        # 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, 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.empty?
-            source
-          else
-            "#{source}?#{asset_id}"
-          end
-        end
-
-        def javascript_src_tag(source, options)
-          content_tag("script", "", { "type" => Mime::JS, "src" => path_to_javascript(source) }.merge(options))
-        end
-
-        def stylesheet_tag(source, options)
-          tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => ERB::Util.html_escape(path_to_stylesheet(source)) }.merge(options), false, false)
-        end
-
-        def compute_javascript_paths(*args)
-          expand_javascript_sources(*args).collect { |source| compute_public_path(source, 'javascripts', 'js', false) }
-        end
-
-        def compute_stylesheet_paths(*args)
-          expand_stylesheet_sources(*args).collect { |source| compute_public_path(source, 'stylesheets', 'css', false) }
-        end
-
-        def expand_javascript_sources(sources, recursive = false)
-          if sources.include?(:all)
-            all_javascript_files = (collect_asset_files(config.javascripts_dir, ('**' if recursive), '*.js') - ['application']) << 'application'
-            ((determine_source(:defaults, @@javascript_expansions).dup & all_javascript_files) + all_javascript_files).uniq
-          else
-            expanded_sources = sources.collect do |source|
-              determine_source(source, @@javascript_expansions)
-            end.flatten
-            expanded_sources << "application" if sources.include?(:defaults) && File.exist?(File.join(config.javascripts_dir, "application.js"))
-            expanded_sources
-          end
-        end
-
-        def expand_stylesheet_sources(sources, recursive)
-          if sources.first == :all
-            collect_asset_files(config.stylesheets_dir, ('**' if recursive), '*.css')
-          else
-            sources.collect do |source|
-              determine_source(source, @@stylesheet_expansions)
-            end.flatten
-          end
-        end
-
-        def determine_source(source, collection)
-          case source
-          when Symbol
-            collection[source] || raise(ArgumentError, "No expansion found for #{source.inspect}")
-          else
-            source
-          end
-        end
-
-        def ensure_stylesheet_sources!(sources)
-          sources.each do |source|
-            asset_file_path!(path_to_stylesheet(source))
-          end
-          return sources
-        end
-
-        def ensure_javascript_sources!(sources)
-          sources.each do |source|
-            asset_file_path!(path_to_javascript(source))
-          end
-          return sources
-        end
-
-        def join_asset_file_contents(paths)
-          paths.collect { |path| File.read(asset_file_path!(path)) }.join("\n\n")
-        end
-
-        def write_asset_file_contents(joined_asset_path, asset_paths)
-
-          FileUtils.mkdir_p(File.dirname(joined_asset_path))
-          File.atomic_write(joined_asset_path) { |cache| cache.write(join_asset_file_contents(asset_paths)) }
-
-          # Set mtime to the latest of the combined files to allow for
-          # consistent ETag without a shared filesystem.
-          mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
-          File.utime(mt, mt, joined_asset_path)
-        end
-
-        def asset_file_path(path)
-          File.join(config.assets_dir, path.split('?').first)
-        end
-
-        def asset_file_path!(path)
-          unless is_uri?(path)
-            absolute_path = asset_file_path(path)
-            raise(Errno::ENOENT, "Asset file not found at '#{absolute_path}'" ) unless File.exist?(absolute_path)
-            return absolute_path
-          end
-        end
-
-        def collect_asset_files(*path)
-          dir = path.first
-
-          Dir[File.join(*path.compact)].collect do |file|
-            file[-(file.size - dir.size - 1)..-1].sub(/\.\w+$/, '')
-          end.sort
+        def asset_paths
+          @asset_paths ||= AssetPaths.new(config, controller)
         end
     end
   end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
new file mode 100644
index 0000000000..3bc81ae068
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_include_tag.rb
@@ -0,0 +1,133 @@
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/file'
+require 'action_view/helpers/tag_helper'
+
+module ActionView
+  module Helpers
+    module AssetTagHelper
+
+      class AssetIncludeTag
+        attr_reader :config, :asset_paths
+
+        class_attribute :expansions
+        self.expansions = { }
+
+        def initialize(config, asset_paths)
+          @config = config
+          @asset_paths = asset_paths
+        end
+
+        def asset_name
+          raise NotImplementedError
+        end
+
+        def extension
+          raise NotImplementedError
+        end
+
+        def custom_dir
+          raise NotImplementedError
+        end
+
+        def asset_tag(source, options)
+          raise NotImplementedError
+        end
+
+        def include_tag(*sources)
+          options = sources.extract_options!.stringify_keys
+          concat  = options.delete("concat")
+          cache   = concat || options.delete("cache")
+          recursive = options.delete("recursive")
+
+          if concat || (config.perform_caching && cache)
+            joined_name = (cache == true ? "all" : cache) + ".#{extension}"
+            joined_path = File.join((joined_name[/^#{File::SEPARATOR}/] ? config.assets_dir : custom_dir), joined_name)
+            unless config.perform_caching && File.exists?(joined_path)
+              write_asset_file_contents(joined_path, compute_paths(sources, recursive))
+            end
+            asset_tag(joined_name, options)
+          else
+            sources = expand_sources(sources, recursive)
+            ensure_sources!(sources) if cache
+            sources.collect { |source| asset_tag(source, options) }.join("\n").html_safe
+          end
+        end
+
+
+        private
+
+          def path_to_asset(source)
+            asset_paths.compute_public_path(source, asset_name.to_s.pluralize, extension)
+          end
+
+          def compute_paths(*args)
+            expand_sources(*args).collect { |source| asset_paths.compute_public_path(source, asset_name.pluralize, extension, false) }
+          end
+
+          def expand_sources(sources, recursive)
+            if sources.first == :all
+              collect_asset_files(custom_dir, ('**' if recursive), "*.#{extension}")
+            else
+              sources.collect do |source|
+                determine_source(source, expansions)
+              end.flatten
+            end
+          end
+
+          def ensure_sources!(sources)
+            sources.each do |source|
+              asset_file_path!(path_to_asset(source))
+            end
+            return sources
+          end
+
+          def collect_asset_files(*path)
+            dir = path.first
+
+            Dir[File.join(*path.compact)].collect do |file|
+              file[-(file.size - dir.size - 1)..-1].sub(/\.\w+$/, '')
+            end.sort
+          end
+
+          def determine_source(source, collection)
+            case source
+            when Symbol
+              collection[source] || raise(ArgumentError, "No expansion found for #{source.inspect}")
+            else
+              source
+            end
+          end
+
+          def join_asset_file_contents(paths)
+            paths.collect { |path| File.read(asset_file_path!(path, true)) }.join("\n\n")
+          end
+
+          def write_asset_file_contents(joined_asset_path, asset_paths)
+            FileUtils.mkdir_p(File.dirname(joined_asset_path))
+            File.atomic_write(joined_asset_path) { |cache| cache.write(join_asset_file_contents(asset_paths)) }
+
+            # Set mtime to the latest of the combined files to allow for
+            # consistent ETag without a shared filesystem.
+            mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
+            File.utime(mt, mt, joined_asset_path)
+          end
+
+          def asset_file_path(path)
+            File.join(config.assets_dir, path.split('?').first)
+          end
+
+          def asset_file_path!(path, error_if_file_is_uri = false)
+            if asset_paths.is_uri?(path)
+              raise(Errno::ENOENT, "Asset file #{path} is uri and cannot be merged into single file") if error_if_file_is_uri
+            else
+              absolute_path = asset_file_path(path)
+              raise(Errno::ENOENT, "Asset file not found at '#{absolute_path}'" ) unless File.exist?(absolute_path)
+              return absolute_path
+            end
+          end
+      end
+
+    end
+  end
+end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
new file mode 100644
index 0000000000..b4e61f2034
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -0,0 +1,153 @@
+require 'active_support/core_ext/file'
+
+module ActionView
+  module Helpers
+    module AssetTagHelper
+
+      class AssetPaths
+        # You can enable or disable the asset tag ids cache.
+        # With the cache enabled, the asset tag helper methods will make fewer
+        # expensive file system calls (the default implementation checks the file
+        # system timestamp). However this prevents you from modifying any asset
+        # files while the server is running.
+        #
+        #   ActionView::Helpers::AssetTagHelper::AssetPaths.cache_asset_ids = false
+        mattr_accessor :cache_asset_ids
+
+        attr_reader :config, :controller
+
+        def initialize(config, controller)
+          @config = config
+          @controller = controller
+        end
+
+        # Add the the extension +ext+ if not present. Return full URLs otherwise untouched.
+        # Prefix with <tt>/dir/</tt> if lacking a leading +/+. Account for relative URL
+        # roots. Rewrite the asset path for cache-busting asset ids. Include
+        # asset host, if configured, with the correct request protocol.
+        def compute_public_path(source, dir, ext = nil, include_host = true)
+          return source if is_uri?(source)
+
+          source = rewrite_extension(source, dir, ext) if ext
+          source = "/#{dir}/#{source}" unless source[0] == ?/
+          if controller.respond_to?(:env) && controller.env["action_dispatch.asset_path"]
+            source = rewrite_asset_path(source, controller.env["action_dispatch.asset_path"])
+          end
+          source = rewrite_asset_path(source, config.asset_path)
+
+          has_request = controller.respond_to?(:request)
+          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request && include_host
+          source = rewrite_host_and_protocol(source, has_request) if include_host
+
+          source
+        end
+
+        # Add or change an asset id in the asset id cache. This can be used
+        # for SASS on Heroku.
+        # :api: public
+        def add_to_asset_ids_cache(source, asset_id)
+          self.asset_ids_cache_guard.synchronize do
+            self.asset_ids_cache[source] = asset_id
+          end
+        end
+
+        def is_uri?(path)
+          path =~ %r{^[-a-z]+://|^cid:}
+        end
+
+        private
+
+          def rewrite_extension(source, dir, ext)
+            source_ext = File.extname(source)
+
+            source_with_ext = if source_ext.empty?
+              "#{source}.#{ext}"
+            elsif ext != source_ext[1..-1]
+              with_ext = "#{source}.#{ext}"
+              with_ext if File.exist?(File.join(config.assets_dir, dir, with_ext))
+            end
+
+            source_with_ext || source
+          end
+
+          # 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, 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.empty?
+              source
+            else
+              "#{source}?#{asset_id}"
+            end
+          end
+
+          mattr_accessor :asset_ids_cache
+          self.asset_ids_cache = {}
+
+          mattr_accessor :asset_ids_cache_guard
+          self.asset_ids_cache_guard = Mutex.new
+
+          # Use the RAILS_ASSET_ID environment variable or the source's
+          # modification time as its cache-busting asset id.
+          def rails_asset_id(source)
+            if asset_id = ENV["RAILS_ASSET_ID"]
+              asset_id
+            else
+              if self.cache_asset_ids && (asset_id = self.asset_ids_cache[source])
+                asset_id
+              else
+                path = File.join(config.assets_dir, source)
+                asset_id = File.exist?(path) ? File.mtime(path).to_i.to_s : ''
+
+                if self.cache_asset_ids
+                  add_to_asset_ids_cache(source, asset_id)
+                end
+
+                asset_id
+              end
+            end
+          end
+
+          def rewrite_relative_url_root(source, relative_url_root)
+            relative_url_root && !source.starts_with?("#{relative_url_root}/") ? "#{relative_url_root}#{source}" : source
+          end
+
+          def rewrite_host_and_protocol(source, has_request)
+            host = compute_asset_host(source)
+            if has_request && host && !is_uri?(host)
+              host = "#{controller.request.protocol}#{host}"
+            end
+            "#{host}#{source}"
+          end
+
+          # Pick an asset host for this source. Returns +nil+ if no host is set,
+          # the host if no wildcard is set, the host interpolated with the
+          # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
+          # or the value returned from invoking the proc if it's a proc or the value from
+          # invoking call if it's an object responding to call.
+          def compute_asset_host(source)
+            if host = config.asset_host
+              if host.is_a?(Proc) || host.respond_to?(:call)
+                case host.is_a?(Proc) ? host.arity : host.method(:call).arity
+                when 2
+                  request = controller.respond_to?(:request) && controller.request
+                  host.call(source, request)
+                else
+                  host.call(source)
+                end
+              else
+                (host =~ /%d/) ? host % (source.hash % 4) : host
+              end
+            end
+          end
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
new file mode 100644
index 0000000000..6581e1d6f2
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -0,0 +1,173 @@
+require 'active_support/concern'
+require 'active_support/core_ext/file'
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
+
+module ActionView
+  module Helpers
+    module AssetTagHelper
+
+      class JavascriptIncludeTag < AssetIncludeTag
+        include TagHelper
+
+        def asset_name
+          'javascript'
+        end
+
+        def extension
+          'js'
+        end
+
+        def asset_tag(source, options)
+          content_tag("script", "", { "type" => Mime::JS, "src" => path_to_asset(source) }.merge(options))
+        end
+
+        def custom_dir
+          config.javascripts_dir
+        end
+
+        private
+
+          def expand_sources(sources, recursive = false)
+            if sources.include?(:all)
+              all_asset_files = (collect_asset_files(custom_dir, ('**' if recursive), "*.#{extension}") - ['application']) << 'application'
+              ((determine_source(:defaults, expansions).dup & all_asset_files) + all_asset_files).uniq
+            else
+              expanded_sources = sources.collect do |source|
+                determine_source(source, expansions)
+              end.flatten
+              expanded_sources << "application" if sources.include?(:defaults) && File.exist?(File.join(custom_dir, "application.#{extension}"))
+              expanded_sources
+            end
+          end
+      end
+
+
+      module JavascriptTagHelpers
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # Register one or more javascript files to be included when <tt>symbol</tt>
+          # is passed to <tt>javascript_include_tag</tt>. This method is typically intended
+          # to be called from plugin initialization to register javascript files
+          # that the plugin installed in <tt>public/javascripts</tt>.
+          #
+          #   ActionView::Helpers::AssetTagHelper.register_javascript_expansion :monkey => ["head", "body", "tail"]
+          #
+          #   javascript_include_tag :monkey # =>
+          #     <script type="text/javascript" src="/javascripts/head.js"></script>
+          #     <script type="text/javascript" src="/javascripts/body.js"></script>
+          #     <script type="text/javascript" src="/javascripts/tail.js"></script>
+          def register_javascript_expansion(expansions)
+            JavascriptIncludeTag.expansions.merge!(expansions)
+          end
+        end
+
+        # Computes the path to a javascript asset in the public javascripts directory.
+        # If the +source+ filename has no extension, .js will be appended (except for explicit URIs)
+        # Full paths from the document root will be passed through.
+        # Used internally by javascript_include_tag to build the script path.
+        #
+        # ==== Examples
+        #   javascript_path "xmlhr" # => /javascripts/xmlhr.js
+        #   javascript_path "dir/xmlhr.js" # => /javascripts/dir/xmlhr.js
+        #   javascript_path "/dir/xmlhr" # => /dir/xmlhr.js
+        #   javascript_path "http://www.railsapplication.com/js/xmlhr" # => http://www.railsapplication.com/js/xmlhr
+        #   javascript_path "http://www.railsapplication.com/js/xmlhr.js" # => http://www.railsapplication.com/js/xmlhr.js
+        def javascript_path(source)
+          asset_paths.compute_public_path(source, 'javascripts', 'js')
+        end
+        alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
+
+        # Returns an HTML script tag for each of the +sources+ provided. You
+        # can pass in the filename (.js extension is optional) of JavaScript files
+        # that exist in your <tt>public/javascripts</tt> directory for inclusion into the
+        # current page or you can pass the full path relative to your document
+        # root. To include the Prototype and Scriptaculous JavaScript libraries in
+        # your application, pass <tt>:defaults</tt> as the source. When using
+        # <tt>:defaults</tt>, if an <tt>application.js</tt> file exists in
+        # <tt>public/javascripts</tt> it will be included as well. You can modify the
+        # HTML attributes of the script tag by passing a hash as the last argument.
+        #
+        # ==== Examples
+        #   javascript_include_tag "xmlhr" # =>
+        #     <script type="text/javascript" src="/javascripts/xmlhr.js?1284139606"></script>
+        #
+        #   javascript_include_tag "xmlhr.js" # =>
+        #     <script type="text/javascript" src="/javascripts/xmlhr.js?1284139606"></script>
+        #
+        #   javascript_include_tag "common.javascript", "/elsewhere/cools" # =>
+        #     <script type="text/javascript" src="/javascripts/common.javascript?1284139606"></script>
+        #     <script type="text/javascript" src="/elsewhere/cools.js?1423139606"></script>
+        #
+        #   javascript_include_tag "http://www.railsapplication.com/xmlhr" # =>
+        #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr.js?1284139606"></script>
+        #
+        #   javascript_include_tag "http://www.railsapplication.com/xmlhr.js" # =>
+        #     <script type="text/javascript" src="http://www.railsapplication.com/xmlhr.js?1284139606"></script>
+        #
+        #   javascript_include_tag :defaults # =>
+        #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/effects.js?1284139606"></script>
+        #     ...
+        #     <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
+        #
+        # * = The application.js file is only referenced if it exists
+        #
+        # You can also include all javascripts in the +javascripts+ directory using <tt>:all</tt> as the source:
+        #
+        #   javascript_include_tag :all # =>
+        #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/effects.js?1284139606"></script>
+        #     ...
+        #     <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/shop.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/checkout.js?1284139606"></script>
+        #
+        # Note that the default javascript files will be included first. So Prototype and Scriptaculous are available to
+        # all subsequently included files.
+        #
+        # If you want Rails to search in all the subdirectories under javascripts, you should explicitly set <tt>:recursive</tt>:
+        #
+        #   javascript_include_tag :all, :recursive => true
+        #
+        # == Caching multiple javascripts into one
+        #
+        # You can also cache multiple javascripts into one file, which requires less HTTP connections to download and can better be
+        # compressed by gzip (leading to faster transfers). Caching will only happen if config.perform_caching
+        # is set to <tt>true</tt> (which is the case by default for the Rails production environment, but not for the development
+        # environment).
+        #
+        # ==== Examples
+        #   javascript_include_tag :all, :cache => true # when config.perform_caching is false =>
+        #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/effects.js?1284139606"></script>
+        #     ...
+        #     <script type="text/javascript" src="/javascripts/application.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/shop.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/checkout.js?1284139606"></script>
+        #
+        #   javascript_include_tag :all, :cache => true # when config.perform_caching is true =>
+        #     <script type="text/javascript" src="/javascripts/all.js?1344139789"></script>
+        #
+        #   javascript_include_tag "prototype", "cart", "checkout", :cache => "shop" # when config.perform_caching is false =>
+        #     <script type="text/javascript" src="/javascripts/prototype.js?1284139606"></script>
+        #     <script type="text/javascript" src="/javascripts/cart.js?1289139157"></script>
+        #     <script type="text/javascript" src="/javascripts/checkout.js?1299139816"></script>
+        #
+        #   javascript_include_tag "prototype", "cart", "checkout", :cache => "shop" # when config.perform_caching is true =>
+        #     <script type="text/javascript" src="/javascripts/shop.js?1299139816"></script>
+        #
+        # The <tt>:recursive</tt> option is also available for caching:
+        #
+        #   javascript_include_tag :all, :cache => true, :recursive => true
+        def javascript_include_tag(*sources)
+          @javascript_include ||= JavascriptIncludeTag.new(config, asset_paths)
+          @javascript_include.include_tag(*sources)
+        end
+
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
new file mode 100644
index 0000000000..d02b28d7f6
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -0,0 +1,144 @@
+require 'active_support/concern'
+require 'active_support/core_ext/file'
+require 'action_view/helpers/tag_helper'
+require 'action_view/helpers/asset_tag_helpers/asset_include_tag'
+
+module ActionView
+  module Helpers
+    module AssetTagHelper
+
+      class StylesheetIncludeTag < AssetIncludeTag
+        include TagHelper
+
+        def asset_name
+          'stylesheet'
+        end
+
+        def extension
+          'css'
+        end
+
+        def asset_tag(source, options)
+          tag("link", { "rel" => "stylesheet", "type" => Mime::CSS, "media" => "screen", "href" => ERB::Util.html_escape(path_to_asset(source)) }.merge(options), false, false)
+        end
+
+        def custom_dir
+          config.stylesheets_dir
+        end
+      end
+
+
+      module StylesheetTagHelpers
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # Register one or more stylesheet files to be included when <tt>symbol</tt>
+          # is passed to <tt>stylesheet_link_tag</tt>. This method is typically intended
+          # to be called from plugin initialization to register stylesheet files
+          # that the plugin installed in <tt>public/stylesheets</tt>.
+          #
+          #   ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :monkey => ["head", "body", "tail"]
+          #
+          #   stylesheet_link_tag :monkey # =>
+          #     <link href="/stylesheets/head.css"  media="screen" rel="stylesheet" type="text/css" />
+          #     <link href="/stylesheets/body.css"  media="screen" rel="stylesheet" type="text/css" />
+          #     <link href="/stylesheets/tail.css"  media="screen" rel="stylesheet" type="text/css" />
+          def register_stylesheet_expansion(expansions)
+            StylesheetIncludeTag.expansions.merge!(expansions)
+          end
+        end
+
+        # Computes the path to a stylesheet asset in the public stylesheets directory.
+        # If the +source+ filename has no extension, <tt>.css</tt> will be appended (except for explicit URIs).
+        # Full paths from the document root will be passed through.
+        # Used internally by +stylesheet_link_tag+ to build the stylesheet path.
+        #
+        # ==== Examples
+        #   stylesheet_path "style" # => /stylesheets/style.css
+        #   stylesheet_path "dir/style.css" # => /stylesheets/dir/style.css
+        #   stylesheet_path "/dir/style.css" # => /dir/style.css
+        #   stylesheet_path "http://www.railsapplication.com/css/style" # => http://www.railsapplication.com/css/style
+        #   stylesheet_path "http://www.railsapplication.com/css/style.css" # => http://www.railsapplication.com/css/style.css
+        def stylesheet_path(source)
+          asset_paths.compute_public_path(source, 'stylesheets', 'css')
+        end
+        alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
+
+        # Returns a stylesheet link tag for the sources specified as arguments. If
+        # you don't specify an extension, <tt>.css</tt> will be appended automatically.
+        # You can modify the link attributes by passing a hash as the last argument.
+        #
+        # ==== Examples
+        #   stylesheet_link_tag "style" # =>
+        #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "style.css" # =>
+        #     <link href="/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "http://www.railsapplication.com/style.css" # =>
+        #     <link href="http://www.railsapplication.com/style.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "style", :media => "all" # =>
+        #     <link href="/stylesheets/style.css" media="all" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "style", :media => "print" # =>
+        #     <link href="/stylesheets/style.css" media="print" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "random.styles", "/css/stylish" # =>
+        #     <link href="/stylesheets/random.styles" media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/css/stylish.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        # You can also include all styles in the stylesheets directory using <tt>:all</tt> as the source:
+        #
+        #   stylesheet_link_tag :all # =>
+        #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        # If you want Rails to search in all the subdirectories under stylesheets, you should explicitly set <tt>:recursive</tt>:
+        #
+        #   stylesheet_link_tag :all, :recursive => true
+        #
+        # == Caching multiple stylesheets into one
+        #
+        # You can also cache multiple stylesheets into one file, which requires less HTTP connections and can better be
+        # compressed by gzip (leading to faster transfers). Caching will only happen if config.perform_caching
+        # is set to true (which is the case by default for the Rails production environment, but not for the development
+        # environment). Examples:
+        #
+        # ==== Examples
+        #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is false =>
+        #     <link href="/stylesheets/style1.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/styleB.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/styleX2.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag :all, :cache => true # when config.perform_caching is true =>
+        #     <link href="/stylesheets/all.css"  media="screen" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "shop", "cart", "checkout", :cache => "payment" # when config.perform_caching is false =>
+        #     <link href="/stylesheets/shop.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/cart.css"  media="screen" rel="stylesheet" type="text/css" />
+        #     <link href="/stylesheets/checkout.css" media="screen" rel="stylesheet" type="text/css" />
+        #
+        #   stylesheet_link_tag "shop", "cart", "checkout", :cache => "payment" # when config.perform_caching is true =>
+        #     <link href="/stylesheets/payment.css"  media="screen" rel="stylesheet" type="text/css" />
+        #
+        # The <tt>:recursive</tt> option is also available for caching:
+        #
+        #   stylesheet_link_tag :all, :cache => true, :recursive => true
+        #
+        # To force concatenation (even in development mode) set <tt>:concat</tt> to true. This is useful if
+        # you have too many stylesheets for IE to load.
+        #
+        #   stylesheet_link_tag :all, :concat => true
+        #
+        def stylesheet_link_tag(*sources)
+          @stylesheet_include ||= StylesheetIncludeTag.new(config, asset_paths)
+          @stylesheet_include.include_tag(*sources)
+        end
+
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index c1214bc44e..875ec9b77b 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -882,6 +882,8 @@ module ActionView
         # Returns the separator for a given datetime component
         def separator(type)
           case type
+            when :year
+              @options[:discard_year] ? "" : @options[:date_separator]
             when :month
               @options[:discard_month] ? "" : @options[:date_separator]
             when :day
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 80a872068d..8c300ec745 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -112,6 +112,7 @@ module ActionView
       #     <%= f.text_field :version %><br />
       #     <%= f.label :author, 'Author' %>:
       #     <%= f.text_field :author %><br />
+      #     <%= f.submit %>
       #   <% end %>
       #
       # There, +form_for+ is able to generate the rest of RESTful form
@@ -129,6 +130,7 @@ module ActionView
       #     Last name : <%= f.text_field :last_name %><br />
       #     Biography : <%= f.text_area :biography %><br />
       #     Admin?    : <%= f.check_box :admin %><br />
+      #     <%= f.submit %>
       #   <% end %>
       #
       # There, the argument is a symbol or string with the name of the
@@ -160,6 +162,7 @@ module ActionView
       #     Last name : <%= f.text_field :last_name %>
       #     Biography : <%= text_area :person, :biography %>
       #     Admin?    : <%= check_box_tag "person[admin]", @person.company.admin? %>
+      #     <%= f.submit %>
       #   <% end %>
       #
       # This also works for the methods in FormOptionHelper and DateHelper that
@@ -269,8 +272,9 @@ module ActionView
       #   <%= form_for @person, :url => { :action => "create" }, :builder => LabellingFormBuilder do |f| %>
       #     <%= f.text_field :first_name %>
       #     <%= f.text_field :last_name %>
-      #     <%= text_area :person, :biography %>
-      #     <%= check_box_tag "person[admin]", @person.company.admin? %>
+      #     <%= f.text_area :biography %>
+      #     <%= f.check_box :admin %>
+      #     <%= f.submit %>
       #   <% end %>
       #
       # In this case, if you use this:
@@ -347,6 +351,8 @@ module ActionView
       #     <%= fields_for @person.permission do |permission_fields| %>
       #       Admin?  : <%= permission_fields.check_box :admin %>
       #     <% end %>
+      #
+      #     <%= f.submit %>
       #   <% end %>
       #
       # ...or if you have an object that needs to be represented as a different
@@ -408,6 +414,7 @@ module ActionView
       #       Street  : <%= address_fields.text_field :street %>
       #       Zip code: <%= address_fields.text_field :zip_code %>
       #     <% end %>
+      #     ...
       #   <% end %>
       #
       # When address is already an association on a Person you can use
@@ -437,6 +444,7 @@ module ActionView
       #       ...
       #       Delete: <%= address_fields.check_box :_destroy %>
       #     <% end %>
+      #     ...
       #   <% end %>
       #
       # ==== One-to-many
@@ -466,6 +474,7 @@ module ActionView
       #         Name: <%= project_fields.text_field :name %>
       #       <% end %>
       #     <% end %>
+      #     ...
       #   <% end %>
       #
       # It's also possible to specify the instance to be used:
@@ -479,6 +488,7 @@ module ActionView
       #         <% end %>
       #       <% end %>
       #     <% end %>
+      #     ...
       #   <% end %>
       #
       # Or a collection to be used:
@@ -488,6 +498,7 @@ module ActionView
       #     <%= person_form.fields_for :projects, @active_projects do |project_fields| %>
       #       Name: <%= project_fields.text_field :name %>
       #     <% end %>
+      #     ...
       #   <% end %>
       #
       # When projects is already an association on Person you can use
@@ -517,6 +528,7 @@ module ActionView
       #     <%= person_form.fields_for :projects do |project_fields| %>
       #       Delete: <%= project_fields.check_box :_destroy %>
       #     <% end %>
+      #     ...
       #   <% end %>
       def fields_for(record, record_object = nil, options = nil, &block)
         capture(instantiate_builder(record, record_object, options, &block), &block)
@@ -1205,6 +1217,7 @@ module ActionView
         self.multipart = true
         @template.file_field(@object_name, method, objectify_options(options))
       end
+
       # Add the submit button for the given form. When no value is given, it checks
       # if the object is a new resource or not to create the proper label:
       #
@@ -1277,11 +1290,11 @@ module ActionView
 
           if association.respond_to?(:persisted?)
             association = [association] if @object.send(association_name).is_a?(Array)
-          elsif !association.is_a?(Array)
+          elsif !association.respond_to?(:to_ary)
             association = @object.send(association_name)
           end
 
-          if association.is_a?(Array)
+          if association.respond_to?(:to_ary)
             explicit_child_index = options[:child_index]
             output = ActiveSupport::SafeBuffer.new
             association.each do |child|
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 7c877a0f57..3d276000a1 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -9,6 +9,24 @@ module ActionView
     # and transforming strings, which can reduce the amount of inline Ruby code in
     # your views. These helper methods extend Action View making them callable
     # within your template files.
+    #
+    # ==== Sanitization
+    #
+    # Most text helpers by default sanitize the given content, but do not escape it.
+    # This means HTML tags will appear in the page but all malicious code will be removed.
+    # Let's look at some examples using the +simple_format+ method:
+    #
+    #   simple_format('<a href="http://example.com/">Example</a>')
+    #   # => "<p><a href=\"http://example.com/\">Example</a></p>"
+    #
+    #   simple_format('<a href="javascript:alert('no!')">Example</a>')
+    #   # => "<p><a>Example</a></p>"
+    #
+    # If you want to escape all content, you should invoke the +h+ method before
+    # calling the text helper.
+    #
+    #   simple_format h('<a href="http://example.com/">Example</a>')
+    #   # => "<p>&lt;a href=\"http://example.com/\"&gt;Example&lt;/a&gt;</p>"
     module TextHelper
       extend ActiveSupport::Concern
 
diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index 33dfcbb803..71cd1a788a 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -8,10 +8,10 @@ module ActionView
     config.action_view.stylesheet_expansions = {}
     config.action_view.javascript_expansions = { :defaults => ['prototype', 'effects', 'dragdrop', 'controls', 'rails'] }
 
-    initializer "action_view.cache_asset_timestamps" do |app|
+    initializer "action_view.cache_asset_ids" do |app|
       unless app.config.cache_classes
         ActiveSupport.on_load(:action_view) do
-          ActionView::Helpers::AssetTagHelper.cache_asset_timestamps = false
+          ActionView::Helpers::AssetTagHelper::AssetPaths.cache_asset_ids = false
         end
       end
     end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index c580397cad..317479ad4c 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -90,13 +90,14 @@ module ActionView
 
     def collection
       if @options.key?(:collection)
-        @options[:collection] || []
+        collection = @options[:collection]
+        collection.respond_to?(:to_ary) ? collection.to_ary : []
       end
     end
 
     def collection_from_object
       if @object.respond_to?(:to_ary)
-        @object
+        @object.to_ary
       end
     end
 
@@ -163,4 +164,4 @@ module ActionView
       [variable, variable_counter]
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index f5811a1530..7c595d1b89 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -27,6 +27,12 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
       head :ok
     end
 
+    def renew
+      env["rack.session.options"][:renew] = true
+      session[:foo] = "baz"
+      head :ok
+    end
+
     def rescue_action(e) raise end
   end
 
@@ -64,6 +70,20 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
         end
       end
     end
+
+    define_method("test_renewing_with_#{class_name}_store") do
+      with_store class_name do
+        with_test_route_set do
+          get '/set_session_value'
+          assert_response :success
+          assert cookies['_session_id']
+
+          get '/renew'
+          assert_response :success
+          assert_not_equal [], headers['Set-Cookie']
+        end
+      end
+    end
   end
 
   def test_getting_nil_session_value
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 5a210aa9ec..22ccd2e6b3 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -171,6 +171,14 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     end
   end
 
+  def test_string_constraint
+    with_routing do |set|
+      set.draw do |map|
+        match "photos", :to => 'action_pack_assertions#nothing', :constraints => {:subdomain => "admin"}
+      end
+    end
+  end
+
   def test_assert_redirect_to_named_route_failure
     with_routing do |set|
       set.draw do
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 3a8a37d967..68febf425d 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -78,7 +78,8 @@ class FilterTest < ActionController::TestCase
   end
 
   class RenderingController < ActionController::Base
-    before_filter :render_something_else
+    before_filter :before_filter_rendering
+    after_filter :unreached_after_filter
 
     def show
       @ran_action = true
@@ -86,9 +87,59 @@ class FilterTest < ActionController::TestCase
     end
 
     private
-      def render_something_else
+      def before_filter_rendering
+        @ran_filter ||= []
+        @ran_filter << "before_filter_rendering"
         render :inline => "something else"
       end
+
+      def unreached_after_filter
+        @ran_filter << "unreached_after_filter_after_render"
+      end
+  end
+
+  class RenderingForPrependAfterFilterController < RenderingController
+    prepend_after_filter :unreached_prepend_after_filter
+
+    private
+      def unreached_prepend_after_filter
+        @ran_filter << "unreached_preprend_after_filter_after_render"
+      end
+  end
+
+  class BeforeFilterRedirectionController < ActionController::Base
+    before_filter :before_filter_redirects
+    after_filter :unreached_after_filter
+
+    def show
+      @ran_action = true
+      render :inline => "ran show action"
+    end
+
+    def target_of_redirection
+      @ran_target_of_redirection = true
+      render :inline => "ran target_of_redirection action"
+    end
+
+    private
+      def before_filter_redirects
+        @ran_filter ||= []
+        @ran_filter << "before_filter_redirects"
+        redirect_to(:action => 'target_of_redirection')
+      end
+
+      def unreached_after_filter
+        @ran_filter << "unreached_after_filter_after_redirection"
+      end
+  end
+
+  class BeforeFilterRedirectionForPrependAfterFilterController < BeforeFilterRedirectionController
+    prepend_after_filter :unreached_prepend_after_filter_after_redirection
+
+    private
+      def unreached_prepend_after_filter_after_redirection
+        @ran_filter << "unreached_prepend_after_filter_after_redirection"
+      end
   end
 
   class ConditionalFilterController < ActionController::Base
@@ -625,6 +676,32 @@ class FilterTest < ActionController::TestCase
     assert !assigns["ran_action"]
   end
 
+  def test_before_filter_rendering_breaks_filtering_chain_for_after_filter
+    response = test_process(RenderingController)
+    assert_equal %w( before_filter_rendering ), assigns["ran_filter"]
+    assert !assigns["ran_action"]
+  end
+
+  def test_before_filter_redirects_breaks_filtering_chain_for_after_filter
+    response = test_process(BeforeFilterRedirectionController)
+    assert_response :redirect
+    assert_equal "http://test.host/filter_test/before_filter_redirection/target_of_redirection", redirect_to_url
+    assert_equal %w( before_filter_redirects ), assigns["ran_filter"]
+  end
+
+  def test_before_filter_rendering_breaks_filtering_chain_for_preprend_after_filter
+    response = test_process(RenderingForPrependAfterFilterController)
+    assert_equal %w( before_filter_rendering ), assigns["ran_filter"]
+    assert !assigns["ran_action"]
+  end
+
+  def test_before_filter_redirects_breaks_filtering_chain_for_preprend_after_filter
+    response = test_process(BeforeFilterRedirectionForPrependAfterFilterController)
+    assert_response :redirect
+    assert_equal "http://test.host/filter_test/before_filter_redirection_for_prepend_after_filter/target_of_redirection", redirect_to_url
+    assert_equal %w( before_filter_redirects ), assigns["ran_filter"]
+  end
+
   def test_filters_with_mixed_specialization_run_in_order
     assert_nothing_raised do
       response = test_process(MixedSpecializationController, 'bar')
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index ecfa13d4ba..ce5c899a19 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -834,6 +834,14 @@ class RouteSetTest < ActiveSupport::TestCase
     assert_equal({:controller => 'pages', :action => 'show', :id => '10'}, set.recognize_path('/page/10'))
   end
 
+  def test_route_constraints_on_request_object_with_anchors_are_valid
+    assert_nothing_raised do
+      set.draw do
+        match 'page/:id' => 'pages#show', :constraints => { :host => /^foo$/ }
+      end
+    end
+  end
+
   def test_route_constraints_with_anchor_chars_are_invalid
     assert_raise ArgumentError do
       set.draw do
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 04709e5346..4764a8c2a8 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -96,6 +96,9 @@ class RequestTest < ActiveSupport::TestCase
     request = stub_request 'HTTP_HOST' => "www.rubyonrails.co.uk"
     assert_equal "rubyonrails.co.uk", request.domain(2)
 
+    request = stub_request 'HTTP_HOST' => "www.rubyonrails.co.uk", :tld_length => 2
+    assert_equal "rubyonrails.co.uk", request.domain
+
     request = stub_request 'HTTP_HOST' => "192.168.1.200"
     assert_nil request.domain
 
diff --git a/actionpack/test/fixtures/layouts/_partial_and_yield.erb b/actionpack/test/fixtures/layouts/_partial_and_yield.erb
new file mode 100644
index 0000000000..74cc428ffa
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/_partial_and_yield.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'test/partial' %>
+<%= yield %>
diff --git a/actionpack/test/fixtures/layouts/_yield_only.erb b/actionpack/test/fixtures/layouts/_yield_only.erb
new file mode 100644
index 0000000000..37f0bddbd7
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/_yield_only.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/actionpack/test/fixtures/layouts/_yield_with_params.erb b/actionpack/test/fixtures/layouts/_yield_with_params.erb
new file mode 100644
index 0000000000..68e6557fb8
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/_yield_with_params.erb
@@ -0,0 +1 @@
+<%= yield 'Yield!' %>
diff --git a/actionpack/test/fixtures/layouts/yield_with_render_partial_inside.erb b/actionpack/test/fixtures/layouts/yield_with_render_partial_inside.erb
new file mode 100644
index 0000000000..74cc428ffa
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/yield_with_render_partial_inside.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'test/partial' %>
+<%= yield %>
diff --git a/actionpack/test/fixtures/test/_partial_with_layout.erb b/actionpack/test/fixtures/test/_partial_with_layout.erb
new file mode 100644
index 0000000000..2a50c834fe
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_layout.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'test/partial', :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } %>
+partial with layout
diff --git a/actionpack/test/fixtures/test/_partial_with_layout_block_content.erb b/actionpack/test/fixtures/test/_partial_with_layout_block_content.erb
new file mode 100644
index 0000000000..65dafd93a8
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_layout_block_content.erb
@@ -0,0 +1,4 @@
+<%= render :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } do %>
+  Content from inside layout!
+<% end %>
+partial with layout
diff --git a/actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb b/actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb
new file mode 100644
index 0000000000..444197a7d0
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb
@@ -0,0 +1,4 @@
+<%= render :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } do %>
+  <%= render 'test/partial' %>
+<% end %>
+partial with layout
diff --git a/actionpack/test/fixtures/test/_partial_with_partial.erb b/actionpack/test/fixtures/test/_partial_with_partial.erb
new file mode 100644
index 0000000000..ee0d5037b6
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_partial.erb
@@ -0,0 +1,2 @@
+<%= render 'test/partial' %>
+partial with partial
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index dba632e6df..ae0c38184d 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -184,3 +184,13 @@ module Blog
     end
   end
 end
+
+class ArelLike
+  def to_ary
+    true
+  end
+  def each
+    a = Array.new(2) { |id| Comment.new(id + 1) }
+    a.each { |i| yield i }
+  end
+end
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 3abcdfbc1e..139d832c5f 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -274,7 +274,7 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_reset_javascript_expansions
-    ActionView::Helpers::AssetTagHelper.javascript_expansions.clear
+    JavascriptIncludeTag.expansions.clear
     assert_raise(ArgumentError) { javascript_include_tag(:defaults) }
   end
 
@@ -306,7 +306,6 @@ class AssetTagHelperTest < ActionView::TestCase
     ENV["RAILS_ASSET_ID"] = ""
     assert stylesheet_link_tag('dir/file').html_safe?
     assert stylesheet_link_tag('dir/other/file', 'dir/file2').html_safe?
-    assert stylesheet_tag('dir/file', {}).html_safe?
   end
 
   def test_custom_stylesheet_expansions
@@ -727,6 +726,17 @@ class AssetTagHelperTest < ActionView::TestCase
     assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'money.js'))
   end
 
+  def test_caching_javascript_include_tag_when_caching_on_and_javascript_file_is_uri
+    ENV["RAILS_ASSET_ID"] = ""
+    config.perform_caching = true
+
+    assert_raise(Errno::ENOENT) {
+      javascript_include_tag('bank', 'robber', 'https://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.js', :cache => true)
+    }
+
+    assert !File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, 'all.js'))
+  end
+
   def test_caching_javascript_include_tag_when_caching_off_and_missing_javascript_file
     ENV["RAILS_ASSET_ID"] = ""
     config.perform_caching = false
@@ -938,7 +948,7 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     @request = Struct.new(:protocol).new("gopher://")
     @controller.request = @request
 
-    ActionView::Helpers::AssetTagHelper.javascript_expansions.clear
+    JavascriptIncludeTag.expansions.clear
   end
 
   def url_for(options)
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 0cf7885772..55c384e68f 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -1584,6 +1584,47 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, date_select("post", "written_on", { :date_separator => " / " })
   end
 
+  def test_date_select_with_separator_and_order
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = %{<select id="post_written_on_3i" name="post[written_on(3i)]">\n}
+    expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
+
+    expected << " / "
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+
+    expected << " / "
+
+    expected << %{<select id="post_written_on_1i" name="post[written_on(1i)]">\n}
+    expected << %{<option value="1999">1999</option>\n<option value="2000">2000</option>\n<option value="2001">2001</option>\n<option value="2002">2002</option>\n<option value="2003">2003</option>\n<option value="2004" selected="selected">2004</option>\n<option value="2005">2005</option>\n<option value="2006">2006</option>\n<option value="2007">2007</option>\n<option value="2008">2008</option>\n<option value="2009">2009</option>\n}
+    expected << "</select>\n"
+
+    assert_dom_equal expected, date_select("post", "written_on", { :order => [:day, :month, :year], :date_separator => " / " })
+  end
+
+  def test_date_select_with_separator_and_order_and_year_discarded
+    @post = Post.new
+    @post.written_on = Date.new(2004, 6, 15)
+
+    expected = %{<select id="post_written_on_3i" name="post[written_on(3i)]">\n}
+    expected << %{<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15" selected="selected">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n}
+    expected << "</select>\n"
+
+    expected << " / "
+
+    expected << %{<select id="post_written_on_2i" name="post[written_on(2i)]">\n}
+    expected << %{<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6" selected="selected">June</option>\n<option value="7">July</option>\n<option value="8">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n}
+    expected << "</select>\n"
+    expected << %{<input type="hidden" id="post_written_on_1i" name="post[written_on(1i)]" value="2004" />\n}
+
+    assert_dom_equal expected, date_select("post", "written_on", { :order => [:day, :month, :year], :discard_year => true, :date_separator => " / " })
+  end
+
   def test_date_select_with_default_prompt
     @post = Post.new
     @post.written_on = Date.new(2004, 6, 15)
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index acb6e7aa64..2c60096475 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1230,6 +1230,27 @@ class FormHelperTest < ActionView::TestCase
     assert_dom_equal expected, output_buffer
   end
 
+  def test_nested_fields_for_arel_like
+    @post.comments = ArelLike.new
+
+    form_for(@post) do |f|
+      concat f.text_field(:title)
+      concat f.fields_for(:comments, @post.comments) { |cf|
+        concat cf.text_field(:name)
+      }
+    end
+
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'put') do
+      '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+      '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+      '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+      '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+      '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
+    end
+
+    assert_dom_equal expected, output_buffer
+  end
+
   def test_nested_fields_for_with_existing_records_on_a_supplied_nested_attributes_collection_different_from_record_one
     comments = Array.new(2) { |id| Comment.new(id + 1) }
     @post.comments = []
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 17bb610b6a..d2bf45a63a 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -247,6 +247,51 @@ module RenderTestCases
       @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield_with_render_inline_inside")
   end
 
+  def test_render_with_layout_which_renders_another_partial
+    assert_equal %(partial html\nHello world!\n),
+      @view.render(:file => "test/hello_world.erb", :layout => "layouts/yield_with_render_partial_inside")
+  end
+
+  def test_render_layout_with_block_and_yield
+    assert_equal %(Content from block!\n),
+      @view.render(:layout => "layouts/yield_only") { "Content from block!" }
+  end
+
+  def test_render_layout_with_block_and_yield_with_params
+    assert_equal %(Yield! Content from block!\n),
+      @view.render(:layout => "layouts/yield_with_params") { |param| "#{param} Content from block!" }
+  end
+
+  def test_render_layout_with_block_which_renders_another_partial_and_yields
+    assert_equal %(partial html\nContent from block!\n),
+      @view.render(:layout => "layouts/partial_and_yield") { "Content from block!" }
+  end
+
+  def test_render_partial_and_layout_without_block_with_locals
+    assert_equal %(Before (Foo!)\npartial html\nAfter),
+      @view.render(:partial => 'test/partial', :layout => 'test/layout_for_partial', :locals => { :name => 'Foo!'})
+  end
+
+  def test_render_partial_and_layout_without_block_with_locals_and_rendering_another_partial
+    assert_equal %(Before (Foo!)\npartial html\npartial with partial\n\nAfter),
+      @view.render(:partial => 'test/partial_with_partial', :layout => 'test/layout_for_partial', :locals => { :name => 'Foo!'})
+  end
+
+  def test_render_layout_with_a_nested_render_layout_call
+    assert_equal %(Before (Foo!)\nBefore (Bar!)\npartial html\nAfter\npartial with layout\n\nAfter),
+      @view.render(:partial => 'test/partial_with_layout', :layout => 'test/layout_for_partial', :locals => { :name => 'Foo!'})
+  end
+
+  def test_render_layout_with_a_nested_render_layout_call_using_block_with_render_partial
+    assert_equal %(Before (Foo!)\nBefore (Bar!)\n\n  partial html\n\nAfterpartial with layout\n\nAfter),
+      @view.render(:partial => 'test/partial_with_layout_block_partial', :layout => 'test/layout_for_partial', :locals => { :name => 'Foo!'})
+  end
+
+  def test_render_layout_with_a_nested_render_layout_call_using_block_with_render_content
+    assert_equal %(Before (Foo!)\nBefore (Bar!)\n\n  Content from inside layout!\n\nAfterpartial with layout\n\nAfter),
+      @view.render(:partial => 'test/partial_with_layout_block_content', :layout => 'test/layout_for_partial', :locals => { :name => 'Foo!'})
+  end
+
   def test_render_with_nested_layout
     assert_equal %(<title>title</title>\n\n<div id="column">column</div>\n<div id="content">content</div>\n),
       @view.render(:file => "test/nested_layout.erb", :layout => "layouts/yield")