From 53d3bafc8bf3f0cb90a02751aa93b0c30b26ab78 Mon Sep 17 00:00:00 2001
From: Evan Petrie <epetrie@shoedazzle.com>
Date: Thu, 14 Apr 2011 12:08:18 -0700
Subject: ruby 1.9.2 and other ruby implementations may not return the same
 hash value for the same string each time. This can result in your static
 assets being served from different asset hosts, which makes browser caching
 less effective. Use md5 or some other digest method instead.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index f6b2d4f3f4..c383e4990c 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -57,7 +57,7 @@ module ActionView
     # +asset_host+ to a proc like this:
     #
     #   ActionController::Base.asset_host = Proc.new { |source|
-    #     "http://assets#{source.hash % 2 + 1}.example.com"
+    #     "http://assets#{Digest::MD5.hexdigest(source).to_i(16) % 2 + 1}.example.com"
     #   }
     #   image_tag("rails.png")
     #   # => <img alt="Rails" src="http://assets1.example.com/images/rails.png?1230601161" />
-- 
cgit v1.2.3


From c09538941fad7929955ada73cc796e918af415ca Mon Sep 17 00:00:00 2001
From: Joshua Ballanco <joshua.ballanco@patch.com>
Date: Thu, 14 Apr 2011 23:18:12 -0400
Subject: Test for stripping tags from a frozen string.

This test will pass under Ruby 1.8 but fail under Ruby 1.9 because of
the change in behavior of gsub! w.r.t. frozen strings that do not
match the pattern used [ruby-core:23664].
---
 actionpack/test/template/html-scanner/sanitizer_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/test/template/html-scanner/sanitizer_test.rb b/actionpack/test/template/html-scanner/sanitizer_test.rb
index fcc3782f04..678cb9eeeb 100644
--- a/actionpack/test/template/html-scanner/sanitizer_test.rb
+++ b/actionpack/test/template/html-scanner/sanitizer_test.rb
@@ -20,6 +20,7 @@ class SanitizerTest < ActionController::TestCase
     assert_equal "This has a  here.", sanitizer.sanitize("This has a <![CDATA[<section>]]> here.")
     assert_equal "This has an unclosed ", sanitizer.sanitize("This has an unclosed <![CDATA[<section>]] here...")
     [nil, '', '   '].each { |blank| assert_equal blank, sanitizer.sanitize(blank) }
+    assert_nothing_raised { sanitizer.sanitize("This is a frozen string with no tags".freeze) }
   end
 
   def test_strip_links
-- 
cgit v1.2.3


From 2adeaa9c90b7559387b55e7a24a7eb82671c88cc Mon Sep 17 00:00:00 2001
From: Joshua Ballanco <joshua.ballanco@patch.com>
Date: Thu, 14 Apr 2011 23:25:18 -0400
Subject: Fix for stripping tags from frozen strings.

This returns behavior under Ruby 1.9 to match Ruby 1.8.
---
 actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
index 09dd08898c..91a97c02ff 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/sanitizer.rb
@@ -33,7 +33,7 @@ module HTML
       result = super
       # strip any comments, and if they have a newline at the end (ie. line with
       # only a comment) strip that too
-      result.gsub!(/<!--(.*?)-->[\n]?/m, "") if result
+      result = result.gsub(/<!--(.*?)-->[\n]?/m, "") if (result && result =~ /<!--(.*?)-->[\n]?/m)
       # Recurse - handle all dirty nested tags
       result == text ? result : sanitize(result, options)
     end
-- 
cgit v1.2.3


From 3ca6d0e8fe72f6840049f7c2461243cf362b9896 Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 19:56:48 -0400
Subject: Including actual usage in example

---
 actionpack/lib/action_view/helpers/date_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 6cd1565031..72ee31a246 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -115,7 +115,9 @@ module ActionView
       #   time_ago_in_words(Time.now - 15.hours)      # => 15 hours
       #   time_ago_in_words(Time.now)                 # => less than a minute
       #
-      #   from_time = Time.now - 3.days - 14.minutes - 25.seconds     # => 3 days
+      #   from_time = Time.now - 3.days - 14.minutes - 25.seconds
+      #   time_ago_in_words(from_time)      # => 3 days
+      #
       def time_ago_in_words(from_time, include_seconds = false)
         distance_of_time_in_words(from_time, Time.now, include_seconds)
       end
-- 
cgit v1.2.3


From 8ac365f47626fd4d9569cf9c378c3a8f4f60eb58 Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 20:03:52 -0400
Subject: Making example result match actual result

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 72ee31a246..4c65ebc1f3 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -112,7 +112,7 @@ module ActionView
       #
       # ==== Examples
       #   time_ago_in_words(3.minutes.from_now)       # => 3 minutes
-      #   time_ago_in_words(Time.now - 15.hours)      # => 15 hours
+      #   time_ago_in_words(Time.now - 15.hours)      # => about 15 hours
       #   time_ago_in_words(Time.now)                 # => less than a minute
       #
       #   from_time = Time.now - 3.days - 14.minutes - 25.seconds
-- 
cgit v1.2.3


From 6ddd4a3d954cd81f96c747f515406be50041431a Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 20:08:11 -0400
Subject: Days are never approximated using 'about'

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 4c65ebc1f3..3c0c7c319c 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -51,7 +51,7 @@ module ActionView
       #   distance_of_time_in_words(from_time, from_time + 15.seconds)        # => less than a minute
       #   distance_of_time_in_words(from_time, from_time + 15.seconds, true)  # => less than 20 seconds
       #   distance_of_time_in_words(from_time, 3.years.from_now)              # => about 3 years
-      #   distance_of_time_in_words(from_time, from_time + 60.hours)          # => about 3 days
+      #   distance_of_time_in_words(from_time, from_time + 60.hours)          # => 3 days
       #   distance_of_time_in_words(from_time, from_time + 45.seconds, true)  # => less than a minute
       #   distance_of_time_in_words(from_time, from_time - 45.seconds, true)  # => less than a minute
       #   distance_of_time_in_words(from_time, 76.seconds.from_now)           # => 1 minute
-- 
cgit v1.2.3


From 7f98b544e3b29c7ffdb8cb4a2ad1da5d1a8c611c Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 20:18:30 -0400
Subject: Negative format example should use a negative number

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

(limited to 'actionpack')

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


From 004042c0d94f0294e691de46094a665acd852653 Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 20:27:05 -0400
Subject: Fixing missing colon on symbol in example

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index 68ebedd328..a150019e5c 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -238,7 +238,7 @@ module ActionView
       #  number_with_precision(111.2345, :precision => 1, :significant => true)     # => 100
       #  number_with_precision(13, :precision => 5, :significant => true)           # => 13.000
       #  number_with_precision(111.234, :locale => :fr)                             # => 111,234
-      #  number_with_precision(13, :precision => 5, :significant => true, strip_insignificant_zeros => true)
+      #  number_with_precision(13, :precision => 5, :significant => true, :strip_insignificant_zeros => true)
       #  # => 13
       #  number_with_precision(389.32314, :precision => 4, :significant => true)    # => 389.3
       #  number_with_precision(1111.2345, :precision => 2, :separator => ',', :delimiter => '.')
-- 
cgit v1.2.3


From e8afe4e1ea9ea4c59368bb84efde785876f25061 Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 20:30:51 -0400
Subject: Making spacing consistent

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index a150019e5c..b545031fcc 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -318,7 +318,7 @@ module ActionView
       # Non-significant zeros after the fractional separator are stripped out by default (set
       # <tt>:strip_insignificant_zeros</tt> to +false+ to change that):
       #  number_to_human_size(1234567890123, :precision => 5)        # => "1.1229 TB"
-      #  number_to_human_size(524288000, :precision=>5)              # => "500 MB"
+      #  number_to_human_size(524288000, :precision => 5)            # => "500 MB"
       def number_to_human_size(number, options = {})
         options.symbolize_keys!
 
@@ -407,7 +407,7 @@ module ActionView
       # Unsignificant zeros after the decimal separator are stripped out by default (set
       # <tt>:strip_insignificant_zeros</tt> to +false+ to change that):
       #  number_to_human(12345012345, :significant_digits => 6)       # => "12.345 Billion"
-      #  number_to_human(500000000, :precision=>5)                    # => "500 Million"
+      #  number_to_human(500000000, :precision => 5)                  # => "500 Million"
       #
       # ==== Custom Unit Quantifiers
       #
-- 
cgit v1.2.3


From f274394afbedd2097d5855f8c2d7d384b46977c3 Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 21:34:49 -0400
Subject: Fixing more spacing inconsistencies

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 3c0c7c319c..6dbd2e3e43 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -466,7 +466,7 @@ module ActionView
       #
       #   # Generates a select field for hours with a custom prompt.  Use :prompt => true for a
       #   # generic prompt.
-      #   select_hour(13, :prompt =>'Choose hour')
+      #   select_hour(13, :prompt => 'Choose hour')
       #
       def select_hour(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_hour
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index de75488e72..051d3eb049 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -555,10 +555,10 @@ module ActionView
       #   current_page?(:controller => 'shop', :action => 'checkout')
       #   # => true
       #
-      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page=>'1')
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page => '1')
       #   # => true
       #
-      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page=>'2')
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page => '2')
       #   # => false
       #
       #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc')
-- 
cgit v1.2.3


From b6bfcc9115df00620e155a84f80d46342c1fe7ee Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 21:50:29 -0400
Subject: Fix syntax error in example

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index bdda1df437..d1c505d2b5 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -19,7 +19,7 @@ module ActionView
     #   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>')
+    #   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
-- 
cgit v1.2.3


From 1229904602b8c3b354a144ce33468be408cf9cec Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 21:56:01 -0400
Subject: Removing incorrect example results

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index d1c505d2b5..06e2b027da 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -295,11 +295,11 @@ module ActionView
       # +link+ as its optional second parameter and the +html_options+ hash
       # as its optional third parameter:
       #   post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com."
-      #   auto_link(post_body, :urls)     # => Once upon\na time
+      #   auto_link(post_body, :urls)
       #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\">http://www.myblog.com</a>.
       #         Please e-mail me at me@email.com."
       #
-      #   auto_link(post_body, :all, :target => "_blank")     # => Once upon\na time
+      #   auto_link(post_body, :all, :target => "_blank")
       #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.myblog.com</a>.
       #         Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
       def auto_link(text, *args, &block)#link = :all, html = {}, &block)
-- 
cgit v1.2.3


From 50b2eb8cbd6cb923026b8fbb98482e06cdbd21ce Mon Sep 17 00:00:00 2001
From: Matt Duncan <mrduncan@gmail.com>
Date: Fri, 15 Apr 2011 22:09:23 -0400
Subject: Fixing another example result

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/sanitize_helper.rb b/actionpack/lib/action_view/helpers/sanitize_helper.rb
index 0fee34f8a4..841be0a567 100644
--- a/actionpack/lib/action_view/helpers/sanitize_helper.rb
+++ b/actionpack/lib/action_view/helpers/sanitize_helper.rb
@@ -94,7 +94,7 @@ module ActionView
       #   # => Please e-mail me at me@email.com.
       #
       #   strip_links('Blog: <a href="http://www.myblog.com/" class="nav" target=\"_blank\">Visit</a>.')
-      #   # => Blog: Visit
+      #   # => Blog: Visit.
       def strip_links(html)
         self.class.link_sanitizer.sanitize(html)
       end
-- 
cgit v1.2.3


From 3dc4d543f177e57cb08ac8fd16a5fff6f635822f Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 15 Apr 2011 14:34:14 -0700
Subject: make our constructor signature match the superclass

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 585bd5e5ab..0133b2ecbc 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -131,7 +131,7 @@ module ActionController
     attr_internal :headers, :response, :request
     delegate :session, :to => "@_request"
 
-    def initialize(*)
+    def initialize
       @_headers = {"Content-Type" => "text/html"}
       @_status = 200
       @_request = nil
-- 
cgit v1.2.3


From 4f044528c0373b0a581a12b1311a7a544ded6c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Apr 2011 08:12:51 +0200
Subject: Slightly reorganize rendering stack.

---
 actionpack/lib/abstract_controller/rendering.rb    | 31 +++++++++++++++++-----
 .../lib/action_controller/metal/renderers.rb       |  6 ++---
 2 files changed, 28 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 66f6d0eebb..d0dd730b06 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -105,16 +105,22 @@ module AbstractController
     # Normalize arguments, options and then delegates render_to_body and
     # sticks the result in self.response_body.
     def render(*args, &block)
-      self.response_body = render_to_string(*args, &block)
+      options = _normalize_render(*args, &block)
+      self.response_body = render_to_body(options)
     end
 
     # Raw rendering of a template to a string. Just convert the results of
-    # render_to_body into a String.
+    # render_response into a String.
     # :api: plugin
     def render_to_string(*args, &block)
-      options = _normalize_args(*args, &block)
-      _normalize_options(options)
-      render_to_body(options).tap { self.response_body = nil }
+      options = _normalize_render(*args, &block)
+      if self.response_body = render_to_body(options)
+        string = ""
+        response_body.each { |r| string << r }
+        string
+      end
+    ensure
+      self.response_body = nil
     end
 
     # Raw rendering of a template to a Rack-compatible body.
@@ -151,8 +157,17 @@ module AbstractController
       hash
     end
 
-    # Normalize options by converting render "foo" to render :action => "foo" and
+    # Normalize args and options.
+    # :api: private
+    def _normalize_render(*args, &block)
+      options = _normalize_args(*args, &block)
+      _normalize_options(options)
+      options
+    end
+
+    # Normalize args by converting render "foo" to render :action => "foo" and
     # render "foo/bar" to render :file => "foo/bar".
+    # :api: plugin
     def _normalize_args(action=nil, options={})
       case action
       when NilClass
@@ -169,6 +184,8 @@ module AbstractController
       options
     end
 
+    # Normalize options.
+    # :api: plugin
     def _normalize_options(options)
       if options[:partial] == true
         options[:partial] = action_name
@@ -182,6 +199,8 @@ module AbstractController
       options
     end
 
+    # Process extra options.
+    # :api: plugin
     def _process_options(options)
     end
   end
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index dfda6618e7..0ad9dbeda9 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -95,17 +95,17 @@ module ActionController
       json = json.to_json(options) unless json.kind_of?(String)
       json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
       self.content_type ||= Mime::JSON
-      self.response_body  = json
+      json
     end
 
     add :js do |js, options|
       self.content_type ||= Mime::JS
-      self.response_body  = js.respond_to?(:to_js) ? js.to_js(options) : js
+      js.respond_to?(:to_js) ? js.to_js(options) : js
     end
 
     add :xml do |xml, options|
       self.content_type ||= Mime::XML
-      self.response_body  = xml.respond_to?(:to_xml) ? xml.to_xml(options) : xml
+      xml.respond_to?(:to_xml) ? xml.to_xml(options) : xml
     end
   end
 end
-- 
cgit v1.2.3


From 944b4d57960569d5c9a08783044677721a6de4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Apr 2011 08:13:28 +0200
Subject: Add missing dependency.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 16d48e4677..f10287afb4 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -6,6 +6,8 @@ module ActionController #:nodoc:
   module MimeResponds
     extend ActiveSupport::Concern
 
+    include ActionController::ImplicitRender
+
     included do
       class_attribute :responder, :mimes_for_respond_to
       self.responder = ActionController::Responder
-- 
cgit v1.2.3


From 7a152ab0127877eea6f2cef8ff6d1975a3fc16d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Apr 2011 08:17:47 +0200
Subject: Rename it to DataStreaming.

---
 actionpack/lib/action_controller.rb                |   2 +-
 actionpack/lib/action_controller/base.rb           |   2 +-
 .../lib/action_controller/metal/data_streaming.rb  | 145 +++++++++++++++++++++
 .../lib/action_controller/metal/streaming.rb       | 145 ---------------------
 4 files changed, 147 insertions(+), 147 deletions(-)
 create mode 100644 actionpack/lib/action_controller/metal/data_streaming.rb
 delete mode 100644 actionpack/lib/action_controller/metal/streaming.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 62cc18b253..26e6ac770f 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -13,6 +13,7 @@ module ActionController
     autoload :Compatibility
     autoload :ConditionalGet
     autoload :Cookies
+    autoload :DataStreaming
     autoload :Flash
     autoload :ForceSSL
     autoload :Head
@@ -30,7 +31,6 @@ module ActionController
     autoload :Rescue
     autoload :Responder
     autoload :SessionManagement
-    autoload :Streaming
     autoload :Testing
     autoload :UrlFor
   end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 5f9e082cd3..53e0a4b9d1 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -199,7 +199,7 @@ module ActionController
       Flash,
       RequestForgeryProtection,
       ForceSSL,
-      Streaming,
+      DataStreaming,
       RecordIdentifier,
       HttpAuthentication::Basic::ControllerMethods,
       HttpAuthentication::Digest::ControllerMethods,
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
new file mode 100644
index 0000000000..997bc6e958
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -0,0 +1,145 @@
+require 'active_support/core_ext/file/path'
+
+module ActionController #:nodoc:
+  # Methods for sending arbitrary data and for streaming files to the browser,
+  # instead of rendering.
+  module DataStreaming
+    extend ActiveSupport::Concern
+
+    include ActionController::Rendering
+
+    DEFAULT_SEND_FILE_OPTIONS = {
+      :type         => 'application/octet-stream'.freeze,
+      :disposition  => 'attachment'.freeze,
+    }.freeze
+
+    protected
+      # Sends the file. This uses a server-appropriate method (such as X-Sendfile)
+      # via the Rack::Sendfile middleware. The header to use is set via
+      # config.action_dispatch.x_sendfile_header, and defaults to "X-Sendfile".
+      # Your server can also configure this for you by setting the X-Sendfile-Type header.
+      #
+      # Be careful to sanitize the path parameter if it is coming from a web
+      # page. <tt>send_file(params[:path])</tt> allows a malicious user to
+      # download any file on your server.
+      #
+      # Options:
+      # * <tt>:filename</tt> - suggests a filename for the browser to use.
+      #   Defaults to <tt>File.basename(path)</tt>.
+      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
+      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
+      # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
+      #   Valid values are 'inline' and 'attachment' (default).
+      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
+      # * <tt>:url_based_filename</tt> - set to +true+ if you want the browser guess the filename from
+      #   the URL, which is necessary for i18n filenames on certain browsers
+      #   (setting <tt>:filename</tt> overrides this option).
+      #
+      # The default Content-Type and Content-Disposition headers are
+      # set to download arbitrary binary files in as many browsers as
+      # possible.  IE versions 4, 5, 5.5, and 6 are all known to have
+      # a variety of quirks (especially when downloading over SSL).
+      #
+      # Simple download:
+      #
+      #   send_file '/path/to.zip'
+      #
+      # Show a JPEG in the browser:
+      #
+      #   send_file '/path/to.jpeg', :type => 'image/jpeg', :disposition => 'inline'
+      #
+      # Show a 404 page in the browser:
+      #
+      #   send_file '/path/to/404.html', :type => 'text/html; charset=utf-8', :status => 404
+      #
+      # Read about the other Content-* HTTP headers if you'd like to
+      # provide the user with more information (such as Content-Description) in
+      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11.
+      #
+      # Also be aware that the document may be cached by proxies and browsers.
+      # The Pragma and Cache-Control headers declare how the file may be cached
+      # by intermediaries.  They default to require clients to validate with
+      # the server before releasing cached responses.  See
+      # http://www.mnot.net/cache_docs/ for an overview of web caching and
+      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+      # for the Cache-Control header spec.
+      def send_file(path, options = {}) #:doc:
+        raise MissingFile, "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
+
+        options[:filename] ||= File.basename(path) unless options[:url_based_filename]
+        send_file_headers! options
+
+        self.status = options[:status] || 200
+        self.content_type = options[:content_type] if options.key?(:content_type)
+        self.response_body = File.open(path, "rb")
+      end
+
+      # Sends the given binary data to the browser. This method is similar to
+      # <tt>render :text => data</tt>, but also allows you to specify whether
+      # the browser should display the response as a file attachment (i.e. in a
+      # download dialog) or as inline data. You may also set the content type,
+      # the apparent file name, and other things.
+      #
+      # Options:
+      # * <tt>:filename</tt> - suggests a filename for the browser to use.
+      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
+      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
+      # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
+      #   Valid values are 'inline' and 'attachment' (default).
+      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
+      #
+      # Generic data download:
+      #
+      #   send_data buffer
+      #
+      # Download a dynamically-generated tarball:
+      #
+      #   send_data generate_tgz('dir'), :filename => 'dir.tgz'
+      #
+      # Display an image Active Record in the browser:
+      #
+      #   send_data image.data, :type => image.content_type, :disposition => 'inline'
+      #
+      # See +send_file+ for more information on HTTP Content-* headers and caching.
+      def send_data(data, options = {}) #:doc:
+        send_file_headers! options.dup
+        render options.slice(:status, :content_type).merge(:text => data)
+      end
+
+    private
+      def send_file_headers!(options)
+        options.update(DEFAULT_SEND_FILE_OPTIONS.merge(options))
+        [:type, :disposition].each do |arg|
+          raise ArgumentError, ":#{arg} option required" if options[arg].nil?
+        end
+
+        disposition = options[:disposition]
+        disposition += %(; filename="#{options[:filename]}") if options[:filename]
+
+        content_type = options[:type]
+
+        if content_type.is_a?(Symbol)
+          extension = Mime[content_type]
+          raise ArgumentError, "Unknown MIME type #{options[:type]}" unless extension
+          self.content_type = extension
+        else
+          self.content_type = content_type
+        end
+
+        headers.merge!(
+          'Content-Disposition'       => disposition,
+          'Content-Transfer-Encoding' => 'binary'
+        )
+
+        response.sending_file = true
+
+        # Fix a problem with IE 6.0 on opening downloaded files:
+        # If Cache-Control: no-cache is set (which Rails does by default),
+        # IE removes the file it just downloaded from its cache immediately
+        # after it displays the "open/save" dialog, which means that if you
+        # hit "open" the file isn't there anymore when the application that
+        # is called for handling the download is run, so let's workaround that
+        response.cache_control[:public] ||= false
+      end
+  end
+end
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
deleted file mode 100644
index 312dc8eb3e..0000000000
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-require 'active_support/core_ext/file/path'
-
-module ActionController #:nodoc:
-  # Methods for sending arbitrary data and for streaming files to the browser,
-  # instead of rendering.
-  module Streaming
-    extend ActiveSupport::Concern
-
-    include ActionController::Rendering
-
-    DEFAULT_SEND_FILE_OPTIONS = {
-      :type         => 'application/octet-stream'.freeze,
-      :disposition  => 'attachment'.freeze,
-    }.freeze
-
-    protected
-      # Sends the file. This uses a server-appropriate method (such as X-Sendfile)
-      # via the Rack::Sendfile middleware. The header to use is set via
-      # config.action_dispatch.x_sendfile_header, and defaults to "X-Sendfile".
-      # Your server can also configure this for you by setting the X-Sendfile-Type header.
-      #
-      # Be careful to sanitize the path parameter if it is coming from a web
-      # page. <tt>send_file(params[:path])</tt> allows a malicious user to
-      # download any file on your server.
-      #
-      # Options:
-      # * <tt>:filename</tt> - suggests a filename for the browser to use.
-      #   Defaults to <tt>File.basename(path)</tt>.
-      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
-      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
-      # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
-      #   Valid values are 'inline' and 'attachment' (default).
-      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
-      # * <tt>:url_based_filename</tt> - set to +true+ if you want the browser guess the filename from
-      #   the URL, which is necessary for i18n filenames on certain browsers
-      #   (setting <tt>:filename</tt> overrides this option).
-      #
-      # The default Content-Type and Content-Disposition headers are
-      # set to download arbitrary binary files in as many browsers as
-      # possible.  IE versions 4, 5, 5.5, and 6 are all known to have
-      # a variety of quirks (especially when downloading over SSL).
-      #
-      # Simple download:
-      #
-      #   send_file '/path/to.zip'
-      #
-      # Show a JPEG in the browser:
-      #
-      #   send_file '/path/to.jpeg', :type => 'image/jpeg', :disposition => 'inline'
-      #
-      # Show a 404 page in the browser:
-      #
-      #   send_file '/path/to/404.html', :type => 'text/html; charset=utf-8', :status => 404
-      #
-      # Read about the other Content-* HTTP headers if you'd like to
-      # provide the user with more information (such as Content-Description) in
-      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.11.
-      #
-      # Also be aware that the document may be cached by proxies and browsers.
-      # The Pragma and Cache-Control headers declare how the file may be cached
-      # by intermediaries.  They default to require clients to validate with
-      # the server before releasing cached responses.  See
-      # http://www.mnot.net/cache_docs/ for an overview of web caching and
-      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
-      # for the Cache-Control header spec.
-      def send_file(path, options = {}) #:doc:
-        raise MissingFile, "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
-
-        options[:filename] ||= File.basename(path) unless options[:url_based_filename]
-        send_file_headers! options
-
-        self.status = options[:status] || 200
-        self.content_type = options[:content_type] if options.key?(:content_type)
-        self.response_body = File.open(path, "rb")
-      end
-
-      # Sends the given binary data to the browser. This method is similar to
-      # <tt>render :text => data</tt>, but also allows you to specify whether
-      # the browser should display the response as a file attachment (i.e. in a
-      # download dialog) or as inline data. You may also set the content type,
-      # the apparent file name, and other things.
-      #
-      # Options:
-      # * <tt>:filename</tt> - suggests a filename for the browser to use.
-      # * <tt>:type</tt> - specifies an HTTP content type. Defaults to 'application/octet-stream'. You can specify
-      #   either a string or a symbol for a registered type register with <tt>Mime::Type.register</tt>, for example :json
-      # * <tt>:disposition</tt> - specifies whether the file will be shown inline or downloaded.
-      #   Valid values are 'inline' and 'attachment' (default).
-      # * <tt>:status</tt> - specifies the status code to send with the response. Defaults to '200 OK'.
-      #
-      # Generic data download:
-      #
-      #   send_data buffer
-      #
-      # Download a dynamically-generated tarball:
-      #
-      #   send_data generate_tgz('dir'), :filename => 'dir.tgz'
-      #
-      # Display an image Active Record in the browser:
-      #
-      #   send_data image.data, :type => image.content_type, :disposition => 'inline'
-      #
-      # See +send_file+ for more information on HTTP Content-* headers and caching.
-      def send_data(data, options = {}) #:doc:
-        send_file_headers! options.dup
-        render options.slice(:status, :content_type).merge(:text => data)
-      end
-
-    private
-      def send_file_headers!(options)
-        options.update(DEFAULT_SEND_FILE_OPTIONS.merge(options))
-        [:type, :disposition].each do |arg|
-          raise ArgumentError, ":#{arg} option required" if options[arg].nil?
-        end
-
-        disposition = options[:disposition]
-        disposition += %(; filename="#{options[:filename]}") if options[:filename]
-
-        content_type = options[:type]
-
-        if content_type.is_a?(Symbol)
-          extension = Mime[content_type]
-          raise ArgumentError, "Unknown MIME type #{options[:type]}" unless extension
-          self.content_type = extension
-        else
-          self.content_type = content_type
-        end
-
-        headers.merge!(
-          'Content-Disposition'       => disposition,
-          'Content-Transfer-Encoding' => 'binary'
-        )
-
-        response.sending_file = true
-
-        # Fix a problem with IE 6.0 on opening downloaded files:
-        # If Cache-Control: no-cache is set (which Rails does by default),
-        # IE removes the file it just downloaded from its cache immediately
-        # after it displays the "open/save" dialog, which means that if you
-        # hit "open" the file isn't there anymore when the application that
-        # is called for handling the download is run, so let's workaround that
-        response.cache_control[:public] ||= false
-      end
-  end
-end
-- 
cgit v1.2.3


From 389d15ef139e50696b274f2d61dd309ba2632877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Apr 2011 08:52:29 +0200
Subject: Body... wanna *stream* my body? Body... such a thrill my body!

Added stream as class level method to make it explicit when to stream.
Render also accepts :stream as option.
---
 actionpack/lib/action_controller.rb                |  1 +
 actionpack/lib/action_controller/base.rb           |  1 +
 .../lib/action_controller/metal/streaming.rb       | 57 ++++++++++++++++++++
 actionpack/lib/action_view/context.rb              |  1 +
 .../controller/new_base/render_streaming_test.rb   | 62 ++++++++++++++++++++++
 5 files changed, 122 insertions(+)
 create mode 100644 actionpack/lib/action_controller/metal/streaming.rb
 create mode 100644 actionpack/test/controller/new_base/render_streaming_test.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 26e6ac770f..aab2b9dc25 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,6 +31,7 @@ module ActionController
     autoload :Rescue
     autoload :Responder
     autoload :SessionManagement
+    autoload :Streaming
     autoload :Testing
     autoload :UrlFor
   end
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 53e0a4b9d1..ca0dccf575 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -199,6 +199,7 @@ module ActionController
       Flash,
       RequestForgeryProtection,
       ForceSSL,
+      Streaming,
       DataStreaming,
       RecordIdentifier,
       HttpAuthentication::Basic::ControllerMethods,
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
new file mode 100644
index 0000000000..adb3e94134
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -0,0 +1,57 @@
+require 'active_support/core_ext/file/path'
+require 'rack/chunked'
+
+module ActionController #:nodoc:
+  # Methods for sending streaming templates back to the client.
+  module Streaming
+    extend ActiveSupport::Concern
+
+    include AbstractController::Rendering
+    attr_internal :stream
+
+    module ClassMethods
+      # Render streaming templates. It accepts :only, :except, :if and :unless as options
+      # to specify when to stream, as in ActionController filters.
+      def stream(options={})
+        if defined?(Fiber)
+          before_filter :_stream_filter, options
+        else
+          raise "You cannot use streaming if Fiber is not available."
+        end
+      end
+    end
+
+    protected
+
+    # Mark following render calls as streaming.
+    def _stream_filter #:nodoc:
+      self.stream = true
+    end
+
+    # Consider the stream option when normalazing options.
+    def _normalize_options(options) #:nodoc:
+      super
+      options[:stream] = self.stream unless options.key?(:stream)
+    end
+
+    # Set proper cache control and transfer encoding when streaming
+    def _process_options(options) #:nodoc:
+      super
+      if options[:stream]
+        headers["Cache-Control"] ||= "no-cache"
+        headers["Transfer-Encoding"] = "chunked"
+        headers.delete("Content-Length")
+      end
+    end
+
+    # Call render_to_body if we are streaming instead of usual +render+.
+    def _render_template(options) #:nodoc:
+      if options.delete(:stream)
+        Rack::Chunked::Body.new view_context.render_body(options)
+      else
+        super
+      end
+    end
+  end
+end
+      
\ No newline at end of file
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index 39d88333e8..a2a64de206 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -2,6 +2,7 @@ module ActionView
   module CompiledTemplates #:nodoc:
     # holds compiled template code
   end
+
   # = Action View Context
   #
   # Action View contexts are supplied to Action Controller to render template.
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
new file mode 100644
index 0000000000..27ba4b1a29
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -0,0 +1,62 @@
+require 'abstract_unit'
+
+module RenderStreaming
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_streaming/basic/hello_world.html.erb" => "Hello world",
+      "layouts/application.html.erb" => "<%= yield %>, I'm here!"
+    )]
+
+    layout "application"
+    stream :only => :hello_world
+
+    def hello_world
+    end
+
+    def explicit
+      render :action => "hello_world", :stream => true
+    end
+
+    def no_layout
+      render :action => "hello_world", :stream => true, :layout => false
+    end
+
+    def explicit_cache
+      headers["Cache-Control"] = "private"
+      render :action => "hello_world", :stream => true
+    end
+  end
+
+  class StreamingTest < Rack::TestCase
+    test "rendering with streaming enabled at the class level" do
+      get "/render_streaming/basic/hello_world"
+      assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with streaming given to render" do
+      get "/render_streaming/basic/explicit"
+      assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with streaming do not override explicit cache control given to render" do
+      get "/render_streaming/basic/explicit_cache"
+      assert_body "b\r\nHello world\r\nb\r\n, I'm here!\r\n0\r\n\r\n"
+      assert_streaming! "private"
+    end
+
+    test "rendering with streaming no layout" do
+      get "/render_streaming/basic/no_layout"
+      assert_body "b\r\nHello world\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    def assert_streaming!(cache="no-cache")
+      assert_status 200
+      assert_equal nil, headers["Content-Length"]
+      assert_equal "chunked", headers["Transfer-Encoding"]
+      assert_equal cache, headers["Cache-Control"]
+    end
+  end if defined?(Fiber)
+end
-- 
cgit v1.2.3


From 07fde1a3d36d0622d5fa9c040bfca70db675926a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Apr 2011 14:25:51 +0200
Subject: Just define the controller if fibers are defined.

---
 actionpack/test/controller/new_base/render_streaming_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index 27ba4b1a29..dbd6c66d1f 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -58,5 +58,5 @@ module RenderStreaming
       assert_equal "chunked", headers["Transfer-Encoding"]
       assert_equal cache, headers["Cache-Control"]
     end
-  end if defined?(Fiber)
-end
+  end
+end if defined?(Fiber)
-- 
cgit v1.2.3


From 3b0f917b1dfabce6a6b338e4a7cb02995c055596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 18 Apr 2011 14:27:30 +0200
Subject: Test explicit skip.

---
 actionpack/test/controller/new_base/render_streaming_test.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index dbd6c66d1f..ffc4b331ec 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -8,11 +8,15 @@ module RenderStreaming
     )]
 
     layout "application"
-    stream :only => :hello_world
+    stream :only => [:hello_world, :skip]
 
     def hello_world
     end
 
+    def skip
+      render :action => "hello_world", :stream => false
+    end
+
     def explicit
       render :action => "hello_world", :stream => true
     end
@@ -52,6 +56,11 @@ module RenderStreaming
       assert_streaming!
     end
 
+    test "skip rendering with streaming at render level" do
+      get "/render_streaming/basic/skip"
+      assert_body "Hello world, I'm here!"
+    end
+
     def assert_streaming!(cache="no-cache")
       assert_status 200
       assert_equal nil, headers["Content-Length"]
-- 
cgit v1.2.3


From 6380f1a9f45e68f38480c0805cac62eb6708f72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 10:34:17 +0200
Subject: Be sure to not store the closed flash in the session.

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 41 +++++++++++++---------
 actionpack/test/controller/flash_test.rb           |  9 ++++-
 2 files changed, 33 insertions(+), 17 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 027ff7f8ac..414405cc9e 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -4,7 +4,7 @@ module ActionDispatch
     # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
     # to put a new one.
     def flash
-      @env['action_dispatch.request.flash_hash'] ||= (session["flash"] || Flash::FlashHash.new)
+      @env[Flash::KEY] ||= (session["flash"] || Flash::FlashHash.new)
     end
   end
 
@@ -40,18 +40,14 @@ module ActionDispatch
   #
   # See docs on the FlashHash class for more details about the flash.
   class Flash
+    KEY = 'action_dispatch.request.flash_hash'.freeze
+
     class FlashNow #:nodoc:
       def initialize(flash)
         @flash = flash
-        @closed = false
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
-
       def []=(k, v)
-        raise ClosedError, :flash if closed?
         @flash[k] = v
         @flash.discard(k)
         v
@@ -70,6 +66,10 @@ module ActionDispatch
       def notice=(message)
         self[:notice] = message
       end
+
+      def close!(new_flash)
+        @flash = new_flash
+      end
     end
 
     class FlashHash
@@ -81,10 +81,6 @@ module ActionDispatch
         @flashes = {}
       end
 
-      attr_reader :closed
-      alias :closed? :closed
-      def close!; @closed = true end
-
       def []=(k, v) #:nodoc:
         raise ClosedError, :flash if closed?
         keep(k)
@@ -152,6 +148,14 @@ module ActionDispatch
         @now ||= FlashNow.new(self)
       end
 
+      attr_reader :closed
+      alias :closed? :closed
+
+      def close!
+        @closed = true
+        @now.close!(self) if @now
+      end
+
       # Keeps either the entire current flash or a specific flash entry available for the next action:
       #
       #    flash.keep            # keeps the entire flash
@@ -231,13 +235,18 @@ module ActionDispatch
       @app.call(env)
     ensure
       session    = env['rack.session'] || {}
-      flash_hash = env['action_dispatch.request.flash_hash']
+      flash_hash = env[KEY]
 
       if flash_hash
-       if !flash_hash.empty? || session.key?('flash')
-        session["flash"] = flash_hash
-       end
-       flash_hash.close!
+        if !flash_hash.empty? || session.key?('flash')
+          session["flash"] = flash_hash
+          new_hash = flash_hash.dup
+        else
+          new_hash = flash_hash
+        end
+
+        env[KEY] = new_hash
+        new_hash.close!
       end
 
       if session.key?('flash') && session['flash'].empty?
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 9c89f1334d..7b5bf8b21a 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -264,6 +264,14 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_setting_flash_does_not_raise_in_following_requests
+    with_test_route_set do
+      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
+      get '/set_flash', nil, env
+      get '/set_flash', nil, env
+    end
+  end
+
   def test_setting_flash_raises_after_stream_back_to_client_even_with_an_empty_flash
     with_test_route_set do
       env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
@@ -294,7 +302,6 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-
   private
 
     # Overwrite get to send SessionSecret in env hash
-- 
cgit v1.2.3


From a66c91723565d37969de4cb46baa50fb8865b02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 11:54:12 +0200
Subject: Do not inherit from Rack::Response, remove a shit-ton of unused code.

---
 actionpack/lib/abstract_controller/rendering.rb    |   8 +-
 .../lib/action_controller/metal/rendering.rb       |  11 +++
 actionpack/lib/action_dispatch/http/response.rb    | 101 ++++++++++-----------
 actionpack/lib/action_dispatch/middleware/flash.rb |   1 +
 actionpack/test/dispatch/response_test.rb          |  16 ----
 5 files changed, 61 insertions(+), 76 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index d0dd730b06..306bd41e2d 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -114,13 +114,7 @@ module AbstractController
     # :api: plugin
     def render_to_string(*args, &block)
       options = _normalize_render(*args, &block)
-      if self.response_body = render_to_body(options)
-        string = ""
-        response_body.each { |r| string << r }
-        string
-      end
-    ensure
-      self.response_body = nil
+      render_to_body(options)
     end
 
     # Raw rendering of a template to a Rack-compatible body.
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 32d52c84c4..70fd79bb8b 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -18,6 +18,17 @@ module ActionController
       response_body
     end
 
+    # Overwrite render_to_string because body can now be set to a rack body.
+    def render_to_string(*)
+      if self.response_body = super
+        string = ""
+        response_body.each { |r| string << r }
+        string
+      end
+    ensure
+      self.response_body = nil
+    end
+
     private
 
     # Normalize arguments by catching blocks and setting them on :update.
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 8e03a7879f..78ecf177be 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -32,24 +32,35 @@ module ActionDispatch # :nodoc:
   #      puts @response.body
   #    end
   #  end
-  class Response < Rack::Response
-    attr_accessor :request, :blank
+  class Response
+    attr_accessor :request, :header, :status
+    attr_writer :sending_file
 
-    attr_writer :header, :sending_file
     alias_method :headers=, :header=
+    alias_method :headers,  :header
+
+    delegate :[], :[]=, :to => :@header
+    delegate :each, :to => :@body
+
+    # Sets the HTTP response's content MIME type. For example, in the controller
+    # you could write this:
+    #
+    #  response.content_type = "text/plain"
+    #
+    # If a character set has been defined for this response (see charset=) then
+    # the character set information will also be included in the content type
+    # information.
+    attr_accessor :charset, :content_type
+
+    CONTENT_TYPE = "Content-Type"
+
+    cattr_accessor(:default_charset) { "utf-8" }
 
     module Setup
       def initialize(status = 200, header = {}, body = [])
-        @writer = lambda { |x| @body << x }
-        @block = nil
-        @length = 0
-
-        @header = header
-        self.body, self.status = body, status
+        self.body, self.header, self.status = body, header, status
 
-        @cookie = []
         @sending_file = false
-
         @blank = false
 
         if content_type = self["Content-Type"]
@@ -62,6 +73,7 @@ module ActionDispatch # :nodoc:
       end
     end
 
+    include Rack::Response::Helpers
     include Setup
     include ActionDispatch::Http::Cache::Response
 
@@ -106,13 +118,21 @@ module ActionDispatch # :nodoc:
 
     def body=(body)
       @blank = true if body == EMPTY
-      @body = body.respond_to?(:to_str) ? [body] : body
+      @body = body.respond_to?(:each) ? body : [body]
     end
 
     def body_parts
       @body
     end
 
+    def set_cookie(key, value)
+      ::Rack::Utils.set_cookie_header!(header, key, value)
+    end
+
+    def delete_cookie(key, value={})
+      ::Rack::Utils.delete_cookie_header!(header, key, value)
+    end
+
     def location
       headers['Location']
     end
@@ -122,46 +142,21 @@ module ActionDispatch # :nodoc:
       headers['Location'] = url
     end
 
-    # Sets the HTTP response's content MIME type. For example, in the controller
-    # you could write this:
-    #
-    #  response.content_type = "text/plain"
-    #
-    # If a character set has been defined for this response (see charset=) then
-    # the character set information will also be included in the content type
-    # information.
-    attr_accessor :charset, :content_type
-
-    CONTENT_TYPE = "Content-Type"
-
-    cattr_accessor(:default_charset) { "utf-8" }
-
     def to_a
       assign_default_content_type_and_charset!
       handle_conditional_get!
-      self["Set-Cookie"] = self["Set-Cookie"].join("\n") if self["Set-Cookie"].respond_to?(:join)
-      super
-    end
 
-    alias prepare! to_a
+      @header["Set-Cookie"] = @header["Set-Cookie"].join("\n") if @header["Set-Cookie"].respond_to?(:join)
 
-    def each(&callback)
-      if @body.respond_to?(:call)
-        @writer = lambda { |x| callback.call(x) }
-        @body.call(self, self)
+      if [204, 304].include?(@status)
+        @header.delete "Content-Type"
+        [@status, @header, []]
       else
-        @body.each { |part| callback.call(part.to_s) }
+        [@status, @header, self]
       end
-
-      @writer = callback
-      @block.call(self) if @block
-    end
-
-    def write(str)
-      str = str.to_s
-      @writer.call str
-      str
     end
+    alias prepare! to_a
+    alias to_ary   to_a # For implicit splat on 1.9.2
 
     # Returns the response cookies, converted to a Hash of (name => value) pairs
     #
@@ -180,18 +175,18 @@ module ActionDispatch # :nodoc:
       cookies
     end
 
-    private
-      def assign_default_content_type_and_charset!
-        return if headers[CONTENT_TYPE].present?
+  private
 
-        @content_type ||= Mime::HTML
-        @charset      ||= self.class.default_charset
+    def assign_default_content_type_and_charset!
+      return if headers[CONTENT_TYPE].present?
 
-        type = @content_type.to_s.dup
-        type << "; charset=#{@charset}" unless @sending_file
+      @content_type ||= Mime::HTML
+      @charset      ||= self.class.default_charset
 
-        headers[CONTENT_TYPE] = type
-      end
+      type = @content_type.to_s.dup
+      type << "; charset=#{@charset}" unless @sending_file
 
+      headers[CONTENT_TYPE] = type
+    end
   end
 end
diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 414405cc9e..735c72d34a 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -79,6 +79,7 @@ module ActionDispatch
         @used    = Set.new
         @closed  = false
         @flashes = {}
+        @now     = nil
       end
 
       def []=(k, v) #:nodoc:
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 6f38714b2e..5abbaf74fe 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -33,22 +33,6 @@ class ResponseTest < ActiveSupport::TestCase
     }, headers)
   end
 
-  test "streaming block" do
-    @response.body = Proc.new do |response, output|
-      5.times { |n| output.write(n) }
-    end
-
-    status, headers, body = @response.to_a
-    assert_equal 200, status
-    assert_equal({
-      "Content-Type" => "text/html; charset=utf-8"
-    }, headers)
-
-    parts = []
-    body.each { |part| parts << part.to_s }
-    assert_equal ["0", "1", "2", "3", "4"], parts
-  end
-
   test "content type" do
     [204, 304].each do |c|
       @response.status = c.to_s
-- 
cgit v1.2.3


From b398520c1406824efd12df6bb57996aa9781f876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 12:25:01 +0200
Subject: Output a redirect to the 500 page if something happens when
 streaming. Currently, we output:

  "><script type="text/javascript">window.location = "/500.html"</script></html>
---
 actionpack/lib/action_view/base.rb                 |  6 ++++++
 .../renderer/streaming_template_renderer.rb        | 11 +++++-----
 .../controller/new_base/render_streaming_test.rb   | 24 +++++++++++++++++++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 9e8a3c51a3..87501d5b88 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -137,6 +137,12 @@ module ActionView #:nodoc:
     cattr_accessor :field_error_proc
     @@field_error_proc = Proc.new{ |html_tag, instance| "<div class=\"field_with_errors\">#{html_tag}</div>".html_safe }
 
+    # How to complete the streaming when an exception occurs.
+    # This is our best guess: first try to close the attribute, then the tag.
+    # Currently this is private API and may be changed at *any* time.
+    cattr_accessor :streaming_completion_on_exception
+    @@streaming_completion_on_exception = %("><script type="text/javascript">window.location = "/500.html"</script></html>)
+
     class_attribute :helpers
     class_attribute :_routes
 
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index 52f0e9f5bd..03aab444f8 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -46,11 +46,8 @@ module ActionView
   #
   # == TODO
   #
-  # * Add streaming support in the controllers with no-cache settings
-  # * What should happen when an error happens?
   # * Support streaming from child templates, partials and so on.
-  # * Support on sprockets async JS load?
-  #
+  # * Integrate exceptions with exceptron
   class StreamingTemplateRenderer < TemplateRenderer #:nodoc:
     # A valid Rack::Body (i.e. it responds to each).
     # It is initialized with a block that, when called, starts
@@ -61,7 +58,11 @@ module ActionView
       end
 
       def each(&block)
-        @start.call(block)
+        begin
+          @start.call(block)
+        rescue
+          block.call ActionView::Base.streaming_completion_on_exception
+        end
         self
       end
     end
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index ffc4b331ec..b8df5ec4e8 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -4,7 +4,9 @@ module RenderStreaming
   class BasicController < ActionController::Base
     self.view_paths = [ActionView::FixtureResolver.new(
       "render_streaming/basic/hello_world.html.erb" => "Hello world",
-      "layouts/application.html.erb" => "<%= yield %>, I'm here!"
+      "render_streaming/basic/boom.html.erb" => "<%= nil.invalid! %>",
+      "layouts/application.html.erb" => "<%= yield %>, I'm here!",
+      "layouts/boom.html.erb" => "<body class=\"<%= nil.invalid! %>\"<%= yield %></body>"
     )]
 
     layout "application"
@@ -13,6 +15,14 @@ module RenderStreaming
     def hello_world
     end
 
+    def layout_exception
+      render :action => "hello_world", :stream => true, :layout => "boom"
+    end
+
+    def template_exception
+      render :action => "boom", :stream => true
+    end
+
     def skip
       render :action => "hello_world", :stream => false
     end
@@ -61,6 +71,18 @@ module RenderStreaming
       assert_body "Hello world, I'm here!"
     end
 
+    test "rendering with layout exception" do
+      get "/render_streaming/basic/layout_exception"
+      assert_body "d\r\n<body class=\"\r\n4e\r\n\"><script type=\"text/javascript\">window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
+    test "rendering with template exception" do
+      get "/render_streaming/basic/template_exception"
+      assert_body "4e\r\n\"><script type=\"text/javascript\">window.location = \"/500.html\"</script></html>\r\n0\r\n\r\n"
+      assert_streaming!
+    end
+
     def assert_streaming!(cache="no-cache")
       assert_status 200
       assert_equal nil, headers["Content-Length"]
-- 
cgit v1.2.3


From 069e9b004f91c4ace1373ab5203bb00ab41bd1f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 15:04:28 +0200
Subject: Do not stream on HTTP/1.0.

---
 actionpack/lib/action_controller/metal/streaming.rb          | 10 +++++++---
 actionpack/test/controller/new_base/render_streaming_test.rb |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index adb3e94134..b9bd49f670 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -38,9 +38,13 @@ module ActionController #:nodoc:
     def _process_options(options) #:nodoc:
       super
       if options[:stream]
-        headers["Cache-Control"] ||= "no-cache"
-        headers["Transfer-Encoding"] = "chunked"
-        headers.delete("Content-Length")
+        if env["HTTP_VERSION"] == "HTTP/1.0"
+          options.delete(:stream)
+        else
+          headers["Cache-Control"] ||= "no-cache"
+          headers["Transfer-Encoding"] = "chunked"
+          headers.delete("Content-Length")
+        end
       end
     end
 
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index b8df5ec4e8..fed8d40b47 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -83,6 +83,14 @@ module RenderStreaming
       assert_streaming!
     end
 
+    test "do not stream on HTTP/1.0" do
+      get "/render_streaming/basic/hello_world", nil, "HTTP_VERSION" => "HTTP/1.0"
+      assert_body "Hello world, I'm here!"
+      assert_status 200
+      assert_equal "22", headers["Content-Length"]
+      assert_equal nil, headers["Transfer-Encoding"]
+    end
+
     def assert_streaming!(cache="no-cache")
       assert_status 200
       assert_equal nil, headers["Content-Length"]
-- 
cgit v1.2.3


From a3a5c7eba39c64413abd0fb4766282c9f071d248 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 19 Apr 2011 18:07:14 +0200
Subject: All assets, including images, audio, and video, now uses the asset
 pipeline when its on

---
 .../lib/action_view/helpers/asset_tag_helper.rb      |  18 +++++++++++++++---
 .../lib/action_view/helpers/sprockets_helper.rb      |  15 ++++++++++-----
 .../test/fixtures/sprockets/app/images/logo.png      | Bin 0 -> 6646 bytes
 actionpack/test/template/sprockets_helper_test.rb    |  19 +++++++++++++++++++
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 actionpack/test/fixtures/sprockets/app/images/logo.png

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index f6b2d4f3f4..10bdede1b4 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -274,7 +274,11 @@ 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)
-        asset_paths.compute_public_path(source, 'images')
+        if config.use_sprockets
+          sprockets_asset_path(source)
+        else
+          asset_paths.compute_public_path(source, 'images')
+        end
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
@@ -289,7 +293,11 @@ 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)
-        asset_paths.compute_public_path(source, 'videos')
+        if config.use_sprockets
+          sprockets_asset_path(source)
+        else
+          asset_paths.compute_public_path(source, 'videos')
+        end
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
@@ -304,7 +312,11 @@ module ActionView
       #   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)
-        asset_paths.compute_public_path(source, 'audios')
+        if config.use_sprockets
+          sprockets_asset_path(source)
+        else
+          asset_paths.compute_public_path(source, 'audios')
+        end
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index 408a2030ab..fee13be886 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -3,8 +3,12 @@ require 'uri'
 module ActionView
   module Helpers
     module SprocketsHelper
+      def sprockets_asset_path(source, default_ext = nil)
+        compute_sprockets_path(source, 'assets', default_ext)
+      end
+
       def sprockets_javascript_path(source)
-        compute_sprockets_path source, 'assets', 'js'
+        sprockets_asset_path(source, 'js')
       end
 
       def sprockets_javascript_include_tag(source, options = {})
@@ -17,9 +21,9 @@ module ActionView
       end
 
       def sprockets_stylesheet_path(source)
-        compute_sprockets_path source, 'assets', 'css'
+        sprockets_asset_path(source, 'css')
       end
-
+      
       def sprockets_stylesheet_link_tag(source, options = {})
         options = {
           'rel'   => "stylesheet",
@@ -31,13 +35,14 @@ module ActionView
         tag 'link', options
       end
 
+
       private
-        def compute_sprockets_path(source, dir, default_ext)
+        def compute_sprockets_path(source, dir, default_ext = nil)
           source = source.to_s
 
           return source if URI.parse(source).host
 
-          # Add /javscripts to relative paths
+          # Add /assets to relative paths
           if source[0] != ?/
             source = "/#{dir}/#{source}"
           end
diff --git a/actionpack/test/fixtures/sprockets/app/images/logo.png b/actionpack/test/fixtures/sprockets/app/images/logo.png
new file mode 100644
index 0000000000..d5edc04e65
Binary files /dev/null and b/actionpack/test/fixtures/sprockets/app/images/logo.png differ
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 67aee86d02..67774c1893 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -22,6 +22,7 @@ class SprocketsHelperTest < ActionView::TestCase
     @assets = Sprockets::Environment.new
     @assets.paths << FIXTURES.join("sprockets/app/javascripts")
     @assets.paths << FIXTURES.join("sprockets/app/stylesheets")
+    @assets.paths << FIXTURES.join("sprockets/app/images")
 
     config.perform_caching = true
   end
@@ -30,6 +31,24 @@ class SprocketsHelperTest < ActionView::TestCase
     "http://www.example.com"
   end
 
+  test "asset path" do
+    assert_equal "/assets/logo-9c0a079bdd7701d7e729bd956823d153.png",
+      sprockets_asset_path("logo.png")
+
+    assert_equal "/images/logo",
+      sprockets_asset_path("/images/logo")
+    assert_equal "/images/logo.gif",
+      sprockets_asset_path("/images/logo.gif")
+
+    assert_equal "/dir/audio",
+      sprockets_asset_path("/dir/audio")
+
+    assert_equal "http://www.example.com/video/play",
+      sprockets_asset_path("http://www.example.com/video/play")
+    assert_equal "http://www.example.com/video/play.mp4",
+      sprockets_asset_path("http://www.example.com/video/play.mp4")
+  end
+
   test "javascript path" do
     assert_equal "/assets/application-d41d8cd98f00b204e9800998ecf8427e.js",
       sprockets_javascript_path(:application)
-- 
cgit v1.2.3


From d35c91225e8eea967358328ba618e6608222a615 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 19 Apr 2011 18:29:18 +0200
Subject: Cleanup compute_sprockets_path -- when you are reaching for code
 comments, the method could be simpler

---
 .../lib/action_view/helpers/sprockets_helper.rb    | 51 +++++++++++++---------
 1 file changed, 30 insertions(+), 21 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index fee13be886..d2a31c02d4 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -11,6 +11,11 @@ module ActionView
         sprockets_asset_path(source, 'js')
       end
 
+      def sprockets_stylesheet_path(source)
+        sprockets_asset_path(source, 'css')
+      end
+      
+
       def sprockets_javascript_include_tag(source, options = {})
         options = {
           'type' => "text/javascript",
@@ -20,10 +25,6 @@ module ActionView
         content_tag 'script', "", options
       end
 
-      def sprockets_stylesheet_path(source)
-        sprockets_asset_path(source, 'css')
-      end
-      
       def sprockets_stylesheet_link_tag(source, options = {})
         options = {
           'rel'   => "stylesheet",
@@ -40,30 +41,38 @@ module ActionView
         def compute_sprockets_path(source, dir, default_ext = nil)
           source = source.to_s
 
-          return source if URI.parse(source).host
-
-          # Add /assets to relative paths
-          if source[0] != ?/
-            source = "/#{dir}/#{source}"
+          unless source_is_a_url?(source)
+            add_asset_directory(source, dir)
+            add_default_extension(source, default_ext)
+            add_fingerprint(source, dir)
+            add_asset_host(source)
           end
 
-          # Add default extension if there isn't one
-          if default_ext && File.extname(source).empty?
-            source = "#{source}.#{default_ext}"
-          end
-
-          # Fingerprint url
-          if source =~ /^\/#{dir}\/(.+)/
-            source = assets.path($1, config.perform_caching, dir)
-          end
+          source
+        end
+        
+        def add_asset_directory(source, dir)
+          source.replace("/#{dir}/#{source}") if source[0] != ?/
+        end
+        
+        def add_default_extension(source, default_ext)
+          source.replace("#{source}.#{default_ext}") if default_ext && File.extname(source).empty?
+        end
+        
+        def add_fingerprint(source, dir)
+          source.replace(assets.path($1, config.perform_caching, dir)) if source =~ /^\/#{dir}\/(.+)/
+        end
 
+        def add_asset_host(source)
           host = compute_asset_host(source)
 
           if controller.respond_to?(:request) && host && URI.parse(host).host
-            source = "#{controller.request.protocol}#{host}#{source}"
+            source.replace("#{controller.request.protocol}#{host}#{source}")
           end
-
-          source
+        end
+        
+        def source_is_a_url?(source)
+          URI.parse(source).host.present?
         end
 
         def compute_asset_host(source)
-- 
cgit v1.2.3


From 626bcc9bf415ca9872bbdaceac30a4df9aca86bb Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 19 Apr 2011 19:05:07 +0200
Subject: Switch to asset_path and make it available in the Sprockets::Context
 (now you can do asset_path("logo.png") in a stylesheet.css.erb file and get
 fingerprinting)

---
 .../lib/action_view/helpers/asset_tag_helper.rb    |  6 ++--
 .../asset_tag_helpers/javascript_tag_helpers.rb    |  2 +-
 .../asset_tag_helpers/stylesheet_tag_helpers.rb    |  2 +-
 .../lib/action_view/helpers/sprockets_helper.rb    | 32 ++++++++++-------
 actionpack/test/template/sprockets_helper_test.rb  | 40 ++++++++++------------
 5 files changed, 42 insertions(+), 40 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 10bdede1b4..e859b3ae49 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -275,7 +275,7 @@ module ActionView
       # plugin authors are encouraged to do so.
       def image_path(source)
         if config.use_sprockets
-          sprockets_asset_path(source)
+          asset_path(source)
         else
           asset_paths.compute_public_path(source, 'images')
         end
@@ -294,7 +294,7 @@ module ActionView
       #   video_path("http://www.railsapplication.com/vid/hd.avi") # => http://www.railsapplication.com/vid/hd.avi
       def video_path(source)
         if config.use_sprockets
-          sprockets_asset_path(source)
+          asset_path(source)
         else
           asset_paths.compute_public_path(source, 'videos')
         end
@@ -313,7 +313,7 @@ module ActionView
       #   audio_path("http://www.railsapplication.com/sounds/horse.wav") # => http://www.railsapplication.com/sounds/horse.wav
       def audio_path(source)
         if config.use_sprockets
-          sprockets_asset_path(source)
+          asset_path(source)
         else
           asset_paths.compute_public_path(source, 'audios')
         end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index ce5a7dc2e5..a0f6fb5692 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -87,7 +87,7 @@ module ActionView
         #   javascript_path "http://www.railsapplication.com/js/xmlhr.js" # => http://www.railsapplication.com/js/xmlhr.js
         def javascript_path(source)
           if config.use_sprockets
-            sprockets_javascript_path(source)
+            asset_path(source, 'js')
           else
             asset_paths.compute_public_path(source, 'javascripts', 'js')
           end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index a994afb65e..309762ee05 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -64,7 +64,7 @@ module ActionView
         #   stylesheet_path "http://www.railsapplication.com/css/style.css" # => http://www.railsapplication.com/css/style.css
         def stylesheet_path(source)
           if config.use_sprockets
-            sprockets_stylesheet_path(source)
+            asset_path(source, 'css')
           else
             asset_paths.compute_public_path(source, 'stylesheets', 'css')
           end
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index d2a31c02d4..bf47af6e10 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -3,23 +3,14 @@ require 'uri'
 module ActionView
   module Helpers
     module SprocketsHelper
-      def sprockets_asset_path(source, default_ext = nil)
+      def asset_path(source, default_ext = nil)
         compute_sprockets_path(source, 'assets', default_ext)
       end
 
-      def sprockets_javascript_path(source)
-        sprockets_asset_path(source, 'js')
-      end
-
-      def sprockets_stylesheet_path(source)
-        sprockets_asset_path(source, 'css')
-      end
-      
-
       def sprockets_javascript_include_tag(source, options = {})
         options = {
           'type' => "text/javascript",
-          'src'  => sprockets_javascript_path(source)
+          'src'  => asset_path(source, 'js')
         }.merge(options.stringify_keys)
 
         content_tag 'script', "", options
@@ -30,7 +21,7 @@ module ActionView
           'rel'   => "stylesheet",
           'type'  => "text/css",
           'media' => "screen",
-          'href'  => sprockets_stylesheet_path(source)
+          'href'  => asset_path(source, 'css')
         }.merge(options.stringify_keys)
 
         tag 'link', options
@@ -60,10 +51,15 @@ module ActionView
         end
         
         def add_fingerprint(source, dir)
-          source.replace(assets.path($1, config.perform_caching, dir)) if source =~ /^\/#{dir}\/(.+)/
+          if source =~ /^\/#{dir}\/(.+)/
+            source.replace(assets.path($1, performing_caching?, dir))
+          end
         end
 
         def add_asset_host(source)
+          # When included in Sprockets::Context, there's no controller
+          return unless respond_to?(:controller)
+
           host = compute_asset_host(source)
 
           if controller.respond_to?(:request) && host && URI.parse(host).host
@@ -94,6 +90,16 @@ module ActionView
         def assets
           Rails.application.assets
         end
+        
+        def performing_caching?
+          # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
+          respond_to?(:config) ? config.perform_caching : Rails.application.config.action_controller.perform_caching
+        end
     end
   end
 end
+
+# FIXME: Temp hack for extending Sprockets::Context so 
+class Sprockets::Context
+  include ActionView::Helpers::SprocketsHelper
+end if defined?(Sprockets)
\ No newline at end of file
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 67774c1893..863e473697 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -33,38 +33,38 @@ class SprocketsHelperTest < ActionView::TestCase
 
   test "asset path" do
     assert_equal "/assets/logo-9c0a079bdd7701d7e729bd956823d153.png",
-      sprockets_asset_path("logo.png")
+      asset_path("logo.png")
 
     assert_equal "/images/logo",
-      sprockets_asset_path("/images/logo")
+      asset_path("/images/logo")
     assert_equal "/images/logo.gif",
-      sprockets_asset_path("/images/logo.gif")
+      asset_path("/images/logo.gif")
 
     assert_equal "/dir/audio",
-      sprockets_asset_path("/dir/audio")
+      asset_path("/dir/audio")
 
     assert_equal "http://www.example.com/video/play",
-      sprockets_asset_path("http://www.example.com/video/play")
+      asset_path("http://www.example.com/video/play")
     assert_equal "http://www.example.com/video/play.mp4",
-      sprockets_asset_path("http://www.example.com/video/play.mp4")
+      asset_path("http://www.example.com/video/play.mp4")
   end
 
   test "javascript path" do
     assert_equal "/assets/application-d41d8cd98f00b204e9800998ecf8427e.js",
-      sprockets_javascript_path(:application)
+      asset_path(:application, "js")
 
     assert_equal "/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js",
-      sprockets_javascript_path("xmlhr")
+      asset_path("xmlhr", "js")
     assert_equal "/assets/dir/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js",
-      sprockets_javascript_path("dir/xmlhr.js")
+      asset_path("dir/xmlhr.js", "js")
 
     assert_equal "/dir/xmlhr.js",
-      sprockets_javascript_path("/dir/xmlhr")
+      asset_path("/dir/xmlhr", "js")
 
     assert_equal "http://www.railsapplication.com/js/xmlhr",
-      sprockets_javascript_path("http://www.railsapplication.com/js/xmlhr")
+      asset_path("http://www.railsapplication.com/js/xmlhr", "js")
     assert_equal "http://www.railsapplication.com/js/xmlhr.js",
-      sprockets_javascript_path("http://www.railsapplication.com/js/xmlhr.js")
+      asset_path("http://www.railsapplication.com/js/xmlhr.js", "js")
   end
 
   test "javascript include tag" do
@@ -80,20 +80,16 @@ class SprocketsHelperTest < ActionView::TestCase
   end
 
   test "stylesheet path" do
-    assert_equal "/assets/application-d41d8cd98f00b204e9800998ecf8427e.css",
-      sprockets_stylesheet_path(:application)
+    assert_equal "/assets/application-d41d8cd98f00b204e9800998ecf8427e.css", asset_path(:application, "css")
 
-    assert_equal "/assets/style-d41d8cd98f00b204e9800998ecf8427e.css",
-      sprockets_stylesheet_path("style")
-    assert_equal "/assets/dir/style-d41d8cd98f00b204e9800998ecf8427e.css",
-      sprockets_stylesheet_path("dir/style.css")
-    assert_equal "/dir/style.css",
-      sprockets_stylesheet_path("/dir/style.css")
+    assert_equal "/assets/style-d41d8cd98f00b204e9800998ecf8427e.css", asset_path("style", "css")
+    assert_equal "/assets/dir/style-d41d8cd98f00b204e9800998ecf8427e.css", asset_path("dir/style.css", "css")
+    assert_equal "/dir/style.css", asset_path("/dir/style.css", "css")
 
     assert_equal "http://www.railsapplication.com/css/style",
-      sprockets_stylesheet_path("http://www.railsapplication.com/css/style")
+      asset_path("http://www.railsapplication.com/css/style", "css")
     assert_equal "http://www.railsapplication.com/css/style.css",
-      sprockets_stylesheet_path("http://www.railsapplication.com/css/style.css")
+      asset_path("http://www.railsapplication.com/css/style.css", "css")
   end
 
   test "stylesheet link tag" do
-- 
cgit v1.2.3


From 914218ef302542f3f58ef7f8f46c0ff0b540ac82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 21:14:55 +0200
Subject: Let's use inheritance here, shall we?

---
 .../helpers/asset_tag_helpers/asset_include_tag.rb |  5 +-
 .../helpers/asset_tag_helpers/asset_paths.rb       | 13 ++--
 .../asset_tag_helpers/javascript_tag_helpers.rb    |  3 -
 .../asset_tag_helpers/stylesheet_tag_helpers.rb    |  3 -
 .../lib/action_view/helpers/sprockets_helper.rb    | 77 +++++++---------------
 actionpack/test/template/sprockets_helper_test.rb  |  8 +++
 6 files changed, 43 insertions(+), 66 deletions(-)

(limited to 'actionpack')

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
index 52eb43a1cd..e4662a2919 100644
--- 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
@@ -8,9 +8,11 @@ module ActionView
     module AssetTagHelper
 
       class AssetIncludeTag
-        attr_reader :config, :asset_paths
+        include TagHelper
 
+        attr_reader :config, :asset_paths
         class_attribute :expansions
+
         def self.inherited(base)
           base.expansions = { }
         end
@@ -56,7 +58,6 @@ module ActionView
           end
         end
 
-
         private
 
           def path_to_asset(source, include_host = true)
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
index 1e00fd996b..955634bb19 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -26,15 +26,18 @@ module ActionView
         # 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)
+          source = source.to_s
           return source if is_uri?(source)
 
           source = rewrite_extension(source, dir, ext) if ext
           source = "/#{dir}/#{source}" unless source[0] == ?/
-          source = rewrite_asset_path(source, config.asset_path)
+          source = rewrite_asset_path(source, dir)
 
-          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
+          if controller && include_host
+            has_request = controller.respond_to?(:request)
+            source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
+            source = rewrite_host_and_protocol(source, has_request)
+          end
 
           source
         end
@@ -70,6 +73,8 @@ module ActionView
           # Break out the asset path rewrite in case plugins wish to put the asset id
           # someplace other than the query string.
           def rewrite_asset_path(source, path = nil)
+            path = config.asset_path
+
             if path && path.respond_to?(:call)
               return path.call(source)
             elsif path && path.is_a?(String)
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index a0f6fb5692..07ff49659a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -1,6 +1,5 @@
 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
@@ -8,8 +7,6 @@ module ActionView
     module AssetTagHelper
 
       class JavascriptIncludeTag < AssetIncludeTag
-        include TagHelper
-
         def asset_name
           'javascript'
         end
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index 309762ee05..c3dcd410bb 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -1,6 +1,5 @@
 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
@@ -8,8 +7,6 @@ module ActionView
     module AssetTagHelper
 
       class StylesheetIncludeTag < AssetIncludeTag
-        include TagHelper
-
         def asset_name
           'stylesheet'
         end
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index bf47af6e10..e2e844c74d 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -1,10 +1,11 @@
 require 'uri'
+require 'action_view/helpers/asset_tag_helpers/asset_paths'
 
 module ActionView
   module Helpers
     module SprocketsHelper
       def asset_path(source, default_ext = nil)
-        compute_sprockets_path(source, 'assets', default_ext)
+        sprockets_asset_paths.compute_public_path(source, 'assets', default_ext, true)
       end
 
       def sprockets_javascript_include_tag(source, options = {})
@@ -27,74 +28,42 @@ module ActionView
         tag 'link', options
       end
 
-
       private
-        def compute_sprockets_path(source, dir, default_ext = nil)
-          source = source.to_s
-
-          unless source_is_a_url?(source)
-            add_asset_directory(source, dir)
-            add_default_extension(source, default_ext)
-            add_fingerprint(source, dir)
-            add_asset_host(source)
-          end
 
-          source
-        end
-        
-        def add_asset_directory(source, dir)
-          source.replace("/#{dir}/#{source}") if source[0] != ?/
-        end
-        
-        def add_default_extension(source, default_ext)
-          source.replace("#{source}.#{default_ext}") if default_ext && File.extname(source).empty?
-        end
-        
-        def add_fingerprint(source, dir)
-          if source =~ /^\/#{dir}\/(.+)/
-            source.replace(assets.path($1, performing_caching?, dir))
-          end
+      def sprockets_asset_paths
+        @sprockets_asset_paths ||= begin
+          config     = self.config if respond_to?(:config)
+          controller = self.controller if respond_to?(:controller)
+          SprocketsHelper::AssetPaths.new(config, controller)
         end
+      end
 
-        def add_asset_host(source)
-          # When included in Sprockets::Context, there's no controller
-          return unless respond_to?(:controller)
-
-          host = compute_asset_host(source)
-
-          if controller.respond_to?(:request) && host && URI.parse(host).host
-            source.replace("#{controller.request.protocol}#{host}#{source}")
+      class AssetPaths < ActionView::Helpers::AssetTagHelper::AssetPaths
+        def rewrite_asset_path(source, dir)
+          if source =~ /^\/#{dir}\/(.+)/
+            assets.path($1, performing_caching?, dir)
+          else
+            source
           end
         end
-        
-        def source_is_a_url?(source)
-          URI.parse(source).host.present?
-        end
 
-        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
+        def rewrite_extension(source, dir, ext)
+          if ext && File.extname(source).empty?
+            "#{source}.#{ext}"
+          else
+            source
           end
         end
 
         def assets
           Rails.application.assets
         end
-        
+
+        # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
         def performing_caching?
-          # When included in Sprockets::Context, we need to ask the top-level config as the controller is not available
-          respond_to?(:config) ? config.perform_caching : Rails.application.config.action_controller.perform_caching
+          @config ?  @config.perform_caching : Rails.application.config.action_controller.perform_caching
         end
+      end
     end
   end
 end
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index 863e473697..d8aef34bfb 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -1,5 +1,8 @@
 require 'abstract_unit'
 require 'sprockets'
+require 'mocha'
+
+module Rails; end
 
 class SprocketsHelperTest < ActionView::TestCase
   tests ActionView::Helpers::SprocketsHelper
@@ -24,6 +27,11 @@ class SprocketsHelperTest < ActionView::TestCase
     @assets.paths << FIXTURES.join("sprockets/app/stylesheets")
     @assets.paths << FIXTURES.join("sprockets/app/images")
 
+    application = Object.new
+    Rails.stubs(:application).returns(application)
+    application.stubs(:config).returns(config)
+    application.stubs(:assets).returns(@assets)
+
     config.perform_caching = true
   end
 
-- 
cgit v1.2.3


From a19c260038a9b5b688a2e8d883b604983ac59eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 21:49:28 +0200
Subject: Include modules to the context in the railtie.

---
 actionpack/lib/action_view/helpers/sprockets_helper.rb | 7 +------
 actionpack/lib/sprockets/railtie.rb                    | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index e2e844c74d..947c827f3c 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -66,9 +66,4 @@ module ActionView
       end
     end
   end
-end
-
-# FIXME: Temp hack for extending Sprockets::Context so 
-class Sprockets::Context
-  include ActionView::Helpers::SprocketsHelper
-end if defined?(Sprockets)
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index fe3c8c9783..2f7f95c44d 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -32,6 +32,12 @@ module Sprockets
       next unless assets.enabled
 
       app.assets = asset_environment(app)
+
+      # FIXME: Temp hack for extending Sprockets::Context so 
+      ActiveSupport.on_load(:action_view) do
+        ::Sprockets::Context.send :include, ::ActionView::Helpers::SprocketsHelper
+      end
+
       app.routes.append do
         mount app.assets => assets.prefix
       end
-- 
cgit v1.2.3


From 22fcef90b185199563719fc511346bf4c2f5bbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 22:01:25 +0200
Subject: Actually add an abstract class, so it is easier to get rid of old
 asset paths in the future.

---
 actionpack/lib/action_view/helpers/asset_paths.rb  |  80 ++++++++++
 .../lib/action_view/helpers/asset_tag_helper.rb    |   2 +-
 .../helpers/asset_tag_helpers/asset_paths.rb       | 161 +++++++--------------
 .../lib/action_view/helpers/sprockets_helper.rb    |   4 +-
 4 files changed, 136 insertions(+), 111 deletions(-)
 create mode 100644 actionpack/lib/action_view/helpers/asset_paths.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
new file mode 100644
index 0000000000..55a4c442fd
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -0,0 +1,80 @@
+require 'active_support/core_ext/file'
+require 'action_view/helpers/asset_paths'
+
+module ActionView
+  module Helpers
+
+    class AssetPaths #:nodoc:
+      attr_reader :config, :controller
+
+      def initialize(config, controller)
+        @config = config
+        @controller = controller
+      end
+
+      # Add 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)
+        source = source.to_s
+        return source if is_uri?(source)
+
+        source = rewrite_extension(source, dir, ext) if ext
+        source = "/#{dir}/#{source}" unless source[0] == ?/
+        source = rewrite_asset_path(source, dir)
+
+        if controller && include_host
+          has_request = controller.respond_to?(:request)
+          source = rewrite_host_and_protocol(source, has_request)
+        end
+
+        source
+      end
+
+      def is_uri?(path)
+        path =~ %r{^[-a-z]+://|^cid:}
+      end
+
+    private
+
+      def rewrite_extension(source, dir, ext)
+        raise NotImplementedError
+      end
+
+      def rewrite_asset_path(source, path = nil)
+        raise NotImplementedError
+      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
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index e859b3ae49..a7ae6ad0bf 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -446,7 +446,7 @@ module ActionView
       private
 
         def asset_paths
-          @asset_paths ||= AssetPaths.new(config, controller)
+          @asset_paths ||= AssetTagHelper::AssetPaths.new(config, controller)
         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
index 955634bb19..38860431b4 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -1,10 +1,11 @@
 require 'active_support/core_ext/file'
+require 'action_view/helpers/asset_paths'
 
 module ActionView
   module Helpers
     module AssetTagHelper
 
-      class AssetPaths
+      class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
         # 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
@@ -14,34 +15,6 @@ module ActionView
         #   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 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)
-          source = source.to_s
-          return source if is_uri?(source)
-
-          source = rewrite_extension(source, dir, ext) if ext
-          source = "/#{dir}/#{source}" unless source[0] == ?/
-          source = rewrite_asset_path(source, dir)
-
-          if controller && include_host
-            has_request = controller.respond_to?(:request)
-            source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
-            source = rewrite_host_and_protocol(source, has_request)
-          end
-
-          source
-        end
-
         # Add or change an asset id in the asset id cache. This can be used
         # for SASS on Heroku.
         # :api: public
@@ -51,103 +24,75 @@ module ActionView
           end
         end
 
-        def is_uri?(path)
-          path =~ %r{^[-a-z]+://|^cid:}
-        end
-
-        private
-
-          def rewrite_extension(source, dir, ext)
-            source_ext = File.extname(source)
+      private
 
-            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
+        def rewrite_extension(source, dir, ext)
+          source_ext = File.extname(source)
 
-            source_with_ext || 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
 
-          # 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)
-            path = config.asset_path
+          source_with_ext || source
+        end
 
-            if path && path.respond_to?(:call)
-              return path.call(source)
-            elsif path && path.is_a?(String)
-              return path % [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)
+          path = config.asset_path
 
-            asset_id = rails_asset_id(source)
-            if asset_id.empty?
-              source
-            else
-              "#{source}?#{asset_id}"
-            end
+          if path && path.respond_to?(:call)
+            return path.call(source)
+          elsif path && path.is_a?(String)
+            return path % [source]
           end
 
-          mattr_accessor :asset_ids_cache
-          self.asset_ids_cache = {}
+          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
+        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"]
+        # 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
-              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 : ''
+              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
+              if self.cache_asset_ids
+                add_to_asset_ids_cache(source, 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}"
+              asset_id
             end
-            "#{host}#{source}"
           end
+        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
+        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)
+          source = rewrite_relative_url_root(source, controller.config.relative_url_root) if has_request
+          super(source, has_request)
+        end
       end
 
     end
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index 947c827f3c..b43b91178c 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -1,5 +1,5 @@
 require 'uri'
-require 'action_view/helpers/asset_tag_helpers/asset_paths'
+require 'action_view/helpers/asset_paths'
 
 module ActionView
   module Helpers
@@ -38,7 +38,7 @@ module ActionView
         end
       end
 
-      class AssetPaths < ActionView::Helpers::AssetTagHelper::AssetPaths
+      class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
         def rewrite_asset_path(source, dir)
           if source =~ /^\/#{dir}\/(.+)/
             assets.path($1, performing_caching?, dir)
-- 
cgit v1.2.3


From 89ed9fbd1917e431e489dc856042d996d0f088c5 Mon Sep 17 00:00:00 2001
From: Florent Piteau <florent.piteau@sylogix.net>
Date: Wed, 20 Apr 2011 02:10:29 +0800
Subject: Don't reuse a closed flash when using now

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 6 +++++-
 actionpack/test/controller/flash_test.rb           | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index 735c72d34a..c7f7d4d4f0 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -70,6 +70,10 @@ module ActionDispatch
       def close!(new_flash)
         @flash = new_flash
       end
+      
+      def closed?
+        @flash.closed?
+      end
     end
 
     class FlashHash
@@ -146,7 +150,7 @@ module ActionDispatch
       #
       # Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>.
       def now
-        @now ||= FlashNow.new(self)
+        @now = (!@now || @now.closed?) ? FlashNow.new(self) : @now
       end
 
       attr_reader :closed
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 7b5bf8b21a..e19612eace 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -272,6 +272,14 @@ class FlashIntegrationTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_setting_flash_now_does_not_raise_in_following_requests
+    with_test_route_set do
+      env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
+      get '/set_flash_now', nil, env
+      get '/set_flash_now', nil, env
+    end
+  end
+
   def test_setting_flash_raises_after_stream_back_to_client_even_with_an_empty_flash
     with_test_route_set do
       env = { 'action_dispatch.request.flash_hash' => ActionDispatch::Flash::FlashHash.new }
-- 
cgit v1.2.3


From 2f549b8bbd733ad0563d977e83a9b2a2b6b8e07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 22:38:51 +0200
Subject: Use initialize_copy! to proper initialize now on clone.

---
 actionpack/lib/action_dispatch/middleware/flash.rb | 33 ++++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/flash.rb b/actionpack/lib/action_dispatch/middleware/flash.rb
index c7f7d4d4f0..2adbce031b 100644
--- a/actionpack/lib/action_dispatch/middleware/flash.rb
+++ b/actionpack/lib/action_dispatch/middleware/flash.rb
@@ -43,6 +43,8 @@ module ActionDispatch
     KEY = 'action_dispatch.request.flash_hash'.freeze
 
     class FlashNow #:nodoc:
+      attr_accessor :flash
+
       def initialize(flash)
         @flash = flash
       end
@@ -66,14 +68,6 @@ module ActionDispatch
       def notice=(message)
         self[:notice] = message
       end
-
-      def close!(new_flash)
-        @flash = new_flash
-      end
-      
-      def closed?
-        @flash.closed?
-      end
     end
 
     class FlashHash
@@ -86,6 +80,14 @@ module ActionDispatch
         @now     = nil
       end
 
+      def initialize_copy(other)
+        if other.now_is_loaded?
+          @now = other.now.dup
+          @now.flash = self
+        end
+        super
+      end
+
       def []=(k, v) #:nodoc:
         raise ClosedError, :flash if closed?
         keep(k)
@@ -150,16 +152,12 @@ module ActionDispatch
       #
       # Entries set via <tt>now</tt> are accessed the same way as standard entries: <tt>flash['my-key']</tt>.
       def now
-        @now = (!@now || @now.closed?) ? FlashNow.new(self) : @now
+        @now ||= FlashNow.new(self)
       end
 
       attr_reader :closed
       alias :closed? :closed
-
-      def close!
-        @closed = true
-        @now.close!(self) if @now
-      end
+      def close!; @closed = true; end
 
       # Keeps either the entire current flash or a specific flash entry available for the next action:
       #
@@ -214,7 +212,12 @@ module ActionDispatch
         self[:notice] = message
       end
 
-      private
+      protected
+
+        def now_is_loaded?
+          !!@now
+        end
+
         # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
         #     use()               # marks the entire flash as used
         #     use('msg')          # marks the "msg" entry as used
-- 
cgit v1.2.3


From d31af44012a6ba3ac5dbec45417ae9bfb5454d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 20 Apr 2011 21:54:19 +0200
Subject: Fix tests on 1.8 by explicitly checking for strings (which also
 improves performance).

---
 actionpack/lib/action_dispatch/http/response.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 78ecf177be..1f4f3ac0da 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -118,7 +118,15 @@ module ActionDispatch # :nodoc:
 
     def body=(body)
       @blank = true if body == EMPTY
-      @body = body.respond_to?(:each) ? body : [body]
+
+      # Explicitly check for strings. This is *wrong* theoretically
+      # but if we don't check this, the performance on string bodies
+      # is bad on Ruby 1.8 (because strings responds to each then).
+      @body = if body.respond_to?(:to_str) || !body.respond_to?(:each)
+        [body]
+      else
+        body
+      end
     end
 
     def body_parts
-- 
cgit v1.2.3


From 783007a8ad7b4b61a1a671d1737a8a6e0369ceb9 Mon Sep 17 00:00:00 2001
From: Joost Baaij <joost@spacebabies.nl>
Date: Thu, 21 Apr 2011 16:32:02 +0200
Subject: Replace example hostname with "example.com". The hostname used in
 these comments actually exists, which is undesirable. See also RFC 2606.

---
 .../lib/action_view/helpers/asset_tag_helper.rb    |  6 +++---
 .../asset_tag_helpers/javascript_tag_helpers.rb    | 18 ++++++++--------
 .../asset_tag_helpers/stylesheet_tag_helpers.rb    | 14 ++++++-------
 actionpack/lib/action_view/helpers/url_helper.rb   |  2 +-
 actionpack/test/template/sprockets_helper_test.rb  | 24 +++++++++++-----------
 5 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index a7ae6ad0bf..f7cb1f5b58 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -268,7 +268,7 @@ module ActionView
       #   image_path("edit.png")                                     # => "/images/edit.png"
       #   image_path("icons/edit.png")                               # => "/images/icons/edit.png"
       #   image_path("/icons/edit.png")                              # => "/icons/edit.png"
-      #   image_path("http://www.railsapplication.com/img/edit.png") # => "http://www.railsapplication.com/img/edit.png"
+      #   image_path("http://www.example.com/img/edit.png")          # => "http://www.example.com/img/edit.png"
       #
       # If you have images as application resources this method may conflict with their named routes.
       # The alias +path_to_image+ is provided to avoid that. Rails uses the alias internally, and
@@ -291,7 +291,7 @@ module ActionView
       #   video_path("hd.avi")                                        # => /videos/hd.avi
       #   video_path("trailers/hd.avi")                               # => /videos/trailers/hd.avi
       #   video_path("/trailers/hd.avi")                              # => /trailers/hd.avi
-      #   video_path("http://www.railsapplication.com/vid/hd.avi") # => http://www.railsapplication.com/vid/hd.avi
+      #   video_path("http://www.example.com/vid/hd.avi")             # => http://www.example.com/vid/hd.avi
       def video_path(source)
         if config.use_sprockets
           asset_path(source)
@@ -310,7 +310,7 @@ module ActionView
       #   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
+      #   audio_path("http://www.example.com/sounds/horse.wav")          # => http://www.example.com/sounds/horse.wav
       def audio_path(source)
         if config.use_sprockets
           asset_path(source)
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index 07ff49659a..3d815b5e1f 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -77,11 +77,11 @@ module ActionView
         # 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
+        #   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.example.com/js/xmlhr"    # => http://www.example.com/js/xmlhr
+        #   javascript_path "http://www.example.com/js/xmlhr.js" # => http://www.example.com/js/xmlhr.js
         def javascript_path(source)
           if config.use_sprockets
             asset_path(source, 'js')
@@ -123,11 +123,11 @@ module ActionView
         #   # => <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.example.com/xmlhr"
+        #   # => <script type="text/javascript" src="http://www.example.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 "http://www.example.com/xmlhr.js"
+        #   # => <script type="text/javascript" src="http://www.example.com/xmlhr.js?1284139606"></script>
         #
         #   javascript_include_tag :defaults
         #   # => <script type="text/javascript" src="/javascripts/jquery.js?1284139606"></script>
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
index c3dcd410bb..a95eb221be 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
@@ -54,11 +54,11 @@ module ActionView
         # 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
+        #   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.example.com/css/style"       # => http://www.example.com/css/style
+        #   stylesheet_path "http://www.example.com/css/style.css"   # => http://www.example.com/css/style.css
         def stylesheet_path(source)
           if config.use_sprockets
             asset_path(source, 'css')
@@ -79,8 +79,8 @@ module ActionView
         #   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 "http://www.example.com/style.css" # =>
+        #     <link href="http://www.example.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" />
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 051d3eb049..ffa9a5bb0b 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -68,7 +68,7 @@ module ActionView
       #   # => /books/find
       #
       #   <%= url_for(:action => 'login', :controller => 'members', :only_path => false, :protocol => 'https') %>
-      #   # => https://www.railsapplication.com/members/login/
+      #   # => https://www.example.com/members/login/
       #
       #   <%= url_for(:action => 'play', :anchor => 'player') %>
       #   # => /messages/play/#player
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index d8aef34bfb..8d3be09a4f 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -69,10 +69,10 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_equal "/dir/xmlhr.js",
       asset_path("/dir/xmlhr", "js")
 
-    assert_equal "http://www.railsapplication.com/js/xmlhr",
-      asset_path("http://www.railsapplication.com/js/xmlhr", "js")
-    assert_equal "http://www.railsapplication.com/js/xmlhr.js",
-      asset_path("http://www.railsapplication.com/js/xmlhr.js", "js")
+    assert_equal "http://www.example.com/js/xmlhr",
+      asset_path("http://www.example.com/js/xmlhr", "js")
+    assert_equal "http://www.example.com/js/xmlhr.js",
+      asset_path("http://www.example.com/js/xmlhr.js", "js")
   end
 
   test "javascript include tag" do
@@ -83,8 +83,8 @@ class SprocketsHelperTest < ActionView::TestCase
       sprockets_javascript_include_tag("xmlhr")
     assert_equal '<script src="/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js" type="text/javascript"></script>',
       sprockets_javascript_include_tag("xmlhr.js")
-    assert_equal '<script src="http://www.railsapplication.com/xmlhr" type="text/javascript"></script>',
-      sprockets_javascript_include_tag("http://www.railsapplication.com/xmlhr")
+    assert_equal '<script src="http://www.example.com/xmlhr" type="text/javascript"></script>',
+      sprockets_javascript_include_tag("http://www.example.com/xmlhr")
   end
 
   test "stylesheet path" do
@@ -94,10 +94,10 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_equal "/assets/dir/style-d41d8cd98f00b204e9800998ecf8427e.css", asset_path("dir/style.css", "css")
     assert_equal "/dir/style.css", asset_path("/dir/style.css", "css")
 
-    assert_equal "http://www.railsapplication.com/css/style",
-      asset_path("http://www.railsapplication.com/css/style", "css")
-    assert_equal "http://www.railsapplication.com/css/style.css",
-      asset_path("http://www.railsapplication.com/css/style.css", "css")
+    assert_equal "http://www.example.com/css/style",
+      asset_path("http://www.example.com/css/style", "css")
+    assert_equal "http://www.example.com/css/style.css",
+      asset_path("http://www.example.com/css/style.css", "css")
   end
 
   test "stylesheet link tag" do
@@ -109,8 +109,8 @@ class SprocketsHelperTest < ActionView::TestCase
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="screen" rel="stylesheet" type="text/css" />',
       sprockets_stylesheet_link_tag("style.css")
 
-    assert_equal '<link href="http://www.railsapplication.com/style.css" media="screen" rel="stylesheet" type="text/css" />',
-      sprockets_stylesheet_link_tag("http://www.railsapplication.com/style.css")
+    assert_equal '<link href="http://www.example.com/style.css" media="screen" rel="stylesheet" type="text/css" />',
+      sprockets_stylesheet_link_tag("http://www.example.com/style.css")
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="all" rel="stylesheet" type="text/css" />',
       sprockets_stylesheet_link_tag("style", :media => "all")
     assert_equal '<link href="/assets/style-d41d8cd98f00b204e9800998ecf8427e.css" media="print" rel="stylesheet" type="text/css" />',
-- 
cgit v1.2.3


From 84f1b83df84d36b75cc7b6d1c84ffd84c6c07260 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Thu, 21 Apr 2011 11:03:56 -0500
Subject: Only include SprocketsHelper into assets context

---
 actionpack/lib/sprockets/railtie.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 2f7f95c44d..ccec65ba95 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -33,9 +33,10 @@ module Sprockets
 
       app.assets = asset_environment(app)
 
-      # FIXME: Temp hack for extending Sprockets::Context so 
       ActiveSupport.on_load(:action_view) do
-        ::Sprockets::Context.send :include, ::ActionView::Helpers::SprocketsHelper
+        app.assets.context.instance_eval do
+          include ::ActionView::Helpers::SprocketsHelper
+        end
       end
 
       app.routes.append do
@@ -59,4 +60,4 @@ module Sprockets
       env
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From 6822f39f67729884d7911b42542c965434a22250 Mon Sep 17 00:00:00 2001
From: Semyon Perepelitsa <sema@sema.in>
Date: Fri, 22 Apr 2011 23:12:14 +0800
Subject: Remove HTML escaping from Record Tag Helper docs.

---
 actionpack/lib/action_view/helpers/record_tag_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 4d300a1469..142a25f118 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -10,7 +10,7 @@ module ActionView
       # relate to the specified Active Record object. Usage example:
       #
       #    <%= div_for(@person, :class => "foo") do %>
-      #       <%=h @person.name %>
+      #       <%= @person.name %>
       #    <% end %>
       #
       # produces:
@@ -25,8 +25,8 @@ module ActionView
       # that relate to the specified Active Record object. For example:
       #
       #    <%= content_tag_for(:tr, @person) do %>
-      #      <td><%=h @person.first_name %></td>
-      #      <td><%=h @person.last_name %></td>
+      #      <td><%= @person.first_name %></td>
+      #      <td><%= @person.last_name %></td>
       #    <% end %>
       #
       # would produce the following HTML (assuming @person is an instance of
-- 
cgit v1.2.3


From dab96a267eeccd7380ad99fa19cefdfd3cd5ad2b Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 22 Apr 2011 10:49:55 -0500
Subject: Add shorthand for js and css compressors

---
 actionpack/lib/sprockets/railtie.rb | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index ccec65ba95..9c10decd60 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -57,7 +57,44 @@ module Sprockets
       env.static_root = File.join(app.root.join("public"), assets.prefix)
       env.paths.concat assets.paths
       env.logger = Rails.logger
+      env.js_compressor = expand_js_compressor(assets.js_compressor)
+      env.css_compressor = expand_css_compressor(assets.css_compressor)
       env
     end
+
+    def expand_js_compressor(sym)
+      case sym
+      when :closure
+        require 'closure-compiler'
+        Closure::Compiler.new
+      when :uglifier
+        require 'uglifier'
+        Uglifier.new
+      when :yui
+        require 'yui/compressor'
+        YUI::JavaScriptCompressor.new
+      else
+        sym
+      end
+    end
+
+    def expand_css_compressor(sym)
+      case sym
+      when :scss
+        require 'sass'
+        compressor = Object.new
+        def compressor.compress(source)
+          Sass::Engine.new(source,
+            :syntax => :scss, :style => :compressed
+          ).render
+        end
+        compressor
+      when :yui
+        require 'yui/compressor'
+        YUI::JavaScriptCompressor.new(:munge => true)
+      else
+        sym
+      end
+    end
   end
 end
-- 
cgit v1.2.3


From 89f315bfb287f5428e78195e7c93c85c0892ab64 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Fri, 22 Apr 2011 19:37:52 +0200
Subject: We cant use assert_block because its buggy in MiniTest and wont
 actually show you the failure message you provide -- instead you just always
 get a "Expected block to return true"

---
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index 8a04cfa886..e209978fb7 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -42,7 +42,7 @@ module ActionDispatch
         elsif type.is_a?(Symbol) && @response.response_code == Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
           assert_block("") { true } # to count the assertion
         else
-          assert_block(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code)) { false }
+          assert(false, build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code))
         end
       end
 
-- 
cgit v1.2.3


From a8870d140ececc6327533d08b112cece03c41499 Mon Sep 17 00:00:00 2001
From: Schneems <richard.schneeman@gmail.com>
Date: Sat, 23 Apr 2011 02:23:12 +0800
Subject: show http method in routing error message

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index dbe3206808..b1adf3d2d1 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -50,7 +50,7 @@ module ActionDispatch
         # Only this middleware cares about RoutingError. So, let's just raise
         # it here.
         if headers['X-Cascade'] == 'pass'
-           raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
+           raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
         end
       rescue Exception => exception
         raise exception if env['action_dispatch.show_exceptions'] == false
-- 
cgit v1.2.3


From 3e1f4dbb4db852a3278a883b3f599664e5705de3 Mon Sep 17 00:00:00 2001
From: misfo <tedwardo2@gmail.com>
Date: Sat, 23 Apr 2011 10:15:38 -0500
Subject: document HTML::Selector's :has(string) pseudo class

---
 actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
index 0fe2e6d1a6..1eadfc0390 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
@@ -128,6 +128,8 @@ module HTML
   #   (no parent element).
   # * <tt>:empty</tt> -- Match the element only if it has no child elements,
   #   and no text content.
+  # * <tt>:content(string)</tt> -- Match the element only if it has <tt>string</tt>
+  #   as its text content (ignoring leading and trailing whitespace).
   # * <tt>:only-child</tt> -- Match the element if it is the only child (element)
   #   of its parent element.
   # * <tt>:only-of-type</tt> -- Match the element if it is the only child (element)
-- 
cgit v1.2.3


From 8d00dfca7f6ea528ed5344b6cc1058c9f0402361 Mon Sep 17 00:00:00 2001
From: David Chelimsky <dchelimsky@gmail.com>
Date: Sat, 23 Apr 2011 17:18:06 -0500
Subject: rename test case to better describe use case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/test/controller/view_paths_test.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 9280a1c2d3..42356be1ea 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -131,8 +131,8 @@ class ViewLoadPathsTest < ActionController::TestCase
     assert_equal "Hello overridden world!", @response.body
   end
 
-  def test_override_view_paths_with_custom_resolver
-    resolver_class = Class.new(ActionView::PathResolver) do
+  def test_decorate_view_paths_with_custom_resolver
+    decorator_class = Class.new(ActionView::PathResolver) do
       def initialize(path_set)
         @path_set = path_set
       end
@@ -140,7 +140,7 @@ class ViewLoadPathsTest < ActionController::TestCase
       def find_all(*args)
         @path_set.find_all(*args).collect do |template|
           ::ActionView::Template.new(
-            "Customized body",
+            "Decorated body",
             template.identifier,
             template.handler,
             {
@@ -152,12 +152,12 @@ class ViewLoadPathsTest < ActionController::TestCase
       end
     end
 
-    resolver = resolver_class.new(TestController.view_paths)
-    TestController.view_paths = ActionView::PathSet.new.push(resolver)
+    decorator = decorator_class.new(TestController.view_paths)
+    TestController.view_paths = ActionView::PathSet.new.push(decorator)
 
     get :hello_world
     assert_response :success
-    assert_equal "Customized body", @response.body
+    assert_equal "Decorated body", @response.body
   end
 
   def test_inheritance
-- 
cgit v1.2.3


From 820c0feda33495cfe68add8c3f25adc515ab3e04 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 25 Apr 2011 14:56:58 +0200
Subject: Explicitly define main_app proxy

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index b28f6c2297..1d09091dc7 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -275,8 +275,7 @@ module ActionDispatch
       module MountedHelpers
       end
 
-      def mounted_helpers(name = :main_app)
-        define_mounted_helper(name) if name
+      def mounted_helpers
         MountedHelpers
       end
 
-- 
cgit v1.2.3


From d4bea35f1ae458246a9e3bb1c914c5d05b8e9cdf Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 25 Apr 2011 15:02:41 +0200
Subject: Make ActionController::Base.modules_for_helpers and
 ActionController::Base.all_helpers_from_path public methods

---
 actionpack/lib/abstract_controller/helpers.rb     | 22 +++++-----
 actionpack/lib/action_controller/metal/helpers.rb | 52 +++++++++++------------
 2 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 20f8601a8e..0ff1c0491a 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -112,17 +112,6 @@ module AbstractController
         default_helper_module! unless anonymous?
       end
 
-      private
-      # Makes all the (instance) methods in the helper module available to templates
-      # rendered through this controller.
-      #
-      # ==== Parameters
-      # * <tt>module</tt> - The module to include into the current helper module
-      #   for the class
-      def add_template_helper(mod)
-        _helpers.module_eval { include mod }
-      end
-
       # Returns a list of modules, normalized from the acceptable kinds of
       # helpers with the following behavior:
       #
@@ -155,6 +144,17 @@ module AbstractController
         end
       end
 
+      private
+      # Makes all the (instance) methods in the helper module available to templates
+      # rendered through this controller.
+      #
+      # ==== Parameters
+      # * <tt>module</tt> - The module to include into the current helper module
+      #   for the class
+      def add_template_helper(mod)
+        _helpers.module_eval { include mod }
+      end
+
       def default_helper_module!
         module_name = name.sub(/Controller$/, '')
         module_path = module_name.underscore
diff --git a/actionpack/lib/action_controller/metal/helpers.rb b/actionpack/lib/action_controller/metal/helpers.rb
index 91a88ab68a..75757db564 100644
--- a/actionpack/lib/action_controller/metal/helpers.rb
+++ b/actionpack/lib/action_controller/metal/helpers.rb
@@ -76,35 +76,35 @@ module ActionController
         @helper_proxy ||= ActionView::Base.new.extend(_helpers)
       end
 
-      private
-        # Overwrite modules_for_helpers to accept :all as argument, which loads
-        # all helpers in helpers_path.
-        #
-        # ==== Parameters
-        # * <tt>args</tt> - A list of helpers
-        #
-        # ==== Returns
-        # * <tt>array</tt> - A normalized list of modules for the list of helpers provided.
-        def modules_for_helpers(args)
-          args += all_application_helpers if args.delete(:all)
-          super(args)
-        end
+      # Overwrite modules_for_helpers to accept :all as argument, which loads
+      # all helpers in helpers_path.
+      #
+      # ==== Parameters
+      # * <tt>args</tt> - A list of helpers
+      #
+      # ==== Returns
+      # * <tt>array</tt> - A normalized list of modules for the list of helpers provided.
+      def modules_for_helpers(args)
+        args += all_application_helpers if args.delete(:all)
+        super(args)
+      end
 
-        # Extract helper names from files in <tt>app/helpers/**/*_helper.rb</tt>
-        def all_application_helpers
-          all_helpers_from_path(helpers_path)
+      def all_helpers_from_path(path)
+        helpers = []
+        Array.wrap(path).each do |_path|
+          extract  = /^#{Regexp.quote(_path.to_s)}\/?(.*)_helper.rb$/
+          helpers += Dir["#{_path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
         end
+        helpers.sort!
+        helpers.uniq!
+        helpers
+      end
 
-        def all_helpers_from_path(path)
-          helpers = []
-          Array.wrap(path).each do |_path|
-            extract  = /^#{Regexp.quote(_path.to_s)}\/?(.*)_helper.rb$/
-            helpers += Dir["#{_path}/**/*_helper.rb"].map { |file| file.sub(extract, '\1') }
-          end
-          helpers.sort!
-          helpers.uniq!
-          helpers
-        end
+      private
+      # Extract helper names from files in <tt>app/helpers/**/*_helper.rb</tt>
+      def all_application_helpers
+        all_helpers_from_path(helpers_path)
+      end
     end
   end
 end
-- 
cgit v1.2.3


From f545a5081ec7052dd9319cab84ab52d41ee267bd Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Mon, 25 Apr 2011 17:57:41 +0200
Subject: Fix tests, main_app mounted helper must be defined explicitly now.

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

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index 18f28deee4..b28a058250 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -69,6 +69,7 @@ module TestGenerationPrefix
 
     # force draw
     RailsApplication.routes
+    RailsApplication.routes.define_mounted_helper(:main_app)
 
     class ::InsideEngineGeneratingController < ActionController::Base
       include BlogEngine.routes.url_helpers
-- 
cgit v1.2.3


From 873c13fc0ddc35e64a6b3abc8bde9721bd12b6b7 Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Wed, 20 Apr 2011 14:26:45 -0300
Subject: added test for number_to_phone with an empty string and area code
 true

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
---
 actionpack/test/template/number_helper_test.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'actionpack')

diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index c8d50ebf75..23a7e17e65 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -32,6 +32,7 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal("555-1234", number_to_phone(5551234))
     assert_equal("800-555-1212", number_to_phone(8005551212))
     assert_equal("(800) 555-1212", number_to_phone(8005551212, {:area_code => true}))
+    assert_equal("", number_to_phone("", {:area_code => true}))
     assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "}))
     assert_equal("(800) 555-1212 x 123", number_to_phone(8005551212, {:area_code => true, :extension => 123}))
     assert_equal("800-555-1212", number_to_phone(8005551212, :extension => "  "))
-- 
cgit v1.2.3


From 057412ce38ead06307a887dca333837a99f84f22 Mon Sep 17 00:00:00 2001
From: Chad Krsek <chad.krsek@gmail.com>
Date: Mon, 25 Apr 2011 21:57:28 -0700
Subject: asset helpers should understand scheme-relative URLs

---
 actionpack/lib/action_view/helpers/asset_paths.rb | 11 +++++++++--
 actionpack/test/template/asset_tag_helper_test.rb | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 55a4c442fd..0429e60cd5 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -12,13 +12,13 @@ module ActionView
         @controller = controller
       end
 
-      # Add the extension +ext+ if not present. Return full URLs otherwise untouched.
+      # Add the extension +ext+ if not present. Return full or scheme-relative 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)
         source = source.to_s
-        return source if is_uri?(source)
+        return source if is_uri?(source) || is_scheme_relative_uri?(source)
 
         source = rewrite_extension(source, dir, ext) if ext
         source = "/#{dir}/#{source}" unless source[0] == ?/
@@ -36,6 +36,13 @@ module ActionView
         path =~ %r{^[-a-z]+://|^cid:}
       end
 
+      # A URI relative to a base URI's scheme?
+      # See http://labs.apache.org/webarch/uri/rfc/rfc3986.html#relative-normal
+      # "//g" => "http://g"
+      def is_scheme_relative_uri?(path)
+        path =~ %r{^//}
+      end
+
     private
 
       def rewrite_extension(source, dir, ext)
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 4a93def5a8..2abc806e97 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -66,6 +66,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(auto_discovery_link_tag(:xml)) => %(<link href="http://www.example.com" rel="alternate" title="XML" type="application/xml" />),
     %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:rss, "//localhost/feed")) => %(<link href="//localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(nil, {}, {:type => "text/html"})) => %(<link href="http://www.example.com" rel="alternate" title="" type="text/html" />),
@@ -100,6 +101,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     %(javascript_include_tag("http://example.com/all")) => %(<script src="http://example.com/all" type="text/javascript"></script>),
     %(javascript_include_tag("http://example.com/all.js")) => %(<script src="http://example.com/all.js" type="text/javascript"></script>),
+    %(javascript_include_tag("//example.com/all.js")) => %(<script src="//example.com/all.js" type="text/javascript"></script>),
   }
 
   StylePathToTag = {
@@ -129,6 +131,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag("http://www.example.com/styles/style.css")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("//www.example.com/styles/style.css")) => %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
   }
 
   ImagePathToTag = {
@@ -157,6 +160,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_tag("slash..png")) => %(<img alt="Slash." src="/images/slash..png" />),
     %(image_tag(".pdf.png")) => %(<img alt=".pdf" src="/images/.pdf.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
+    %(image_tag("//www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="//www.rubyonrails.com/images/rails.png" />),
     %(image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :alt => nil)) => %(<img src="/images/mouse.png" />)
@@ -195,6 +199,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi" />),
     %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi" />),
     %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov" />),
+    %(video_tag("//media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="//media.rubyonrails.org/video/rails_blog_2.mov" />),
     %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="multiple.ogg" /><source src="multiple.avi" /></video>),
     %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="multiple.ogg" /><source src="multiple.avi" /></video>)
   }
@@ -217,6 +222,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(audio_tag("xml.wav")) => %(<audio src="/audios/xml.wav" />),
     %(audio_tag("rss.wav", :autoplay => true, :controls => true)) => %(<audio autoplay="autoplay" controls="controls" src="/audios/rss.wav" />),
     %(audio_tag("http://media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="http://media.rubyonrails.org/audio/rails_blog_2.mov" />),
+    %(audio_tag("//media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="//media.rubyonrails.org/audio/rails_blog_2.mov" />),
   }
 
   def test_auto_discovery_link_tag
@@ -505,6 +511,10 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="http://www.example.com/rails.png" />), image_tag("http://www.example.com/rails.png")
   end
 
+  def test_should_skip_asset_id_on_scheme_relative_url
+    assert_equal %(<img alt="Rails" src="//www.example.com/rails.png" />), image_tag("//www.example.com/rails.png")
+  end
+
   def test_should_use_preset_asset_id
     ENV["RAILS_ASSET_ID"] = "4500"
     assert_equal %(<img alt="Rails" src="/images/rails.png?4500" />), image_tag("rails.png")
@@ -1095,6 +1105,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
   end
 
+  def test_should_ignore_asset_host_on_scheme_relative_url
+    @controller.config.asset_host = "http://assets.example.com"
+    assert_dom_equal(%(<link href="//bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("//bar.example.com/stylesheets/style.css"))
+  end
+
   def test_should_wildcard_asset_host_between_zero_and_four
     @controller.config.asset_host = 'http://a%d.example.com'
     assert_match(%r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png'))
-- 
cgit v1.2.3


From 7469041c59724163a9108b037f0965469282b70c Mon Sep 17 00:00:00 2001
From: Chad Krsek <chad.krsek@gmail.com>
Date: Mon, 25 Apr 2011 21:57:49 -0700
Subject: Revert "asset helpers should understand scheme-relative URLs"

This reverts commit 057412ce38ead06307a887dca333837a99f84f22.
---
 actionpack/lib/action_view/helpers/asset_paths.rb | 11 ++---------
 actionpack/test/template/asset_tag_helper_test.rb | 15 ---------------
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 0429e60cd5..55a4c442fd 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -12,13 +12,13 @@ module ActionView
         @controller = controller
       end
 
-      # Add the extension +ext+ if not present. Return full or scheme-relative URLs otherwise untouched.
+      # Add 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)
         source = source.to_s
-        return source if is_uri?(source) || is_scheme_relative_uri?(source)
+        return source if is_uri?(source)
 
         source = rewrite_extension(source, dir, ext) if ext
         source = "/#{dir}/#{source}" unless source[0] == ?/
@@ -36,13 +36,6 @@ module ActionView
         path =~ %r{^[-a-z]+://|^cid:}
       end
 
-      # A URI relative to a base URI's scheme?
-      # See http://labs.apache.org/webarch/uri/rfc/rfc3986.html#relative-normal
-      # "//g" => "http://g"
-      def is_scheme_relative_uri?(path)
-        path =~ %r{^//}
-      end
-
     private
 
       def rewrite_extension(source, dir, ext)
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 2abc806e97..4a93def5a8 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -66,7 +66,6 @@ class AssetTagHelperTest < ActionView::TestCase
     %(auto_discovery_link_tag(:xml)) => %(<link href="http://www.example.com" rel="alternate" title="XML" type="application/xml" />),
     %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
-    %(auto_discovery_link_tag(:rss, "//localhost/feed")) => %(<link href="//localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(nil, {}, {:type => "text/html"})) => %(<link href="http://www.example.com" rel="alternate" title="" type="text/html" />),
@@ -101,7 +100,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
     %(javascript_include_tag("http://example.com/all")) => %(<script src="http://example.com/all" type="text/javascript"></script>),
     %(javascript_include_tag("http://example.com/all.js")) => %(<script src="http://example.com/all.js" type="text/javascript"></script>),
-    %(javascript_include_tag("//example.com/all.js")) => %(<script src="//example.com/all.js" type="text/javascript"></script>),
   }
 
   StylePathToTag = {
@@ -131,7 +129,6 @@ class AssetTagHelperTest < ActionView::TestCase
 
     %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag("http://www.example.com/styles/style.css")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
-    %(stylesheet_link_tag("//www.example.com/styles/style.css")) => %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
   }
 
   ImagePathToTag = {
@@ -160,7 +157,6 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_tag("slash..png")) => %(<img alt="Slash." src="/images/slash..png" />),
     %(image_tag(".pdf.png")) => %(<img alt=".pdf" src="/images/.pdf.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
-    %(image_tag("//www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="//www.rubyonrails.com/images/rails.png" />),
     %(image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :alt => nil)) => %(<img src="/images/mouse.png" />)
@@ -199,7 +195,6 @@ class AssetTagHelperTest < ActionView::TestCase
     %(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi" />),
     %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi" />),
     %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov" />),
-    %(video_tag("//media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="//media.rubyonrails.org/video/rails_blog_2.mov" />),
     %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="multiple.ogg" /><source src="multiple.avi" /></video>),
     %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="multiple.ogg" /><source src="multiple.avi" /></video>)
   }
@@ -222,7 +217,6 @@ class AssetTagHelperTest < ActionView::TestCase
     %(audio_tag("xml.wav")) => %(<audio src="/audios/xml.wav" />),
     %(audio_tag("rss.wav", :autoplay => true, :controls => true)) => %(<audio autoplay="autoplay" controls="controls" src="/audios/rss.wav" />),
     %(audio_tag("http://media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="http://media.rubyonrails.org/audio/rails_blog_2.mov" />),
-    %(audio_tag("//media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="//media.rubyonrails.org/audio/rails_blog_2.mov" />),
   }
 
   def test_auto_discovery_link_tag
@@ -511,10 +505,6 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="http://www.example.com/rails.png" />), image_tag("http://www.example.com/rails.png")
   end
 
-  def test_should_skip_asset_id_on_scheme_relative_url
-    assert_equal %(<img alt="Rails" src="//www.example.com/rails.png" />), image_tag("//www.example.com/rails.png")
-  end
-
   def test_should_use_preset_asset_id
     ENV["RAILS_ASSET_ID"] = "4500"
     assert_equal %(<img alt="Rails" src="/images/rails.png?4500" />), image_tag("rails.png")
@@ -1105,11 +1095,6 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
   end
 
-  def test_should_ignore_asset_host_on_scheme_relative_url
-    @controller.config.asset_host = "http://assets.example.com"
-    assert_dom_equal(%(<link href="//bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("//bar.example.com/stylesheets/style.css"))
-  end
-
   def test_should_wildcard_asset_host_between_zero_and_four
     @controller.config.asset_host = 'http://a%d.example.com'
     assert_match(%r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png'))
-- 
cgit v1.2.3


From a5b0f7064c0b74f4e007d8536afb8976d10fd49d Mon Sep 17 00:00:00 2001
From: Sven Fuchs <svenfuchs@artweb-design.de>
Date: Sun, 24 Apr 2011 17:37:57 +0200
Subject: bump the i18n gem to 0.6.0beta1 and update docs for the i18n
 exception handler [#6739 state:committed]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/actionpack.gemspec                            | 2 +-
 actionpack/lib/action_view/helpers/translation_helper.rb | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index d3c66800d9..f771737779 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activemodel',      version)
   s.add_dependency('rack-cache',       '~> 1.0.0')
   s.add_dependency('builder',          '~> 3.0.0')
-  s.add_dependency('i18n',             '~> 0.5.0')
+  s.add_dependency('i18n',             '~> 0.6.0beta1')
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.7')
   s.add_dependency('rack-mount',       '~> 0.7.1')
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 59e6ce878f..26ebae6546 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -5,7 +5,7 @@ module I18n
   class ExceptionHandler
     include Module.new {
       def call(exception, locale, key, options)
-        exception.is_a?(MissingTranslationData) ? super.html_safe : super
+        exception.is_a?(MissingTranslation) ? super.html_safe : super
       end
     }
   end
@@ -17,8 +17,8 @@ module ActionView
     module TranslationHelper
       # Delegates to I18n#translate but also performs three additional functions.
       #
-      # First, it'll pass the :rescue_format => :html option to I18n so that any caught
-      # MissingTranslationData exceptions will be turned into inline spans that
+      # First, it'll pass the :rescue_format => :html option to I18n so that any
+      # thrown MissingTranslation messages will be turned into inline spans that
       #
       #   * have a "translation-missing" class set,
       #   * contain the missing key as a title attribute and
-- 
cgit v1.2.3


From b49a1192d3d7f2dffff742fc154c8b3d2533b621 Mon Sep 17 00:00:00 2001
From: Chad Krsek <chad.krsek@gmail.com>
Date: Mon, 25 Apr 2011 21:57:28 -0700
Subject: asset helpers should understand scheme-relative URLs

---
 actionpack/lib/action_view/helpers/asset_paths.rb | 11 +++++++++--
 actionpack/test/template/asset_tag_helper_test.rb | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 55a4c442fd..0429e60cd5 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -12,13 +12,13 @@ module ActionView
         @controller = controller
       end
 
-      # Add the extension +ext+ if not present. Return full URLs otherwise untouched.
+      # Add the extension +ext+ if not present. Return full or scheme-relative 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)
         source = source.to_s
-        return source if is_uri?(source)
+        return source if is_uri?(source) || is_scheme_relative_uri?(source)
 
         source = rewrite_extension(source, dir, ext) if ext
         source = "/#{dir}/#{source}" unless source[0] == ?/
@@ -36,6 +36,13 @@ module ActionView
         path =~ %r{^[-a-z]+://|^cid:}
       end
 
+      # A URI relative to a base URI's scheme?
+      # See http://labs.apache.org/webarch/uri/rfc/rfc3986.html#relative-normal
+      # "//g" => "http://g"
+      def is_scheme_relative_uri?(path)
+        path =~ %r{^//}
+      end
+
     private
 
       def rewrite_extension(source, dir, ext)
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 4a93def5a8..2abc806e97 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -66,6 +66,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(auto_discovery_link_tag(:xml)) => %(<link href="http://www.example.com" rel="alternate" title="XML" type="application/xml" />),
     %(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, "http://localhost/feed")) => %(<link href="http://localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
+    %(auto_discovery_link_tag(:rss, "//localhost/feed")) => %(<link href="//localhost/feed" rel="alternate" title="RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {:action => "feed"}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(:rss, {}, {:title => "My RSS"})) => %(<link href="http://www.example.com" rel="alternate" title="My RSS" type="application/rss+xml" />),
     %(auto_discovery_link_tag(nil, {}, {:type => "text/html"})) => %(<link href="http://www.example.com" rel="alternate" title="" type="text/html" />),
@@ -100,6 +101,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     %(javascript_include_tag("http://example.com/all")) => %(<script src="http://example.com/all" type="text/javascript"></script>),
     %(javascript_include_tag("http://example.com/all.js")) => %(<script src="http://example.com/all.js" type="text/javascript"></script>),
+    %(javascript_include_tag("//example.com/all.js")) => %(<script src="//example.com/all.js" type="text/javascript"></script>),
   }
 
   StylePathToTag = {
@@ -129,6 +131,7 @@ class AssetTagHelperTest < ActionView::TestCase
 
     %(stylesheet_link_tag("http://www.example.com/styles/style")) => %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" type="text/css" />),
     %(stylesheet_link_tag("http://www.example.com/styles/style.css")) => %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
+    %(stylesheet_link_tag("//www.example.com/styles/style.css")) => %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" type="text/css" />),
   }
 
   ImagePathToTag = {
@@ -157,6 +160,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(image_tag("slash..png")) => %(<img alt="Slash." src="/images/slash..png" />),
     %(image_tag(".pdf.png")) => %(<img alt=".pdf" src="/images/.pdf.png" />),
     %(image_tag("http://www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="http://www.rubyonrails.com/images/rails.png" />),
+    %(image_tag("//www.rubyonrails.com/images/rails.png")) => %(<img alt="Rails" src="//www.rubyonrails.com/images/rails.png" />),
     %(image_tag("mouse.png", :mouseover => "/images/mouse_over.png")) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))) => %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
     %(image_tag("mouse.png", :alt => nil)) => %(<img src="/images/mouse.png" />)
@@ -195,6 +199,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(video_tag("error.avi", "size" => "100 x 100")) => %(<video src="/videos/error.avi" />),
     %(video_tag("error.avi", "size" => "x")) => %(<video src="/videos/error.avi" />),
     %(video_tag("http://media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="http://media.rubyonrails.org/video/rails_blog_2.mov" />),
+    %(video_tag("//media.rubyonrails.org/video/rails_blog_2.mov")) => %(<video src="//media.rubyonrails.org/video/rails_blog_2.mov" />),
     %(video_tag(["multiple.ogg", "multiple.avi"])) => %(<video><source src="multiple.ogg" /><source src="multiple.avi" /></video>),
     %(video_tag(["multiple.ogg", "multiple.avi"], :size => "160x120", :controls => true)) => %(<video controls="controls" height="120" width="160"><source src="multiple.ogg" /><source src="multiple.avi" /></video>)
   }
@@ -217,6 +222,7 @@ class AssetTagHelperTest < ActionView::TestCase
     %(audio_tag("xml.wav")) => %(<audio src="/audios/xml.wav" />),
     %(audio_tag("rss.wav", :autoplay => true, :controls => true)) => %(<audio autoplay="autoplay" controls="controls" src="/audios/rss.wav" />),
     %(audio_tag("http://media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="http://media.rubyonrails.org/audio/rails_blog_2.mov" />),
+    %(audio_tag("//media.rubyonrails.org/audio/rails_blog_2.mov")) => %(<audio src="//media.rubyonrails.org/audio/rails_blog_2.mov" />),
   }
 
   def test_auto_discovery_link_tag
@@ -505,6 +511,10 @@ class AssetTagHelperTest < ActionView::TestCase
     assert_equal %(<img alt="Rails" src="http://www.example.com/rails.png" />), image_tag("http://www.example.com/rails.png")
   end
 
+  def test_should_skip_asset_id_on_scheme_relative_url
+    assert_equal %(<img alt="Rails" src="//www.example.com/rails.png" />), image_tag("//www.example.com/rails.png")
+  end
+
   def test_should_use_preset_asset_id
     ENV["RAILS_ASSET_ID"] = "4500"
     assert_equal %(<img alt="Rails" src="/images/rails.png?4500" />), image_tag("rails.png")
@@ -1095,6 +1105,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(<link href="http://bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("http://bar.example.com/stylesheets/style.css"))
   end
 
+  def test_should_ignore_asset_host_on_scheme_relative_url
+    @controller.config.asset_host = "http://assets.example.com"
+    assert_dom_equal(%(<link href="//bar.example.com/stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" />), stylesheet_link_tag("//bar.example.com/stylesheets/style.css"))
+  end
+
   def test_should_wildcard_asset_host_between_zero_and_four
     @controller.config.asset_host = 'http://a%d.example.com'
     assert_match(%r(http://a[0123].example.com/collaboration/hieraki/images/xml.png), image_path('xml.png'))
-- 
cgit v1.2.3


From c15108ce063f6396a6e93a54e973b858d0280d41 Mon Sep 17 00:00:00 2001
From: Chad Krsek <chad.krsek@gmail.com>
Date: Tue, 26 Apr 2011 11:50:08 -0700
Subject: moving check fo scheme-relative URI into is_uri?

---
 actionpack/lib/action_view/helpers/asset_paths.rb | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index 0429e60cd5..cb6737b94e 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -18,7 +18,7 @@ module ActionView
       # asset host, if configured, with the correct request protocol.
       def compute_public_path(source, dir, ext = nil, include_host = true)
         source = source.to_s
-        return source if is_uri?(source) || is_scheme_relative_uri?(source)
+        return source if is_uri?(source)
 
         source = rewrite_extension(source, dir, ext) if ext
         source = "/#{dir}/#{source}" unless source[0] == ?/
@@ -33,14 +33,7 @@ module ActionView
       end
 
       def is_uri?(path)
-        path =~ %r{^[-a-z]+://|^cid:}
-      end
-
-      # A URI relative to a base URI's scheme?
-      # See http://labs.apache.org/webarch/uri/rfc/rfc3986.html#relative-normal
-      # "//g" => "http://g"
-      def is_scheme_relative_uri?(path)
-        path =~ %r{^//}
+        path =~ %r{^[-a-z]+://|^cid:|^//}
       end
 
     private
-- 
cgit v1.2.3


From 9f6cafd5fd43b551f30b28d276713791c5098b3c Mon Sep 17 00:00:00 2001
From: misfo <tedwardo2@gmail.com>
Date: Tue, 8 Feb 2011 12:08:35 +0800
Subject: prevent errors when passing a frozen string as a param to
 ActionController::TestCase#process

since ActionDispatch::Http::Parameters#encode_params will force encoding on all params strings (when using an encoding aware Ruby), dup all strings passed into process.  This prevents modification of params passed in and, more importantly, doesn't barf when a frozen string is passed
thanks and high fives to kinsteronline
---
 actionpack/lib/action_controller/test_case.rb |  4 +++-
 actionpack/test/controller/test_test.rb       | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index bc4f8bb9ce..0085f542aa 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -147,7 +147,9 @@ module ActionController
         if value.is_a? Fixnum
           value = value.to_s
         elsif value.is_a? Array
-          value = Result.new(value)
+          value = Result.new(value.map { |v| v.is_a?(String) ? v.dup : v })
+        elsif value.is_a? String
+          value = value.dup
         end
 
         if extra_keys.include?(key.to_sym)
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index edda0d0a30..5896222a0a 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -493,6 +493,18 @@ XML
     )
   end
 
+  def test_params_passing_with_frozen_values
+    assert_nothing_raised do
+      get :test_params, :frozen => 'icy'.freeze, :frozens => ['icy'.freeze].freeze
+    end
+    parsed_params = eval(@response.body)
+    assert_equal(
+      {'controller' => 'test_test/test', 'action' => 'test_params',
+       'frozen' => 'icy', 'frozens' => ['icy']},
+      parsed_params
+    )
+  end
+
   def test_id_converted_to_string
     get :test_params, :id => 20, :foo => Object.new
     assert_kind_of String, @request.path_parameters['id']
-- 
cgit v1.2.3


From 07bbaaa3b14d7048a3e43851aed199b8b515a820 Mon Sep 17 00:00:00 2001
From: Diego Carrion <dc.rec1@gmail.com>
Date: Wed, 27 Apr 2011 20:29:03 -0300
Subject: added a :prefix option to number_to_human_size

---
 actionpack/lib/action_view/helpers/number_helper.rb |  9 ++++++---
 actionpack/test/template/number_helper_test.rb      | 11 +++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index b545031fcc..63d13a0f0b 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -304,6 +304,7 @@ module ActionView
       # * <tt>:separator</tt>  - Sets the separator between the fractional and integer digits (defaults to ".").
       # * <tt>:delimiter</tt>  - Sets the thousands delimiter (defaults to "").
       # * <tt>:strip_insignificant_zeros</tt>  - If +true+ removes insignificant zeros after the decimal separator (defaults to +true+)
+      # * <tt>:prefix</tt>  - If +:si+ formats the number using the SI prefix (defaults to :binary)
       # ==== Examples
       #  number_to_human_size(123)                                          # => 123 Bytes
       #  number_to_human_size(1234)                                         # => 1.21 KB
@@ -341,15 +342,17 @@ module ActionView
         options[:strip_insignificant_zeros] = true if not options.key?(:strip_insignificant_zeros)
 
         storage_units_format = I18n.translate(:'number.human.storage_units.format', :locale => options[:locale], :raise => true)
+        
+        base = options[:prefix] == :si ? 1000 : 1024
 
-        if number.to_i < 1024
+        if number.to_i < base
           unit = I18n.translate(:'number.human.storage_units.units.byte', :locale => options[:locale], :count => number.to_i, :raise => true)
           storage_units_format.gsub(/%n/, number.to_i.to_s).gsub(/%u/, unit).html_safe
         else
           max_exp  = STORAGE_UNITS.size - 1
-          exponent = (Math.log(number) / Math.log(1024)).to_i # Convert to base 1024
+          exponent = (Math.log(number) / Math.log(base)).to_i # Convert to base
           exponent = max_exp if exponent > max_exp # we need this to avoid overflow for the highest unit
-          number  /= 1024 ** exponent
+          number  /= base ** exponent
 
           unit_key = STORAGE_UNITS[exponent]
           unit = I18n.translate(:"number.human.storage_units.units.#{unit_key}", :locale => options[:locale], :count => number, :raise => true)
diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb
index 23a7e17e65..63b92aadf4 100644
--- a/actionpack/test/template/number_helper_test.rb
+++ b/actionpack/test/template/number_helper_test.rb
@@ -172,6 +172,17 @@ class NumberHelperTest < ActionView::TestCase
     assert_equal '10 Bytes', number_to_human_size(10)
   end
 
+  def test_number_to_human_size_with_si_prefix
+    assert_equal '3 Bytes',    number_to_human_size(3.14159265, :prefix => :si)
+    assert_equal '123 Bytes',  number_to_human_size(123.0, :prefix => :si)
+    assert_equal '123 Bytes',  number_to_human_size(123, :prefix => :si)
+    assert_equal '1.23 KB',    number_to_human_size(1234, :prefix => :si)
+    assert_equal '12.3 KB',    number_to_human_size(12345, :prefix => :si)
+    assert_equal '1.23 MB',    number_to_human_size(1234567, :prefix => :si)
+    assert_equal '1.23 GB',    number_to_human_size(1234567890, :prefix => :si)
+    assert_equal '1.23 TB',    number_to_human_size(1234567890123, :prefix => :si)
+  end
+
   def test_number_to_human_size_with_options_hash
     assert_equal '1.2 MB',   number_to_human_size(1234567, :precision => 2)
     assert_equal '3 Bytes',   number_to_human_size(3.14159265, :precision => 4)
-- 
cgit v1.2.3


From a07cee62c7d23ec587ef961beb35ce3ac63df340 Mon Sep 17 00:00:00 2001
From: Jason Garber <jg@jasongarber.com>
Date: Wed, 27 Apr 2011 21:00:27 -0600
Subject: Allow a label with the value option to have value-specific
 translations.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 440acafa88..efe30441b1 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -947,7 +947,8 @@ module ActionView
           label_tag(name_and_id["id"], options, &block)
         else
           content = if text.blank?
-            I18n.t("helpers.label.#{object_name}.#{method_name}", :default => "").presence
+            method_and_value = tag_value.present? ? "#{method_name}.#{tag_value}" : method_name
+            I18n.t("helpers.label.#{object_name}.#{method_and_value}", :default => "").presence
           else
             text.to_s
           end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 7afab3179c..c25c850eb3 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -24,7 +24,10 @@ class FormHelperTest < ActionView::TestCase
       :helpers => {
         :label => {
           :post => {
-            :body => "Write entire text here"
+            :body => "Write entire text here",
+            :color => {
+              :red => "Rojo"
+            }
           }
         }
       }
@@ -141,6 +144,13 @@ class FormHelperTest < ActionView::TestCase
     I18n.locale = old_locale
   end
 
+  def test_label_with_locales_and_value
+    old_locale, I18n.locale = I18n.locale, :label
+    assert_dom_equal('<label for="post_color_red">Rojo</label>', label(:post, :color, :value => "red"))
+  ensure
+    I18n.locale = old_locale
+  end
+
   def test_label_with_for_attribute_as_symbol
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
   end
-- 
cgit v1.2.3


From 502aaec92c9e15f1b784de4d2eee97f7c659069e Mon Sep 17 00:00:00 2001
From: Neeraj Singh <neerajdotname@gmail.com>
Date: Thu, 28 Apr 2011 06:35:58 -0400
Subject: upgrade rack-mount

Newer version is a few minor performance fixes
---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index f771737779..0d667a76a7 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency('i18n',             '~> 0.6.0beta1')
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.7')
-  s.add_dependency('rack-mount',       '~> 0.7.1')
+  s.add_dependency('rack-mount',       '~> 0.7.2')
   s.add_dependency('tzinfo',           '~> 0.3.23')
   s.add_dependency('erubis',           '~> 2.7.0')
 end
-- 
cgit v1.2.3


From a869382a9fa241f72a7a73d4a9738531c4c37ba5 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 29 Apr 2011 01:49:45 +0530
Subject: Allow AM/PM in datetime selectors

---
 actionpack/lib/action_view/helpers/date_helper.rb | 35 +++++++++++++++
 actionpack/test/template/date_helper_test.rb      | 55 +++++++++++++++++++++++
 2 files changed, 90 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 9277359d5c..7e8ad54d5f 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -468,6 +468,9 @@ module ActionView
       #   # generic prompt.
       #   select_hour(13, :prompt => 'Choose hour')
       #
+      #   # Generate a select field for hours in the AM/PM format
+      #   select_hour(my_time, :ampm => true)
+      #
       def select_hour(datetime, options = {}, html_options = {})
         DateTimeSelector.new(datetime, options, html_options).select_hour
       end
@@ -600,6 +603,18 @@ module ActionView
       POSITION = {
         :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6
       }.freeze
+      ampm = ["AM","PM"].map do |s|
+        ["12 #{s}"] + (1..11).map{|x| "#{sprintf('%02d',x)} #{s}"}
+      end.flatten
+
+      AMPM_TRANSLATION = Hash[
+        [[0, "12 AM"], [1, "01 AM"], [2, "02 AM"], [3, "03 AM"],
+         [4, "04 AM"], [5, "05 AM"], [6, "06 AM"], [7, "07 AM"],
+         [8, "08 AM"], [9, "09 AM"], [10, "10 AM"], [11, "11 AM"],
+         [12, "12 PM"], [13, "01 PM"], [14, "02 PM"], [15, "03 PM"],
+         [16, "04 PM"], [17, "05 PM"], [18, "06 PM"], [19, "07 PM"],
+         [20, "08 PM"], [21, "09 PM"], [22, "10 PM"], [23, "11 PM"]]
+      ].freeze
 
       def initialize(datetime, options = {}, html_options = {})
         @options      = options.dup
@@ -691,6 +706,8 @@ module ActionView
       def select_hour
         if @options[:use_hidden] || @options[:discard_hour]
           build_hidden(:hour, hour)
+        elsif @options[:ampm]
+          build_select(:hour, build_ampm_options(hour, :end => 23))
         else
           build_options_and_select(:hour, hour, :end => 23)
         end
@@ -801,6 +818,24 @@ module ActionView
           build_select(type, build_options(selected, options))
         end
 
+        def build_ampm_options(selected, options = {})
+          start         = options.delete(:start) || 0
+          stop          = options.delete(:end) || 23
+          step          = options.delete(:step) || 1
+          options.reverse_merge!({:leading_zeros => true})
+          leading_zeros = options.delete(:leading_zeros)
+
+          select_options = []
+          start.step(stop, step) do |i|
+            text = AMPM_TRANSLATION[i]
+            value = leading_zeros ? sprintf("%02d", i) : i
+            tag_options = { :value => value }
+            tag_options[:selected] = "selected" if selected == i
+            select_options << content_tag(:option, text, tag_options)
+          end
+          (select_options.join("\n") + "\n").html_safe
+        end
+
         # Build select option html from date value and options
         #  build_options(15, :start => 1, :end => 31)
         #  => "<option value="1">1</option>
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 12d2410f49..a47a7a9b1f 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -416,6 +416,14 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18))
   end
 
+  def test_select_hour_with_ampm
+    expected = %(<select id="date_hour" name="date[hour]">\n)
+    expected << %(<option value="00">12 AM</option>\n<option value="01">01 AM</option>\n<option value="02">02 AM</option>\n<option value="03">03 AM</option>\n<option value="04">04 AM</option>\n<option value="05">05 AM</option>\n<option value="06">06 AM</option>\n<option value="07">07 AM</option>\n<option value="08" selected="selected">08 AM</option>\n<option value="09">09 AM</option>\n<option value="10">10 AM</option>\n<option value="11">11 AM</option>\n<option value="12">12 PM</option>\n<option value="13">01 PM</option>\n<option value="14">02 PM</option>\n<option value="15">03 PM</option>\n<option value="16">04 PM</option>\n<option value="17">05 PM</option>\n<option value="18">06 PM</option>\n<option value="19">07 PM</option>\n<option value="20">08 PM</option>\n<option value="21">09 PM</option>\n<option value="22">10 PM</option>\n<option value="23">11 PM</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_hour(Time.mktime(2003, 8, 16, 8, 4, 18), :ampm => true)
+  end
+
   def test_select_hour_with_disabled
     expected = %(<select id="date_hour" name="date[hour]" disabled="disabled">\n)
     expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08" selected="selected">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n)
@@ -937,6 +945,35 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]")
   end
 
+  def test_select_datetime_with_ampm
+    expected =  %(<select id="date_first_year" name="date[first][year]">\n)
+    expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_month" name="date[first][month]">\n)
+    expected << %(<option value="1">January</option>\n<option value="2">February</option>\n<option value="3">March</option>\n<option value="4">April</option>\n<option value="5">May</option>\n<option value="6">June</option>\n<option value="7">July</option>\n<option value="8" selected="selected">August</option>\n<option value="9">September</option>\n<option value="10">October</option>\n<option value="11">November</option>\n<option value="12">December</option>\n)
+    expected << "</select>\n"
+
+    expected << %(<select id="date_first_day" name="date[first][day]">\n)
+    expected << %(<option value="1">1</option>\n<option value="2">2</option>\n<option value="3">3</option>\n<option value="4">4</option>\n<option value="5">5</option>\n<option value="6">6</option>\n<option value="7">7</option>\n<option value="8">8</option>\n<option value="9">9</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16" selected="selected">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<option value="24">24</option>\n<option value="25">25</option>\n<option value="26">26</option>\n<option value="27">27</option>\n<option value="28">28</option>\n<option value="29">29</option>\n<option value="30">30</option>\n<option value="31">31</option>\n)
+    expected << "</select>\n"
+
+    expected << " &mdash; "
+
+    expected << %(<select id="date_first_hour" name="date[first][hour]">\n)
+    expected << %(<option value="00">12 AM</option>\n<option value="01">01 AM</option>\n<option value="02">02 AM</option>\n<option value="03">03 AM</option>\n<option value="04">04 AM</option>\n<option value="05">05 AM</option>\n<option value="06">06 AM</option>\n<option value="07">07 AM</option>\n<option value="08" selected="selected">08 AM</option>\n<option value="09">09 AM</option>\n<option value="10">10 AM</option>\n<option value="11">11 AM</option>\n<option value="12">12 PM</option>\n<option value="13">01 PM</option>\n<option value="14">02 PM</option>\n<option value="15">03 PM</option>\n<option value="16">04 PM</option>\n<option value="17">05 PM</option>\n<option value="18">06 PM</option>\n<option value="19">07 PM</option>\n<option value="20">08 PM</option>\n<option value="21">09 PM</option>\n<option value="22">10 PM</option>\n<option value="23">11 PM</option>\n)
+    expected << "</select>\n"
+
+    expected << " : "
+
+    expected << %(<select id="date_first_minute" name="date[first][minute]">\n)
+    expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<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<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_datetime(Time.mktime(2003, 8, 16, 8, 4, 18), :start_year => 2003, :end_year => 2005, :prefix => "date[first]", :ampm => true)
+  end
+
+
   def test_select_datetime_with_separators
     expected =  %(<select id="date_first_year" name="date[first][year]">\n)
     expected << %(<option value="2003" selected="selected">2003</option>\n<option value="2004">2004</option>\n<option value="2005">2005</option>\n)
@@ -1136,6 +1173,24 @@ class DateHelperTest < ActionView::TestCase
     assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => false)
   end
 
+  def test_select_time_with_ampm
+    expected = %(<input name="date[year]" id="date_year" value="2003" type="hidden" />\n)
+    expected << %(<input name="date[month]" id="date_month" value="8" type="hidden" />\n)
+    expected << %(<input name="date[day]" id="date_day" value="16" type="hidden" />\n)
+
+    expected << %(<select id="date_hour" name="date[hour]">\n)
+    expected << %(<option value="00">12 AM</option>\n<option value="01">01 AM</option>\n<option value="02">02 AM</option>\n<option value="03">03 AM</option>\n<option value="04">04 AM</option>\n<option value="05">05 AM</option>\n<option value="06">06 AM</option>\n<option value="07">07 AM</option>\n<option value="08" selected="selected">08 AM</option>\n<option value="09">09 AM</option>\n<option value="10">10 AM</option>\n<option value="11">11 AM</option>\n<option value="12">12 PM</option>\n<option value="13">01 PM</option>\n<option value="14">02 PM</option>\n<option value="15">03 PM</option>\n<option value="16">04 PM</option>\n<option value="17">05 PM</option>\n<option value="18">06 PM</option>\n<option value="19">07 PM</option>\n<option value="20">08 PM</option>\n<option value="21">09 PM</option>\n<option value="22">10 PM</option>\n<option value="23">11 PM</option>\n)
+    expected << "</select>\n"
+
+    expected << " : "
+
+    expected << %(<select id="date_minute" name="date[minute]">\n)
+    expected << %(<option value="00">00</option>\n<option value="01">01</option>\n<option value="02">02</option>\n<option value="03">03</option>\n<option value="04" selected="selected">04</option>\n<option value="05">05</option>\n<option value="06">06</option>\n<option value="07">07</option>\n<option value="08">08</option>\n<option value="09">09</option>\n<option value="10">10</option>\n<option value="11">11</option>\n<option value="12">12</option>\n<option value="13">13</option>\n<option value="14">14</option>\n<option value="15">15</option>\n<option value="16">16</option>\n<option value="17">17</option>\n<option value="18">18</option>\n<option value="19">19</option>\n<option value="20">20</option>\n<option value="21">21</option>\n<option value="22">22</option>\n<option value="23">23</option>\n<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<option value="32">32</option>\n<option value="33">33</option>\n<option value="34">34</option>\n<option value="35">35</option>\n<option value="36">36</option>\n<option value="37">37</option>\n<option value="38">38</option>\n<option value="39">39</option>\n<option value="40">40</option>\n<option value="41">41</option>\n<option value="42">42</option>\n<option value="43">43</option>\n<option value="44">44</option>\n<option value="45">45</option>\n<option value="46">46</option>\n<option value="47">47</option>\n<option value="48">48</option>\n<option value="49">49</option>\n<option value="50">50</option>\n<option value="51">51</option>\n<option value="52">52</option>\n<option value="53">53</option>\n<option value="54">54</option>\n<option value="55">55</option>\n<option value="56">56</option>\n<option value="57">57</option>\n<option value="58">58</option>\n<option value="59">59</option>\n)
+    expected << "</select>\n"
+
+    assert_dom_equal expected, select_time(Time.mktime(2003, 8, 16, 8, 4, 18), :include_seconds => false, :ampm => true)
+  end
+
   def test_select_time_with_separator
     expected = %(<input name="date[year]" id="date_year" value="2003" type="hidden" />\n)
     expected << %(<input name="date[month]" id="date_month" value="8" type="hidden" />\n)
-- 
cgit v1.2.3


From 610e4d9f24b8fe0c372104481a733b48d2270c3f Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 29 Apr 2011 02:03:56 +0530
Subject: add more documentation; remove unused assignment

---
 actionpack/lib/action_view/helpers/date_helper.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 7e8ad54d5f..9e1be05e6c 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -207,7 +207,8 @@ module ActionView
 
       # Returns a set of select tags (one for hour, minute and optionally second) pre-selected for accessing a
       # specified time-based attribute (identified by +method+) on an object assigned to the template (identified by
-      # +object+). You can include the seconds with <tt>:include_seconds</tt>.
+      # +object+). You can include the seconds with <tt>:include_seconds</tt>. You can get hours in the AM/PM format
+      # with <tt>:ampm</tt> option.
       #
       # This method will also generate 3 input hidden tags, for the actual year, month and day unless the option
       # <tt>:ignore_date</tt> is set to +true+.
@@ -230,6 +231,9 @@ module ActionView
       #   time_select("post", "written_on", :prompt => {:hour => true}) # generic prompt for hours
       #   time_select("post", "written_on", :prompt => true) # generic prompts for all
       #
+      #   # You can set :ampm option to true which will show the hours as: 12 PM, 01 AM .. 11 PM.
+      #   time_select 'game', 'game_time', {:ampm => true}
+      #
       # The selects are prepared for multi-parameter assignment to an Active Record object.
       #
       # Note: If the day is not included as an option but the month is, the day will be set to the 1st to ensure that
@@ -257,6 +261,9 @@ module ActionView
       #   # be stored in the trip variable in the departing attribute.
       #   datetime_select("trip", "departing", :default => 3.days.from_now)
       #
+      #   # Generate a datetime select with hours in the AM/PM format
+      #   datetime_select("post", "written_on", :ampm => true)
+      #
       #   # Generates a datetime select that discards the type that, when POSTed, will be stored in the post variable
       #   # as the written_on attribute.
       #   datetime_select("post", "written_on", :discard_type => true)
@@ -306,6 +313,9 @@ module ActionView
       #   # my_date_time (four days after today)
       #   select_datetime(my_date_time, :discard_type => true)
       #
+      #   # Generate a datetime field with hours in the AM/PM format
+      #   select_datetime(my_date_time, :ampm => true)
+      #
       #   # Generates a datetime select that defaults to the datetime in my_date_time (four days after today)
       #   # prefixed with 'payday' rather than 'date'
       #   select_datetime(my_date_time, :prefix => 'payday')
@@ -387,6 +397,9 @@ module ActionView
       #   # separated by ':' and includes an input for seconds
       #   select_time(my_time, :time_separator => ':', :include_seconds => true)
       #
+      #   # Generate a time select field with hours in the AM/PM format
+      #   select_time(my_time, :ampm => true)
+      #
       #   # Generates a time select with a custom prompt. Use :prompt=>true for generic prompts.
       #   select_time(my_time, :prompt => {:day => 'Choose day', :month => 'Choose month', :year => 'Choose year'})
       #   select_time(my_time, :prompt => {:hour => true}) # generic prompt for hours
@@ -603,9 +616,6 @@ module ActionView
       POSITION = {
         :year => 1, :month => 2, :day => 3, :hour => 4, :minute => 5, :second => 6
       }.freeze
-      ampm = ["AM","PM"].map do |s|
-        ["12 #{s}"] + (1..11).map{|x| "#{sprintf('%02d',x)} #{s}"}
-      end.flatten
 
       AMPM_TRANSLATION = Hash[
         [[0, "12 AM"], [1, "01 AM"], [2, "02 AM"], [3, "03 AM"],
-- 
cgit v1.2.3


From 8bce6e761d52afd68bb06ca9ff8222f072e06cc8 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 29 Apr 2011 10:21:16 +0530
Subject: DRY this baby up

---
 actionpack/lib/action_view/helpers/date_helper.rb | 27 ++++-------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 9e1be05e6c..080cf0a866 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -716,10 +716,8 @@ module ActionView
       def select_hour
         if @options[:use_hidden] || @options[:discard_hour]
           build_hidden(:hour, hour)
-        elsif @options[:ampm]
-          build_select(:hour, build_ampm_options(hour, :end => 23))
         else
-          build_options_and_select(:hour, hour, :end => 23)
+          build_options_and_select(:hour, hour, :end => 23, :ampm => @options[:ampm])
         end
       end
 
@@ -828,24 +826,6 @@ module ActionView
           build_select(type, build_options(selected, options))
         end
 
-        def build_ampm_options(selected, options = {})
-          start         = options.delete(:start) || 0
-          stop          = options.delete(:end) || 23
-          step          = options.delete(:step) || 1
-          options.reverse_merge!({:leading_zeros => true})
-          leading_zeros = options.delete(:leading_zeros)
-
-          select_options = []
-          start.step(stop, step) do |i|
-            text = AMPM_TRANSLATION[i]
-            value = leading_zeros ? sprintf("%02d", i) : i
-            tag_options = { :value => value }
-            tag_options[:selected] = "selected" if selected == i
-            select_options << content_tag(:option, text, tag_options)
-          end
-          (select_options.join("\n") + "\n").html_safe
-        end
-
         # Build select option html from date value and options
         #  build_options(15, :start => 1, :end => 31)
         #  => "<option value="1">1</option>
@@ -855,7 +835,7 @@ module ActionView
           start         = options.delete(:start) || 0
           stop          = options.delete(:end) || 59
           step          = options.delete(:step) || 1
-          options.reverse_merge!({:leading_zeros => true})
+          options.reverse_merge!({:leading_zeros => true, :ampm => false})
           leading_zeros = options.delete(:leading_zeros)
 
           select_options = []
@@ -863,7 +843,8 @@ module ActionView
             value = leading_zeros ? sprintf("%02d", i) : i
             tag_options = { :value => value }
             tag_options[:selected] = "selected" if selected == i
-            select_options << content_tag(:option, value, tag_options)
+            text = options[:ampm] ? AMPM_TRANSLATION[i] : value
+            select_options << content_tag(:option, text, tag_options)
           end
           (select_options.join("\n") + "\n").html_safe
         end
-- 
cgit v1.2.3


From b2aacc346c8e975cd9ab8c1b0a6b90adbb98debc Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Sat, 30 Apr 2011 03:52:06 +0200
Subject: Prototype and Scriptaculous are no longer vendored, but provided by
 prototype-rails from now on, also the -j option of the application generator
 is removed

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
index 3d815b5e1f..e1ee0d0e1a 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
@@ -99,10 +99,9 @@ module ActionView
         #
         # When passing paths, the ".js" extension is optional.
         #
-        # To include the default JavaScript expansion pass <tt>:defaults</tt> as source.
-        # By default, <tt>:defaults</tt> loads jQuery. If the application was generated
-        # with "-j prototype" the libraries Prototype and Scriptaculous are loaded instead.
-        # In any case, the defaults can be overridden in <tt>config/application.rb</tt>:
+        # If the application is not using the asset pipeline, to include the default JavaScript
+        # expansion pass <tt>:defaults</tt> as source. By default, <tt>:defaults</tt> loads jQuery,
+        # and that can be overridden in <tt>config/application.rb</tt>:
         #
         #   config.action_view.javascript_expansions[:defaults] = %w(foo.js bar.js)
         #
-- 
cgit v1.2.3


From d08f65118cc328de5493a68db33a155487f5fceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 10:33:30 +0200
Subject: Start abstracting the renderer.

---
 actionpack/lib/action_view.rb                      |   2 +-
 actionpack/lib/action_view/base.rb                 |   5 +-
 actionpack/lib/action_view/context.rb              |   6 +-
 actionpack/lib/action_view/helpers/form_helper.rb  |   5 +
 actionpack/lib/action_view/partials.rb             | 226 ---------------------
 .../lib/action_view/renderer/abstract_renderer.rb  |   4 +-
 .../lib/action_view/renderer/partial_renderer.rb   | 217 +++++++++++++++++++-
 actionpack/lib/action_view/renderer/renderer.rb    |  70 +++++++
 actionpack/lib/action_view/rendering.rb            |  46 +----
 9 files changed, 301 insertions(+), 280 deletions(-)
 delete mode 100644 actionpack/lib/action_view/partials.rb
 create mode 100644 actionpack/lib/action_view/renderer/renderer.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 4547aceb28..69c50a056c 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -34,13 +34,13 @@ module ActionView
     autoload :Context
     autoload :Helpers
     autoload :LookupContext
-    autoload :Partials
     autoload :PathSet
     autoload :Rendering
     autoload :Template
     autoload :TestCase
 
     autoload_under "renderer" do
+      autoload :Renderer
       autoload :AbstractRenderer
       autoload :PartialRenderer
       autoload :TemplateRenderer
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 87501d5b88..c1dbbe1613 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -131,7 +131,7 @@ module ActionView #:nodoc:
   #
   # More builder documentation can be found at http://builder.rubyforge.org.
   class Base
-    include Helpers, Rendering, Partials, ::ERB::Util, Context
+    include Helpers, Rendering, ::ERB::Util, Context
 
     # Specify the proc used to decorate input tags that refer to attributes with errors.
     cattr_accessor :field_error_proc
@@ -162,6 +162,7 @@ module ActionView #:nodoc:
     attr_accessor :_template, :_view_flow
     attr_internal :request, :controller, :config, :assigns, :lookup_context
 
+    # TODO Consider removing those setters once we have the renderer in place.
     delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
@@ -199,6 +200,8 @@ module ActionView #:nodoc:
       @_lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
         lookup_context : ActionView::LookupContext.new(lookup_context)
       @_lookup_context.formats = formats if formats
+
+      @_renderer = ActionView::Renderer.new(@_lookup_context, self)
     end
 
     def controller_path
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index a2a64de206..710cdc613d 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -31,10 +31,6 @@ module ActionView
   # template and provides the output buffer.
   module Context
     include CompiledTemplates
-    attr_accessor :output_buffer
-
-    def convert_to_model(object)
-      object.respond_to?(:to_model) ? object.to_model : object
-    end
+    attr_accessor :output_buffer, :view_renderer, :view_flow
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index efe30441b1..68db17c254 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -102,6 +102,11 @@ module ActionView
       include FormTagHelper
       include UrlHelper
 
+      # Converts the given object to an ActiveModel compliant one.
+      def convert_to_model(object)
+        object.respond_to?(:to_model) ? object.to_model : object
+      end
+
       # Creates a form and a scope around a specific model object that is used
       # as a base for questioning about values for the fields.
       #
diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb
deleted file mode 100644
index c181689e62..0000000000
--- a/actionpack/lib/action_view/partials.rb
+++ /dev/null
@@ -1,226 +0,0 @@
-require 'active_support/core_ext/object/blank'
-
-module ActionView
-  # = Action View Partials
-  #
-  # There's also a convenience method for rendering sub templates within the current controller that depends on a
-  # single object (we call this kind of sub templates for partials). It relies on the fact that partials should
-  # follow the naming convention of being prefixed with an underscore -- as to separate them from regular
-  # templates that could be rendered on their own.
-  #
-  # In a template for Advertiser#account:
-  #
-  #  <%= render :partial => "account" %>
-  #
-  # This would render "advertiser/_account.html.erb" and pass the instance variable @account in as a local variable
-  # +account+ to the template for display.
-  #
-  # In another template for Advertiser#buy, we could have:
-  #
-  #   <%= render :partial => "account", :locals => { :account => @buyer } %>
-  #
-  #   <% @advertisements.each do |ad| %>
-  #     <%= render :partial => "ad", :locals => { :ad => ad } %>
-  #   <% end %>
-  #
-  # This would first render "advertiser/_account.html.erb" with @buyer passed in as the local variable +account+, then
-  # render "advertiser/_ad.html.erb" and pass the local variable +ad+ to the template for display.
-  #
-  # == The :as and :object options
-  #
-  # By default <tt>ActionView::Partials::PartialRenderer</tt> has its object in a local variable with the same
-  # name as the template. So, given
-  #
-  #   <%= render :partial => "contract" %>
-  #
-  # within contract we'll get <tt>@contract</tt> in the local variable +contract+, as if we had written
-  #
-  #   <%= render :partial => "contract", :locals => { :contract  => @contract } %>
-  #
-  # With the <tt>:as</tt> option we can specify a different name for said local variable. For example, if we
-  # wanted it to be +agreement+ instead of +contract+ we'd do:
-  #
-  #   <%= render :partial => "contract", :as => 'agreement' %>
-  #
-  # The <tt>:object</tt> option can be used to directly specify which object is rendered into the partial;
-  # useful when the template's object is elsewhere, in a different ivar or in a local variable for instance.
-  #
-  # Revisiting a previous example we could have written this code:
-  #
-  #   <%= render :partial => "account", :object => @buyer %>
-  #
-  #   <% @advertisements.each do |ad| %>
-  #     <%= render :partial => "ad", :object => ad %>
-  #   <% end %>
-  #
-  # The <tt>:object</tt> and <tt>:as</tt> options can be used together.
-  #
-  # == Rendering a collection of partials
-  #
-  # The example of partial use describes a familiar pattern where a template needs to iterate over an array and
-  # render a sub template for each of the elements. This pattern has been implemented as a single method that
-  # accepts an array and renders a partial by the same name as the elements contained within. So the three-lined
-  # example in "Using partials" can be rewritten with a single line:
-  #
-  #   <%= render :partial => "ad", :collection => @advertisements %>
-  #
-  # This will render "advertiser/_ad.html.erb" and pass the local variable +ad+ to the template for display. An
-  # iteration counter will automatically be made available to the template with a name of the form
-  # +partial_name_counter+. In the case of the example above, the template would be fed +ad_counter+.
-  #
-  # The <tt>:as</tt> option may be used when rendering partials.
-  #
-  # You can specify a partial to be rendered between elements via the <tt>:spacer_template</tt> option.
-  # The following example will render <tt>advertiser/_ad_divider.html.erb</tt> between each ad partial:
-  #
-  #   <%= render :partial => "ad", :collection => @advertisements, :spacer_template => "ad_divider" %>
-  #
-  # If the given <tt>:collection</tt> is nil or empty, <tt>render</tt> will return nil. This will allow you
-  # to specify a text which will displayed instead by using this form:
-  #
-  #   <%= render(:partial => "ad", :collection => @advertisements) || "There's no ad to be displayed" %>
-  #
-  # NOTE: Due to backwards compatibility concerns, the collection can't be one of hashes. Normally you'd also
-  # just keep domain objects, like Active Records, in there.
-  #
-  # == Rendering shared partials
-  #
-  # Two controllers can share a set of partials and render them like this:
-  #
-  #   <%= render :partial => "advertisement/ad", :locals => { :ad => @advertisement } %>
-  #
-  # This will render the partial "advertisement/_ad.html.erb" regardless of which controller this is being called from.
-  #
-  # == Rendering objects with the RecordIdentifier
-  #
-  # Instead of explicitly naming the location of a partial, you can also let the RecordIdentifier do the work if
-  # you're following its conventions for RecordIdentifier#partial_path. Examples:
-  #
-  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
-  #  <%= render :partial => @account %>
-  #
-  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "posts/post", :collection => @posts %>
-  #  <%= render :partial => @posts %>
-  #
-  # == Rendering the default case
-  #
-  # If you're not going to be using any of the options like collections or layouts, you can also use the short-hand
-  # defaults of render to render partials. Examples:
-  #
-  #  # Instead of <%= render :partial => "account" %>
-  #  <%= render "account" %>
-  #
-  #  # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
-  #  <%= render "account", :account => @buyer %>
-  #
-  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
-  #  <%= render(@account) %>
-  #
-  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
-  #  # <%= render :partial => "posts/post", :collection => @posts %>
-  #  <%= render(@posts) %>
-  #
-  # == Rendering partials with layouts
-  #
-  # Partials can have their own layouts applied to them. These layouts are different than the ones that are
-  # specified globally for the entire action, but they work in a similar fashion. Imagine a list with two types
-  # of users:
-  #
-  #   <%# app/views/users/index.html.erb &>
-  #   Here's the administrator:
-  #   <%= render :partial => "user", :layout => "administrator", :locals => { :user => administrator } %>
-  #
-  #   Here's the editor:
-  #   <%= render :partial => "user", :layout => "editor", :locals => { :user => editor } %>
-  #
-  #   <%# app/views/users/_user.html.erb &>
-  #   Name: <%= user.name %>
-  #
-  #   <%# app/views/users/_administrator.html.erb &>
-  #   <div id="administrator">
-  #     Budget: $<%= user.budget %>
-  #     <%= yield %>
-  #   </div>
-  #
-  #   <%# app/views/users/_editor.html.erb &>
-  #   <div id="editor">
-  #     Deadline: <%= user.deadline %>
-  #     <%= yield %>
-  #   </div>
-  #
-  # ...this will return:
-  #
-  #   Here's the administrator:
-  #   <div id="administrator">
-  #     Budget: $<%= user.budget %>
-  #     Name: <%= user.name %>
-  #   </div>
-  #
-  #   Here's the editor:
-  #   <div id="editor">
-  #     Deadline: <%= user.deadline %>
-  #     Name: <%= user.name %>
-  #   </div>
-  #
-  # You can also apply a layout to a block within any template:
-  #
-  #   <%# app/views/users/_chief.html.erb &>
-  #   <%= render(:layout => "administrator", :locals => { :user => chief }) do %>
-  #     Title: <%= chief.title %>
-  #   <% end %>
-  #
-  # ...this will return:
-  #
-  #   <div id="administrator">
-  #     Budget: $<%= user.budget %>
-  #     Title: <%= chief.name %>
-  #   </div>
-  #
-  # As you can see, the <tt>:locals</tt> hash is shared between both the partial and its layout.
-  #
-  # If you pass arguments to "yield" then this will be passed to the block. One way to use this is to pass
-  # an array to layout and treat it as an enumerable.
-  #
-  #   <%# app/views/users/_user.html.erb &>
-  #   <div class="user">
-  #     Budget: $<%= user.budget %>
-  #     <%= yield user %>
-  #   </div>
-  #
-  #   <%# app/views/users/index.html.erb &>
-  #   <%= render :layout => @users do |user| %>
-  #     Title: <%= user.title %>
-  #   <% end %>
-  #
-  # This will render the layout for each user and yield to the block, passing the user, each time.
-  #
-  # You can also yield multiple times in one layout and use block arguments to differentiate the sections.
-  #
-  #   <%# app/views/users/_user.html.erb &>
-  #   <div class="user">
-  #     <%= yield user, :header %>
-  #     Budget: $<%= user.budget %>
-  #     <%= yield user, :footer %>
-  #   </div>
-  #
-  #   <%# app/views/users/index.html.erb &>
-  #   <%= render :layout => @users do |user, section| %>
-  #     <%- case section when :header -%>
-  #       Title: <%= user.title %>
-  #     <%- when :footer -%>
-  #       Deadline: <%= user.deadline %>
-  #     <%- end -%>
-  #   <% end %>
-  module Partials
-    def _render_partial(options, &block) #:nodoc:
-      _partial_renderer.setup(options, block).render
-    end
-
-    def _partial_renderer #:nodoc:
-      @_partial_renderer ||= PartialRenderer.new(self)
-    end
-  end
-end
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 4a52b3172e..37bc0ae244 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -3,9 +3,9 @@ module ActionView
     delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
       :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context
 
-    def initialize(view)
+    def initialize(view, lookup_context)
       @view = view
-      @lookup_context = view.lookup_context
+      @lookup_context = lookup_context
     end
 
     def render
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 10cd37d56f..83efc95f39 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -1,8 +1,223 @@
+require 'active_support/core_ext/object/blank'
+
 module ActionView
+  # = Action View Partials
+  #
+  # There's also a convenience method for rendering sub templates within the current controller that depends on a
+  # single object (we call this kind of sub templates for partials). It relies on the fact that partials should
+  # follow the naming convention of being prefixed with an underscore -- as to separate them from regular
+  # templates that could be rendered on their own.
+  #
+  # In a template for Advertiser#account:
+  #
+  #  <%= render :partial => "account" %>
+  #
+  # This would render "advertiser/_account.html.erb" and pass the instance variable @account in as a local variable
+  # +account+ to the template for display.
+  #
+  # In another template for Advertiser#buy, we could have:
+  #
+  #   <%= render :partial => "account", :locals => { :account => @buyer } %>
+  #
+  #   <% @advertisements.each do |ad| %>
+  #     <%= render :partial => "ad", :locals => { :ad => ad } %>
+  #   <% end %>
+  #
+  # This would first render "advertiser/_account.html.erb" with @buyer passed in as the local variable +account+, then
+  # render "advertiser/_ad.html.erb" and pass the local variable +ad+ to the template for display.
+  #
+  # == The :as and :object options
+  #
+  # By default <tt>ActionView::Partials::PartialRenderer</tt> has its object in a local variable with the same
+  # name as the template. So, given
+  #
+  #   <%= render :partial => "contract" %>
+  #
+  # within contract we'll get <tt>@contract</tt> in the local variable +contract+, as if we had written
+  #
+  #   <%= render :partial => "contract", :locals => { :contract  => @contract } %>
+  #
+  # With the <tt>:as</tt> option we can specify a different name for said local variable. For example, if we
+  # wanted it to be +agreement+ instead of +contract+ we'd do:
+  #
+  #   <%= render :partial => "contract", :as => 'agreement' %>
+  #
+  # The <tt>:object</tt> option can be used to directly specify which object is rendered into the partial;
+  # useful when the template's object is elsewhere, in a different ivar or in a local variable for instance.
+  #
+  # Revisiting a previous example we could have written this code:
+  #
+  #   <%= render :partial => "account", :object => @buyer %>
+  #
+  #   <% @advertisements.each do |ad| %>
+  #     <%= render :partial => "ad", :object => ad %>
+  #   <% end %>
+  #
+  # The <tt>:object</tt> and <tt>:as</tt> options can be used together.
+  #
+  # == Rendering a collection of partials
+  #
+  # The example of partial use describes a familiar pattern where a template needs to iterate over an array and
+  # render a sub template for each of the elements. This pattern has been implemented as a single method that
+  # accepts an array and renders a partial by the same name as the elements contained within. So the three-lined
+  # example in "Using partials" can be rewritten with a single line:
+  #
+  #   <%= render :partial => "ad", :collection => @advertisements %>
+  #
+  # This will render "advertiser/_ad.html.erb" and pass the local variable +ad+ to the template for display. An
+  # iteration counter will automatically be made available to the template with a name of the form
+  # +partial_name_counter+. In the case of the example above, the template would be fed +ad_counter+.
+  #
+  # The <tt>:as</tt> option may be used when rendering partials.
+  #
+  # You can specify a partial to be rendered between elements via the <tt>:spacer_template</tt> option.
+  # The following example will render <tt>advertiser/_ad_divider.html.erb</tt> between each ad partial:
+  #
+  #   <%= render :partial => "ad", :collection => @advertisements, :spacer_template => "ad_divider" %>
+  #
+  # If the given <tt>:collection</tt> is nil or empty, <tt>render</tt> will return nil. This will allow you
+  # to specify a text which will displayed instead by using this form:
+  #
+  #   <%= render(:partial => "ad", :collection => @advertisements) || "There's no ad to be displayed" %>
+  #
+  # NOTE: Due to backwards compatibility concerns, the collection can't be one of hashes. Normally you'd also
+  # just keep domain objects, like Active Records, in there.
+  #
+  # == Rendering shared partials
+  #
+  # Two controllers can share a set of partials and render them like this:
+  #
+  #   <%= render :partial => "advertisement/ad", :locals => { :ad => @advertisement } %>
+  #
+  # This will render the partial "advertisement/_ad.html.erb" regardless of which controller this is being called from.
+  #
+  # == Rendering objects with the RecordIdentifier
+  #
+  # Instead of explicitly naming the location of a partial, you can also let the RecordIdentifier do the work if
+  # you're following its conventions for RecordIdentifier#partial_path. Examples:
+  #
+  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account} %>
+  #  <%= render :partial => @account %>
+  #
+  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "posts/post", :collection => @posts %>
+  #  <%= render :partial => @posts %>
+  #
+  # == Rendering the default case
+  #
+  # If you're not going to be using any of the options like collections or layouts, you can also use the short-hand
+  # defaults of render to render partials. Examples:
+  #
+  #  # Instead of <%= render :partial => "account" %>
+  #  <%= render "account" %>
+  #
+  #  # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
+  #  <%= render "account", :account => @buyer %>
+  #
+  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
+  #  <%= render(@account) %>
+  #
+  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "posts/post", :collection => @posts %>
+  #  <%= render(@posts) %>
+  #
+  # == Rendering partials with layouts
+  #
+  # Partials can have their own layouts applied to them. These layouts are different than the ones that are
+  # specified globally for the entire action, but they work in a similar fashion. Imagine a list with two types
+  # of users:
+  #
+  #   <%# app/views/users/index.html.erb &>
+  #   Here's the administrator:
+  #   <%= render :partial => "user", :layout => "administrator", :locals => { :user => administrator } %>
+  #
+  #   Here's the editor:
+  #   <%= render :partial => "user", :layout => "editor", :locals => { :user => editor } %>
+  #
+  #   <%# app/views/users/_user.html.erb &>
+  #   Name: <%= user.name %>
+  #
+  #   <%# app/views/users/_administrator.html.erb &>
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     <%= yield %>
+  #   </div>
+  #
+  #   <%# app/views/users/_editor.html.erb &>
+  #   <div id="editor">
+  #     Deadline: <%= user.deadline %>
+  #     <%= yield %>
+  #   </div>
+  #
+  # ...this will return:
+  #
+  #   Here's the administrator:
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     Name: <%= user.name %>
+  #   </div>
+  #
+  #   Here's the editor:
+  #   <div id="editor">
+  #     Deadline: <%= user.deadline %>
+  #     Name: <%= user.name %>
+  #   </div>
+  #
+  # You can also apply a layout to a block within any template:
+  #
+  #   <%# app/views/users/_chief.html.erb &>
+  #   <%= render(:layout => "administrator", :locals => { :user => chief }) do %>
+  #     Title: <%= chief.title %>
+  #   <% end %>
+  #
+  # ...this will return:
+  #
+  #   <div id="administrator">
+  #     Budget: $<%= user.budget %>
+  #     Title: <%= chief.name %>
+  #   </div>
+  #
+  # As you can see, the <tt>:locals</tt> hash is shared between both the partial and its layout.
+  #
+  # If you pass arguments to "yield" then this will be passed to the block. One way to use this is to pass
+  # an array to layout and treat it as an enumerable.
+  #
+  #   <%# app/views/users/_user.html.erb &>
+  #   <div class="user">
+  #     Budget: $<%= user.budget %>
+  #     <%= yield user %>
+  #   </div>
+  #
+  #   <%# app/views/users/index.html.erb &>
+  #   <%= render :layout => @users do |user| %>
+  #     Title: <%= user.title %>
+  #   <% end %>
+  #
+  # This will render the layout for each user and yield to the block, passing the user, each time.
+  #
+  # You can also yield multiple times in one layout and use block arguments to differentiate the sections.
+  #
+  #   <%# app/views/users/_user.html.erb &>
+  #   <div class="user">
+  #     <%= yield user, :header %>
+  #     Budget: $<%= user.budget %>
+  #     <%= yield user, :footer %>
+  #   </div>
+  #
+  #   <%# app/views/users/index.html.erb &>
+  #   <%= render :layout => @users do |user, section| %>
+  #     <%- case section when :header -%>
+  #       Title: <%= user.title %>
+  #     <%- when :footer -%>
+  #       Deadline: <%= user.deadline %>
+  #     <%- end -%>
+  #   <% end %>
   class PartialRenderer < AbstractRenderer #:nodoc:
     PARTIAL_NAMES = Hash.new {|h,k| h[k] = {} }
 
-    def initialize(view)
+    def initialize(view, *)
       super
       @partial_names = PARTIAL_NAMES[@view.controller.class.name]
     end
diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb
new file mode 100644
index 0000000000..f0ee103d80
--- /dev/null
+++ b/actionpack/lib/action_view/renderer/renderer.rb
@@ -0,0 +1,70 @@
+module ActionView
+  # This is the main entry point for rendering. It basically delegates
+  # to other objects like TemplateRenderer and PartialRenderer which
+  # actually renders the template.
+  class Renderer
+    attr_accessor :lookup_context
+
+    # TODO: render_context should not be an initialization parameter
+    def initialize(lookup_context, render_context)
+      @render_context = render_context
+      @lookup_context = lookup_context
+      @view_flow = OutputFlow.new
+    end
+
+    # Returns the result of a render that's dictated by the options hash. The primary options are:
+    #
+    # * <tt>:partial</tt> - See ActionView::Partials.
+    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
+    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
+    # * <tt>:text</tt> - Renders the text passed in out.
+    #
+    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
+    # as the locals hash.
+    def render(options = {}, locals = {}, &block)
+      case options
+      when Hash
+        if block_given?
+          _render_partial(options.merge(:partial => options[:layout]), &block)
+        elsif options.key?(:partial)
+          _render_partial(options)
+        else
+          _render_template(options)
+        end
+      else
+        _render_partial(:partial => options, :locals => locals)
+      end
+    end
+
+    # Render but returns a valid Rack body. If fibers are defined, we return
+    # a streaming body that renders the template piece by piece.
+    #
+    # Note that partials are not supported to be rendered with streaming,
+    # so in such cases, we just wrap them in an array.
+    def render_body(options)
+      if options.key?(:partial)
+        [_render_partial(options)]
+      else
+        StreamingTemplateRenderer.new(@render_context, @lookup_context).render(options)
+      end
+    end
+
+    private
+
+    def _render_template(options) #:nodoc:
+      _template_renderer.render(options)
+    end
+
+    def _template_renderer #:nodoc:
+      @_template_renderer ||= TemplateRenderer.new(@render_context, @lookup_context)
+    end
+
+    def _render_partial(options, &block) #:nodoc:
+      _partial_renderer.setup(options, block).render
+    end
+
+    def _partial_renderer #:nodoc:
+      @_partial_renderer ||= PartialRenderer.new(@render_context, @lookup_context)
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
index 2bce2fb045..017a27976c 100644
--- a/actionpack/lib/action_view/rendering.rb
+++ b/actionpack/lib/action_view/rendering.rb
@@ -3,42 +3,8 @@ require 'active_support/core_ext/object/try'
 module ActionView
   # = Action View Rendering
   module Rendering
-    # Returns the result of a render that's dictated by the options hash. The primary options are:
-    #
-    # * <tt>:partial</tt> - See ActionView::Partials.
-    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
-    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
-    # * <tt>:text</tt> - Renders the text passed in out.
-    #
-    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
-    # as the locals hash.
-    def render(options = {}, locals = {}, &block)
-      case options
-      when Hash
-        if block_given?
-          _render_partial(options.merge(:partial => options[:layout]), &block)
-        elsif options.key?(:partial)
-          _render_partial(options)
-        else
-          _render_template(options)
-        end
-      else
-        _render_partial(:partial => options, :locals => locals)
-      end
-    end
-
-    # Render but returns a valid Rack body. If fibers are defined, we return
-    # a streaming body that renders the template piece by piece.
-    #
-    # Note that partials are not supported to be rendered with streaming,
-    # so in such cases, we just wrap them in an array.
-    def render_body(options)
-      if options.key?(:partial)
-        [_render_partial(options)]
-      else
-        StreamingTemplateRenderer.new(self).render(options)
-      end
-    end
+    # This is temporary until we remove the renderer dependency from AV.
+    delegate :render, :render_body, :to => :@_renderer
 
     # Returns the contents that are yielded to a layout, given a name or a block.
     #
@@ -102,13 +68,5 @@ module ActionView
         _layout_for(*args)
       end
     end
-
-    def _render_template(options) #:nodoc:
-      _template_renderer.render(options)
-    end
-
-    def _template_renderer #:nodoc:
-      @_template_renderer ||= TemplateRenderer.new(self)
-    end
   end
 end
-- 
cgit v1.2.3


From bebaccdf4a3a17f2ead349cca891032e245655ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 11:14:38 +0200
Subject: Remove dependency from _template.

---
 actionpack/lib/action_view/base.rb                       |  3 ++-
 actionpack/lib/action_view/helpers/form_helper.rb        |  2 +-
 actionpack/lib/action_view/helpers/translation_helper.rb |  4 ++--
 actionpack/lib/action_view/template.rb                   | 14 +++-----------
 actionpack/lib/action_view/test_case.rb                  | 16 +++++++++++++---
 actionpack/test/template/template_test.rb                | 10 ++++------
 actionpack/test/template/url_helper_test.rb              |  2 +-
 7 files changed, 26 insertions(+), 25 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index c1dbbe1613..0866e808e6 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -159,7 +159,7 @@ module ActionView #:nodoc:
       end
     end
 
-    attr_accessor :_template, :_view_flow
+    attr_accessor :_view_flow
     attr_internal :request, :controller, :config, :assigns, :lookup_context
 
     # TODO Consider removing those setters once we have the renderer in place.
@@ -191,6 +191,7 @@ module ActionView #:nodoc:
       @_virtual_path = nil
       @_view_flow = OutputFlow.new
       @output_buffer = nil
+      @virtual_path  = nil
 
       if @_controller = controller
         @_request = controller.request if controller.respond_to?(:request)
diff --git a/actionpack/lib/action_view/helpers/form_helper.rb b/actionpack/lib/action_view/helpers/form_helper.rb
index 68db17c254..b6bb90a3ce 100644
--- a/actionpack/lib/action_view/helpers/form_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_helper.rb
@@ -1172,7 +1172,7 @@ module ActionView
     class FormBuilder
       # The methods which wrap a form helper call.
       class_attribute :field_helpers
-      self.field_helpers = (FormHelper.instance_method_names - ['form_for'])
+      self.field_helpers = FormHelper.instance_method_names - %w(form_for convert_to_model)
 
       attr_accessor :object_name, :object, :options
 
diff --git a/actionpack/lib/action_view/helpers/translation_helper.rb b/actionpack/lib/action_view/helpers/translation_helper.rb
index 26ebae6546..ec9bdd5320 100644
--- a/actionpack/lib/action_view/helpers/translation_helper.rb
+++ b/actionpack/lib/action_view/helpers/translation_helper.rb
@@ -63,8 +63,8 @@ module ActionView
       private
         def scope_key_by_partial(key)
           if key.to_s.first == "."
-            if (path = @_template && @_template.virtual_path)
-              path.gsub(%r{/_?}, ".") + key.to_s
+            if @virtual_path
+              @virtual_path.gsub(%r{/_?}, ".") + key.to_s
             else
               raise "Cannot use t(#{key.inspect}) shortcut because path is not available"
             end
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 6dfc4f68ae..98ecd15aa0 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -139,15 +139,12 @@ module ActionView
     # we use a bang in this instrumentation because you don't want to
     # consume this in production. This is only slow if it's being listened to.
     def render(view, locals, buffer=nil, &block)
-      old_template, view._template = view._template, self
       ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
         compile!(view)
         view.send(method_name, locals, buffer, &block)
       end
     rescue Exception => e
       handle_render_error(view, e)
-    ensure
-      view._template = old_template
     end
 
     def mime_type
@@ -174,12 +171,7 @@ module ActionView
     end
 
     def inspect
-      @inspect ||=
-        if defined?(Rails.root)
-          identifier.sub("#{Rails.root}/", '')
-        else
-          identifier
-        end
+      @inspect ||= defined?(Rails.root) ? identifier.sub("#{Rails.root}/", '') : identifier
     end
 
     protected
@@ -264,9 +256,9 @@ module ActionView
         # encoding of the code
         source = <<-end_src
           def #{method_name}(local_assigns, output_buffer)
-            _old_output_buffer = @output_buffer;#{locals_code};#{code}
+            _old_virtual_path, @virtual_path = @virtual_path, #{@virtual_path.inspect};_old_output_buffer = @output_buffer;#{locals_code};#{code}
           ensure
-            @output_buffer = _old_output_buffer
+            @virtual_path, @output_buffer = _old_virtual_path, _old_output_buffer
           end
         end_src
 
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 5c74bf843a..14e032790d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -147,9 +147,19 @@ module ActionView
       module Locals
         attr_accessor :locals
 
-        def _render_partial(options)
-          locals[options[:partial]] = options[:locals]
-          super(options)
+        def render(options = {}, local_assigns = {})
+          case options
+          when Hash
+            if block_given?
+              locals[options[:layout]] = options[:locals]
+            elsif options.key?(:partial)
+              locals[options[:partial]] = options[:locals]
+            end
+          else
+            locals[options] = local_assigns
+          end
+
+          super
         end
       end
 
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 5c655d5b69..81fb34b80f 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -11,11 +11,9 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   class Context
-    attr_accessor :_template
-
     def initialize
       @output_buffer = "original"
-      @_virtual_path = nil
+      @virtual_path = nil
     end
 
     def hello
@@ -24,7 +22,7 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def partial
       ActionView::Template.new(
-        "<%= @_template.virtual_path %>",
+        "<%= @virtual_path %>",
         "partial",
         ERBHandler,
         :virtual_path => "partial"
@@ -86,9 +84,9 @@ class TestERBTemplate < ActiveSupport::TestCase
   end
 
   def test_virtual_path
-    @template = new_template("<%= @_template.virtual_path %>" \
+    @template = new_template("<%= @virtual_path %>" \
                              "<%= partial.render(self, {}) %>" \
-                             "<%= @_template.virtual_path %>")
+                             "<%= @virtual_path %>")
     assert_equal "hellopartialhello", render
   end
 
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index fc330f7a73..8d0f0124c2 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -9,7 +9,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   # or request.
   #
   # In those cases, we'll set up a simple mock
-  attr_accessor :controller, :request, :_template
+  attr_accessor :controller, :request
 
   routes = ActionDispatch::Routing::RouteSet.new
   routes.draw do
-- 
cgit v1.2.3


From 2f683fd870d0e4c5aff38510ef03c7e5144a1ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 11:53:09 +0200
Subject: Remove more dependencies from the view.

---
 actionpack/lib/action_view/base.rb                      |  6 +-----
 actionpack/lib/action_view/renderer/partial_renderer.rb | 14 ++++++++++----
 actionpack/lib/action_view/renderer/renderer.rb         |  1 +
 actionpack/lib/action_view/rendering.rb                 | 17 ++++++-----------
 actionpack/test/template/log_subscriber_test.rb         |  7 +++----
 5 files changed, 21 insertions(+), 24 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 0866e808e6..37cd4d9ddc 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -202,17 +202,13 @@ module ActionView #:nodoc:
         lookup_context : ActionView::LookupContext.new(lookup_context)
       @_lookup_context.formats = formats if formats
 
-      @_renderer = ActionView::Renderer.new(@_lookup_context, self)
+      @view_renderer = ActionView::Renderer.new(@_lookup_context, self)
     end
 
     def controller_path
       @controller_path ||= controller && controller.controller_path
     end
 
-    def controller_prefixes
-      @controller_prefixes ||= controller && controller._prefixes
-    end
-
     ActiveSupport.run_load_hooks(:action_view, self)
   end
 end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 83efc95f39..0eeead2e5d 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -217,9 +217,11 @@ module ActionView
   class PartialRenderer < AbstractRenderer #:nodoc:
     PARTIAL_NAMES = Hash.new {|h,k| h[k] = {} }
 
+    # TODO Controller should not come from the view
     def initialize(view, *)
       super
-      @partial_names = PARTIAL_NAMES[@view.controller.class.name]
+      @controller = @view.controller
+      @partial_names = PARTIAL_NAMES[@controller.class.name]
     end
 
     def setup(options, block)
@@ -292,7 +294,7 @@ module ActionView
       locals[as] = object
 
       content = @template.render(view, locals) do |*name|
-        view._block_layout_for(*name, &block)
+        view._layout_for(*name, &block)
       end
 
       content = layout.render(view, locals){ content } if layout
@@ -301,6 +303,10 @@ module ActionView
 
     private
 
+    def controller_prefixes
+      @controller_prefixes ||= @controller && @controller._prefixes
+    end
+
     def collection
       if @options.key?(:collection)
         collection = @options[:collection]
@@ -324,7 +330,7 @@ module ActionView
     end
 
     def find_template(path=@path, locals=@locals.keys)
-      prefixes = path.include?(?/) ? [] : @view.controller_prefixes
+      prefixes = path.include?(?/) ? [] : controller_prefixes
       @lookup_context.find_template(path, prefixes, true, locals)
     end
 
@@ -365,7 +371,7 @@ module ActionView
         object = object.to_model if object.respond_to?(:to_model)
 
         object.class.model_name.partial_path.dup.tap do |partial|
-          path = @view.controller_prefixes.first
+          path = controller_prefixes.first
           partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
         end
       end
diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb
index f0ee103d80..7b95c2dd92 100644
--- a/actionpack/lib/action_view/renderer/renderer.rb
+++ b/actionpack/lib/action_view/renderer/renderer.rb
@@ -6,6 +6,7 @@ module ActionView
     attr_accessor :lookup_context
 
     # TODO: render_context should not be an initialization parameter
+    # TODO: controller should be received on initialization
     def initialize(lookup_context, render_context)
       @render_context = render_context
       @lookup_context = lookup_context
diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
index 017a27976c..9850965456 100644
--- a/actionpack/lib/action_view/rendering.rb
+++ b/actionpack/lib/action_view/rendering.rb
@@ -4,7 +4,7 @@ module ActionView
   # = Action View Rendering
   module Rendering
     # This is temporary until we remove the renderer dependency from AV.
-    delegate :render, :render_body, :to => :@_renderer
+    delegate :render, :render_body, :to => :@view_renderer
 
     # Returns the contents that are yielded to a layout, given a name or a block.
     #
@@ -52,20 +52,15 @@ module ActionView
     #     Hello David
     #   </html>
     #
-    def _layout_for(*args)
-      name = args.first
-      name = :layout unless name.is_a?(Symbol)
-      @_view_flow.get(name).html_safe
-    end
-
-    # Handle layout for calls from partials that supports blocks.
-    def _block_layout_for(*args, &block)
+    def _layout_for(*args, &block)
       name = args.first
 
-      if !name.is_a?(Symbol) && block
+      if name.is_a?(Symbol)
+        @_view_flow.get(name).html_safe
+      elsif block
         capture(*args, &block)
       else
-        _layout_for(*args)
+        @_view_flow.get(:layout).html_safe
       end
     end
   end
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 8b8b005a1d..50e1cccd3b 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -9,7 +9,9 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   def setup
     super
     @old_logger = ActionController::Base.logger
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    @controller = Object.new
+    @controller.stubs(:_prefixes).returns(%w(test))
+    @view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller)
     Rails.stubs(:root).returns(File.expand_path(FIXTURE_LOAD_PATH))
     ActionView::LogSubscriber.attach_to :action_view
   end
@@ -57,7 +59,6 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_partial_with_implicit_path
-    @view.stubs(:controller_prefixes).returns(%w(test))
     @view.render(Customer.new("david"), :greeting => "hi")
     wait
 
@@ -74,7 +75,6 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_collection_with_implicit_path
-    @view.stubs(:controller_prefixes).returns(%w(test))
     @view.render([ Customer.new("david"), Customer.new("mary") ], :greeting => "hi")
     wait
 
@@ -83,7 +83,6 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_collection_template_without_path
-    @view.stubs(:controller_prefixes).returns(%w(test))
     @view.render([ GoodCustomer.new("david"), Customer.new("mary") ], :greeting => "hi")
     wait
 
-- 
cgit v1.2.3


From 33cc001f9158463389a9c9c321de0dbdccb1df8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 12:16:31 +0200
Subject: More cleanup and moving responsibilities around.

---
 actionpack/lib/action_view.rb                      |  1 -
 actionpack/lib/action_view/base.rb                 | 19 +++--
 actionpack/lib/action_view/context.rb              | 84 ++++++++++++++++------
 actionpack/lib/action_view/flows.rb                |  2 +-
 .../lib/action_view/helpers/capture_helper.rb      |  6 +-
 .../renderer/streaming_template_renderer.rb        |  4 +-
 .../lib/action_view/renderer/template_renderer.rb  |  2 +-
 actionpack/lib/action_view/rendering.rb            | 67 -----------------
 actionpack/test/template/capture_helper_test.rb    | 10 +--
 9 files changed, 83 insertions(+), 112 deletions(-)
 delete mode 100644 actionpack/lib/action_view/rendering.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 69c50a056c..92b6f7c770 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -35,7 +35,6 @@ module ActionView
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
-    autoload :Rendering
     autoload :Template
     autoload :TestCase
 
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 37cd4d9ddc..cde1c36bd9 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -131,7 +131,7 @@ module ActionView #:nodoc:
   #
   # More builder documentation can be found at http://builder.rubyforge.org.
   class Base
-    include Helpers, Rendering, ::ERB::Util, Context
+    include Helpers, ::ERB::Util, Context
 
     # Specify the proc used to decorate input tags that refer to attributes with errors.
     cattr_accessor :field_error_proc
@@ -159,10 +159,10 @@ module ActionView #:nodoc:
       end
     end
 
-    attr_accessor :_view_flow
-    attr_internal :request, :controller, :config, :assigns, :lookup_context
+    attr_accessor :view_renderer
+    attr_internal :request, :controller, :config, :assigns
 
-    # TODO Consider removing those setters once we have the renderer in place.
+    delegate :lookup_context, :render, :render_body, :to => :view_renderer
     delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
@@ -187,22 +187,21 @@ module ActionView #:nodoc:
       assign(assigns_for_first_render)
       self.helpers = Module.new unless self.class.helpers
 
-      @_config = {}
-      @_virtual_path = nil
-      @_view_flow = OutputFlow.new
+      @view_flow = OutputFlow.new
       @output_buffer = nil
       @virtual_path  = nil
 
+      @_config = {}
       if @_controller = controller
         @_request = controller.request if controller.respond_to?(:request)
         @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
       end
 
-      @_lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
+      _lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
         lookup_context : ActionView::LookupContext.new(lookup_context)
-      @_lookup_context.formats = formats if formats
+      _lookup_context.formats = formats if formats
 
-      @view_renderer = ActionView::Renderer.new(@_lookup_context, self)
+      @view_renderer = ActionView::Renderer.new(_lookup_context, self)
     end
 
     def controller_path
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index 710cdc613d..c4bebd7d95 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -8,29 +8,69 @@ module ActionView
   # Action View contexts are supplied to Action Controller to render template.
   # The default Action View context is ActionView::Base.
   #
-  # In order to work with ActionController, a Context must implement:
-  #
-  # Context#render_partial[options]
-  #   - responsible for setting options[:_template]
-  #   - Returns String with the rendered partial
-  #   options<Hash>:: see _render_partial in ActionView::Base
-  # Context#render_template[template, layout, options, partial]
-  #   - Returns String with the rendered template
-  #   template<ActionView::Template>:: The template to render
-  #   layout<ActionView::Template>:: The layout to render around the template
-  #   options<Hash>:: See _render_template_with_layout in ActionView::Base
-  #   partial<Boolean>:: Whether or not the template to render is a partial
-  #
-  # An Action View context can also mix in Action View's helpers. In order to
-  # mix in helpers, a context must implement:
-  #
-  # Context#controller
-  # - Returns an instance of AbstractController
-  #
-  # In any case, a context must mix in ActionView::Context, which stores compiled
-  # template and provides the output buffer.
+  # In order to work with ActionController, a Context must just include this module.
   module Context
     include CompiledTemplates
-    attr_accessor :output_buffer, :view_renderer, :view_flow
+    attr_accessor :output_buffer, :view_flow
+
+    # Returns the contents that are yielded to a layout, given a name or a block.
+    #
+    # You can think of a layout as a method that is called with a block. If the user calls
+    # <tt>yield :some_name</tt>, the block, by default, returns <tt>content_for(:some_name)</tt>.
+    # If the user calls simply +yield+, the default block returns <tt>content_for(:layout)</tt>.
+    #
+    # The user can override this default by passing a block to the layout:
+    #
+    #   # The template
+    #   <%= render :layout => "my_layout" do %>
+    #     Content
+    #   <% end %>
+    #
+    #   # The layout
+    #   <html>
+    #     <%= yield %>
+    #   </html>
+    #
+    # In this case, instead of the default block, which would return <tt>content_for(:layout)</tt>,
+    # this method returns the block that was passed in to <tt>render :layout</tt>, and the response
+    # would be
+    #
+    #   <html>
+    #     Content
+    #   </html>
+    #
+    # Finally, the block can take block arguments, which can be passed in by +yield+:
+    #
+    #   # The template
+    #   <%= render :layout => "my_layout" do |customer| %>
+    #     Hello <%= customer.name %>
+    #   <% end %>
+    #
+    #   # The layout
+    #   <html>
+    #     <%= yield Struct.new(:name).new("David") %>
+    #   </html>
+    #
+    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
+    # and the struct specified would be passed into the block as an argument. The result
+    # would be
+    #
+    #   <html>
+    #     Hello David
+    #   </html>
+    #
+    def _layout_for(*args, &block)
+      name = args.first
+
+      if name.is_a?(Symbol)
+        view_flow.get(name).html_safe
+      elsif block
+        # TODO Import capture into AV::Context or
+        # leave it as implicit dependency?
+        capture(*args, &block)
+      else
+        view_flow.get(:layout).html_safe
+      end
+    end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/flows.rb b/actionpack/lib/action_view/flows.rb
index 386a06511f..a8f740713f 100644
--- a/actionpack/lib/action_view/flows.rb
+++ b/actionpack/lib/action_view/flows.rb
@@ -34,7 +34,7 @@ module ActionView
       @view    = view
       @parent  = nil
       @child   = view.output_buffer
-      @content = view._view_flow.content
+      @content = view.view_flow.content
       @fiber   = fiber
       @root    = Fiber.current.object_id
     end
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 0139714240..ead7feb091 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -135,7 +135,7 @@ module ActionView
       # for elements that will be fragment cached.
       def content_for(name, content = nil, &block)
         content = capture(&block) if block_given?
-        result = @_view_flow.append(name, content) if content
+        result = @view_flow.append(name, content) if content
         result unless content
       end
 
@@ -146,7 +146,7 @@ module ActionView
       # the layout to stop looking for more contents.
       def provide(name, content = nil, &block)
         content = capture(&block) if block_given?
-        result = @_view_flow.append!(name, content) if content
+        result = @view_flow.append!(name, content) if content
         result unless content
       end
 
@@ -169,7 +169,7 @@ module ActionView
       #   </body>
       #   </html>
       def content_for?(name)
-        @_view_flow.get(name).present?
+        @view_flow.get(name).present?
       end
 
       # Use an alternate output buffer for the duration of the block.
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index 03aab444f8..d60b42a284 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -106,7 +106,7 @@ module ActionView
         # Set the view flow to support streaming. It will be aware
         # when to stop rendering the layout because it needs to search
         # something in the template and vice-versa.
-        view._view_flow = StreamingFlow.new(view, fiber)
+        view.view_flow = StreamingFlow.new(view, fiber)
 
         # Yo! Start the fiber!
         fiber.resume
@@ -118,7 +118,7 @@ module ActionView
           content = template.render(view, locals, &yielder)
 
           # Once rendering the template is done, sets its content in the :layout key.
-          view._view_flow.set(:layout, content)
+          view.view_flow.set(:layout, content)
 
           # In case the layout continues yielding, we need to resume
           # the fiber until all yields are handled.
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 6b5ead463f..471428ac9e 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -46,7 +46,7 @@ module ActionView
 
       if layout
         view = @view
-        view._view_flow.set(:layout, content)
+        view.view_flow.set(:layout, content)
         layout.render(view, locals){ |*name| view._layout_for(*name) }
       else
         content
diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
deleted file mode 100644
index 9850965456..0000000000
--- a/actionpack/lib/action_view/rendering.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'active_support/core_ext/object/try'
-
-module ActionView
-  # = Action View Rendering
-  module Rendering
-    # This is temporary until we remove the renderer dependency from AV.
-    delegate :render, :render_body, :to => :@view_renderer
-
-    # Returns the contents that are yielded to a layout, given a name or a block.
-    #
-    # You can think of a layout as a method that is called with a block. If the user calls
-    # <tt>yield :some_name</tt>, the block, by default, returns <tt>content_for(:some_name)</tt>.
-    # If the user calls simply +yield+, the default block returns <tt>content_for(:layout)</tt>.
-    #
-    # The user can override this default by passing a block to the layout:
-    #
-    #   # The template
-    #   <%= render :layout => "my_layout" do %>
-    #     Content
-    #   <% end %>
-    #
-    #   # The layout
-    #   <html>
-    #     <%= yield %>
-    #   </html>
-    #
-    # In this case, instead of the default block, which would return <tt>content_for(:layout)</tt>,
-    # this method returns the block that was passed in to <tt>render :layout</tt>, and the response
-    # would be
-    #
-    #   <html>
-    #     Content
-    #   </html>
-    #
-    # Finally, the block can take block arguments, which can be passed in by +yield+:
-    #
-    #   # The template
-    #   <%= render :layout => "my_layout" do |customer| %>
-    #     Hello <%= customer.name %>
-    #   <% end %>
-    #
-    #   # The layout
-    #   <html>
-    #     <%= yield Struct.new(:name).new("David") %>
-    #   </html>
-    #
-    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
-    # and the struct specified would be passed into the block as an argument. The result
-    # would be
-    #
-    #   <html>
-    #     Hello David
-    #   </html>
-    #
-    def _layout_for(*args, &block)
-      name = args.first
-
-      if name.is_a?(Symbol)
-        @_view_flow.get(name).html_safe
-      elsif block
-        capture(*args, &block)
-      else
-        @_view_flow.get(:layout).html_safe
-      end
-    end
-  end
-end
diff --git a/actionpack/test/template/capture_helper_test.rb b/actionpack/test/template/capture_helper_test.rb
index a9a36e6e6b..592c7da060 100644
--- a/actionpack/test/template/capture_helper_test.rb
+++ b/actionpack/test/template/capture_helper_test.rb
@@ -4,7 +4,7 @@ class CaptureHelperTest < ActionView::TestCase
   def setup
     super
     @av = ActionView::Base.new
-    @_view_flow = ActionView::OutputFlow.new
+    @view_flow = ActionView::OutputFlow.new
   end
 
   def test_capture_captures_the_temporary_output_buffer_in_its_block
@@ -49,14 +49,14 @@ class CaptureHelperTest < ActionView::TestCase
     assert !content_for?(:title)
     provide :title, "hi"
     assert content_for?(:title)
-    assert_equal "hi", @_view_flow.get(:title)
+    assert_equal "hi", @view_flow.get(:title)
     provide :title, "<p>title</p>"
-    assert_equal "hi&lt;p&gt;title&lt;/p&gt;", @_view_flow.get(:title)
+    assert_equal "hi&lt;p&gt;title&lt;/p&gt;", @view_flow.get(:title)
 
-    @_view_flow = ActionView::OutputFlow.new
+    @view_flow = ActionView::OutputFlow.new
     provide :title, "hi"
     provide :title, "<p>title</p>".html_safe
-    assert_equal "hi<p>title</p>", @_view_flow.get(:title)
+    assert_equal "hi<p>title</p>", @view_flow.get(:title)
   end
 
   def test_with_output_buffer_swaps_the_output_buffer_given_no_argument
-- 
cgit v1.2.3


From 367bdc53611fe1da9cedda3220a83d3f39409cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 12:37:57 +0200
Subject: Remove view dependency from AV::Renderer.

---
 actionpack/lib/action_view.rb                      |  1 +
 actionpack/lib/action_view/base.rb                 | 23 +++++---
 .../lib/action_view/renderer/abstract_renderer.rb  |  4 +-
 .../lib/action_view/renderer/partial_renderer.rb   | 69 +++++++++++-----------
 actionpack/lib/action_view/renderer/renderer.rb    | 46 ++++++---------
 .../lib/action_view/renderer/template_renderer.rb  |  4 +-
 actionpack/lib/action_view/rendering.rb            | 27 +++++++++
 7 files changed, 100 insertions(+), 74 deletions(-)
 create mode 100644 actionpack/lib/action_view/rendering.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 92b6f7c770..69c50a056c 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -35,6 +35,7 @@ module ActionView
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
+    autoload :Rendering
     autoload :Template
     autoload :TestCase
 
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index cde1c36bd9..1890259ca0 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -131,7 +131,7 @@ module ActionView #:nodoc:
   #
   # More builder documentation can be found at http://builder.rubyforge.org.
   class Base
-    include Helpers, ::ERB::Util, Context
+    include Helpers, Rendering, ::ERB::Util, Context
 
     # Specify the proc used to decorate input tags that refer to attributes with errors.
     cattr_accessor :field_error_proc
@@ -162,7 +162,7 @@ module ActionView #:nodoc:
     attr_accessor :view_renderer
     attr_internal :request, :controller, :config, :assigns
 
-    delegate :lookup_context, :render, :render_body, :to => :view_renderer
+    delegate :lookup_context, :to => :view_renderer
     delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :to => :lookup_context
 
     delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
@@ -183,10 +183,11 @@ module ActionView #:nodoc:
       @_assigns = new_assigns.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
-    def initialize(lookup_context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
+    def initialize(context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
       assign(assigns_for_first_render)
       self.helpers = Module.new unless self.class.helpers
 
+      # Context vars initialization
       @view_flow = OutputFlow.new
       @output_buffer = nil
       @virtual_path  = nil
@@ -197,13 +198,19 @@ module ActionView #:nodoc:
         @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
       end
 
-      _lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
-        lookup_context : ActionView::LookupContext.new(lookup_context)
-      _lookup_context.formats = formats if formats
-
-      @view_renderer = ActionView::Renderer.new(_lookup_context, self)
+      # Handle all these for backwards compatibility.
+      # TODO Provide a new API for AV::Base and deprecate this one.
+      if context.is_a?(ActionView::Renderer)
+        @view_renderer = context
+      elsif
+        lookup_context = context.is_a?(ActionView::LookupContext) ?
+          context : ActionView::LookupContext.new(context)
+        lookup_context.formats = formats if formats
+        @view_renderer = ActionView::Renderer.new(lookup_context, controller)
+      end
     end
 
+    # TODO Is this needed anywhere? Maybe deprecate it?
     def controller_path
       @controller_path ||= controller && controller.controller_path
     end
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index 37bc0ae244..d389105a7a 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -3,9 +3,9 @@ module ActionView
     delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
       :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context
 
-    def initialize(view, lookup_context)
-      @view = view
+    def initialize(lookup_context, controller)
       @lookup_context = lookup_context
+      @controller = controller
     end
 
     def render
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 0eeead2e5d..70327b16c4 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -217,45 +217,14 @@ module ActionView
   class PartialRenderer < AbstractRenderer #:nodoc:
     PARTIAL_NAMES = Hash.new {|h,k| h[k] = {} }
 
-    # TODO Controller should not come from the view
-    def initialize(view, *)
+    def initialize(*)
       super
-      @controller = @view.controller
       @partial_names = PARTIAL_NAMES[@controller.class.name]
     end
 
-    def setup(options, block)
-      partial = options[:partial]
-
-      @options = options
-      @locals  = options[:locals] || {}
-      @block   = block
-
-      if String === partial
-        @object     = options[:object]
-        @path       = partial
-        @collection = collection
-      else
-        @object = partial
-
-        if @collection = collection_from_object || collection
-          paths = @collection_data = @collection.map { |o| partial_path(o) }
-          @path = paths.uniq.size == 1 ? paths.first : nil
-        else
-          @path = partial_path
-        end
-      end
+    def render(context, options, block)
+      setup(context, options, block)
 
-      if @path
-        @variable, @variable_counter = retrieve_variable(@path)
-      else
-        paths.map! { |path| retrieve_variable(path).unshift(path) }
-      end
-
-      self
-    end
-
-    def render
       wrap_formats(@path) do
         identifier = ((@template = find_partial) ? @template.identifier : @path)
 
@@ -303,6 +272,38 @@ module ActionView
 
     private
 
+    def setup(context, options, block)
+      @view   = context
+      partial = options[:partial]
+
+      @options = options
+      @locals  = options[:locals] || {}
+      @block   = block
+
+      if String === partial
+        @object     = options[:object]
+        @path       = partial
+        @collection = collection
+      else
+        @object = partial
+
+        if @collection = collection_from_object || collection
+          paths = @collection_data = @collection.map { |o| partial_path(o) }
+          @path = paths.uniq.size == 1 ? paths.first : nil
+        else
+          @path = partial_path
+        end
+      end
+
+      if @path
+        @variable, @variable_counter = retrieve_variable(@path)
+      else
+        paths.map! { |path| retrieve_variable(path).unshift(path) }
+      end
+
+      self
+    end
+
     def controller_prefixes
       @controller_prefixes ||= @controller && @controller._prefixes
     end
diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb
index 7b95c2dd92..582ed2f9f8 100644
--- a/actionpack/lib/action_view/renderer/renderer.rb
+++ b/actionpack/lib/action_view/renderer/renderer.rb
@@ -3,37 +3,25 @@ module ActionView
   # to other objects like TemplateRenderer and PartialRenderer which
   # actually renders the template.
   class Renderer
-    attr_accessor :lookup_context
+    attr_accessor :lookup_context, :controller
 
-    # TODO: render_context should not be an initialization parameter
-    # TODO: controller should be received on initialization
-    def initialize(lookup_context, render_context)
-      @render_context = render_context
+    def initialize(lookup_context, controller)
       @lookup_context = lookup_context
-      @view_flow = OutputFlow.new
+      @controller = controller
     end
 
-    # Returns the result of a render that's dictated by the options hash. The primary options are:
-    #
-    # * <tt>:partial</tt> - See ActionView::Partials.
-    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
-    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
-    # * <tt>:text</tt> - Renders the text passed in out.
-    #
-    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
-    # as the locals hash.
-    def render(options = {}, locals = {}, &block)
+    def render(context, options = {}, locals = {}, &block)
       case options
       when Hash
         if block_given?
-          _render_partial(options.merge(:partial => options[:layout]), &block)
+          _render_partial(context, options.merge(:partial => options[:layout]), &block)
         elsif options.key?(:partial)
-          _render_partial(options)
+          _render_partial(context, options)
         else
-          _render_template(options)
+          _render_template(context, options)
         end
       else
-        _render_partial(:partial => options, :locals => locals)
+        _render_partial(context, :partial => options, :locals => locals)
       end
     end
 
@@ -42,30 +30,30 @@ module ActionView
     #
     # Note that partials are not supported to be rendered with streaming,
     # so in such cases, we just wrap them in an array.
-    def render_body(options)
+    def render_body(context, options)
       if options.key?(:partial)
-        [_render_partial(options)]
+        [_render_partial(context, options)]
       else
-        StreamingTemplateRenderer.new(@render_context, @lookup_context).render(options)
+        StreamingTemplateRenderer.new(@lookup_context, @controller).render(context, options)
       end
     end
 
     private
 
-    def _render_template(options) #:nodoc:
-      _template_renderer.render(options)
+    def _render_template(context, options) #:nodoc:
+      _template_renderer.render(context, options)
     end
 
     def _template_renderer #:nodoc:
-      @_template_renderer ||= TemplateRenderer.new(@render_context, @lookup_context)
+      @_template_renderer ||= TemplateRenderer.new(@lookup_context, @controller)
     end
 
-    def _render_partial(options, &block) #:nodoc:
-      _partial_renderer.setup(options, block).render
+    def _render_partial(context, options, &block) #:nodoc:
+      _partial_renderer.render(context, options, block)
     end
 
     def _partial_renderer #:nodoc:
-      @_partial_renderer ||= PartialRenderer.new(@render_context, @lookup_context)
+      @_partial_renderer ||= PartialRenderer.new(@lookup_context, @controller)
     end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 471428ac9e..6c55a865a1 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -3,7 +3,9 @@ require 'active_support/core_ext/array/wrap'
 
 module ActionView
   class TemplateRenderer < AbstractRenderer #:nodoc:
-    def render(options)
+    def render(context, options)
+      @view = context
+
       wrap_formats(options[:template] || options[:file]) do
         template = determine_template(options)
         freeze_formats(template.formats, true)
diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
new file mode 100644
index 0000000000..2f420dc992
--- /dev/null
+++ b/actionpack/lib/action_view/rendering.rb
@@ -0,0 +1,27 @@
+module ActionView
+  # = Action View Rendering
+  #
+  # Implements methods that allow rendering from a view context.
+  # In order to use this module, all you need is to implement
+  # view_renderer that returns an ActionView::Renderer object.
+  module Rendering
+    # Returns the result of a render that's dictated by the options hash. The primary options are:
+    #
+    # * <tt>:partial</tt> - See ActionView::Partials.
+    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
+    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
+    # * <tt>:text</tt> - Renders the text passed in out.
+    #
+    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
+    # as the locals hash.
+    # def render(options = {}, locals = {}, &block)
+    def render(*args, &block)
+      view_renderer.render(self, *args, &block)
+    end
+
+    # TODO: This is temporary, but the previous render is sticking.
+    def render_body(*args, &block)
+      view_renderer.render_body(self, *args, &block)
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From b73576138529b1344a38f4e4b16c642f3510d514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 12:56:04 +0200
Subject: Introduce view renderer.

---
 actionpack/lib/abstract_controller/rendering.rb    | 13 +++++++--
 .../lib/action_controller/metal/streaming.rb       |  2 +-
 actionpack/lib/action_view/context.rb              |  2 ++
 actionpack/lib/action_view/renderer/renderer.rb    | 33 +++++++---------------
 actionpack/lib/action_view/rendering.rb            | 20 ++++++++-----
 5 files changed, 37 insertions(+), 33 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 306bd41e2d..db6ff41f55 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -99,7 +99,12 @@ module AbstractController
     #
     # Override this method in a module to change the default behavior.
     def view_context
-      view_context_class.new(lookup_context, view_assigns, self)
+      view_context_class.new(view_renderer, view_assigns, self)
+    end
+
+    # Returns an object that is able to render templates.
+    def view_renderer
+      @view_renderer ||= ActionView::Renderer.new(lookup_context, self)
     end
 
     # Normalize arguments, options and then delegates render_to_body and
@@ -127,7 +132,11 @@ module AbstractController
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
-      view_context.render(options)
+      if options.key?(:partial)
+        view_renderer.render_partial(view_context, options)
+      else
+        view_renderer.render_template(view_context, options)
+      end
     end
 
     # The prefixes used in render "foo" shortcuts.
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index b9bd49f670..5b8111f30d 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -51,7 +51,7 @@ module ActionController #:nodoc:
     # Call render_to_body if we are streaming instead of usual +render+.
     def _render_template(options) #:nodoc:
       if options.delete(:stream)
-        Rack::Chunked::Body.new view_context.render_body(options)
+        Rack::Chunked::Body.new view_renderer.render_body(view_context, options)
       else
         super
       end
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index c4bebd7d95..01be294284 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -9,6 +9,8 @@ module ActionView
   # The default Action View context is ActionView::Base.
   #
   # In order to work with ActionController, a Context must just include this module.
+  # The initialization of the variables used by the context (@output_buffer, @view_flow,
+  # and @virtual_path) is responsibility of the object that includes this module.
   module Context
     include CompiledTemplates
     attr_accessor :output_buffer, :view_flow
diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb
index 582ed2f9f8..3c0126f6bb 100644
--- a/actionpack/lib/action_view/renderer/renderer.rb
+++ b/actionpack/lib/action_view/renderer/renderer.rb
@@ -10,21 +10,6 @@ module ActionView
       @controller = controller
     end
 
-    def render(context, options = {}, locals = {}, &block)
-      case options
-      when Hash
-        if block_given?
-          _render_partial(context, options.merge(:partial => options[:layout]), &block)
-        elsif options.key?(:partial)
-          _render_partial(context, options)
-        else
-          _render_template(context, options)
-        end
-      else
-        _render_partial(context, :partial => options, :locals => locals)
-      end
-    end
-
     # Render but returns a valid Rack body. If fibers are defined, we return
     # a streaming body that renders the template piece by piece.
     #
@@ -32,24 +17,26 @@ module ActionView
     # so in such cases, we just wrap them in an array.
     def render_body(context, options)
       if options.key?(:partial)
-        [_render_partial(context, options)]
+        [render_partial(context, options)]
       else
         StreamingTemplateRenderer.new(@lookup_context, @controller).render(context, options)
       end
     end
 
-    private
-
-    def _render_template(context, options) #:nodoc:
+    # Direct accessor to template rendering.
+    def render_template(context, options) #:nodoc:
       _template_renderer.render(context, options)
     end
 
-    def _template_renderer #:nodoc:
-      @_template_renderer ||= TemplateRenderer.new(@lookup_context, @controller)
+    # Direct access to partial rendering.
+    def render_partial(context, options, &block) #:nodoc:
+      _partial_renderer.render(context, options, block)
     end
 
-    def _render_partial(context, options, &block) #:nodoc:
-      _partial_renderer.render(context, options, block)
+    private
+
+    def _template_renderer #:nodoc:
+      @_template_renderer ||= TemplateRenderer.new(@lookup_context, @controller)
     end
 
     def _partial_renderer #:nodoc:
diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
index 2f420dc992..25ec450e6e 100644
--- a/actionpack/lib/action_view/rendering.rb
+++ b/actionpack/lib/action_view/rendering.rb
@@ -15,13 +15,19 @@ module ActionView
     # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
     # as the locals hash.
     # def render(options = {}, locals = {}, &block)
-    def render(*args, &block)
-      view_renderer.render(self, *args, &block)
-    end
-
-    # TODO: This is temporary, but the previous render is sticking.
-    def render_body(*args, &block)
-      view_renderer.render_body(self, *args, &block)
+    def render(options = {}, locals = {}, &block)
+      case options
+      when Hash
+        if block_given?
+          view_renderer.render_partial(self, options.merge(:partial => options[:layout]), &block)
+        elsif options.key?(:partial)
+          view_renderer.render_partial(self, options)
+        else
+          view_renderer.render_template(self, options)
+        end
+      else
+        view_renderer.render_partial(self, :partial => options, :locals => locals)
+      end
     end
   end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From 6960a230fa2c2b7cf59266fc903ce0c11e887a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 13:00:51 +0200
Subject: Add a test for rendering from the controller context.

---
 .../controller/new_base/render_context_test.rb     | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 actionpack/test/controller/new_base/render_context_test.rb

(limited to 'actionpack')

diff --git a/actionpack/test/controller/new_base/render_context_test.rb b/actionpack/test/controller/new_base/render_context_test.rb
new file mode 100644
index 0000000000..3174bf42ab
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_context_test.rb
@@ -0,0 +1,54 @@
+require 'abstract_unit'
+
+module RenderContext
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_context/basic/hello_world.html.erb" => "<%= @value %> from <%= self.__controller_method__ %>",
+      "layouts/basic.html.erb" => "?<%= yield %>?"
+    )]
+
+    # Include ViewContext
+    include ActionView::Context
+
+    # And initialize the required variables
+    before_filter do
+      @output_buffer = nil
+      @virtual_path  = nil
+      @view_flow     = ActionView::OutputFlow.new
+    end
+
+    def hello_world
+      @value = "Hello"
+      render :action => "hello_world", :layout => false
+    end
+
+    def with_layout
+      @value = "Hello"
+      render :action => "hello_world", :layout => "basic"
+    end
+
+    protected
+
+    def view_context
+      self
+    end
+
+    def __controller_method__
+      "controller context!"
+    end
+  end
+
+  class RenderContextTest < Rack::TestCase
+    test "rendering using the controller as context" do
+      get "/render_context/basic/hello_world"
+      assert_body "Hello from controller context!"
+      assert_status 200
+    end
+
+    test "rendering using the controller as context with layout" do
+      get "/render_context/basic/with_layout"
+      assert_body "?Hello from controller context!?"
+      assert_status 200
+    end
+  end
+end
-- 
cgit v1.2.3


From 46611a995d91abf7bb2a64c62af13b6449c75b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 13:39:15 +0200
Subject: log errors when an exception happens when streaming.

---
 actionpack/lib/action_view/context.rb                   |  2 ++
 .../action_view/renderer/streaming_template_renderer.rb | 17 ++++++++++++++++-
 .../test/controller/new_base/render_streaming_test.rb   | 13 +++++++++++++
 actionpack/test/template/streaming_render_test.rb       |  8 ++++++--
 4 files changed, 37 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index 01be294284..d501a6eaf9 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -15,6 +15,8 @@ module ActionView
     include CompiledTemplates
     attr_accessor :output_buffer, :view_flow
 
+    # TODO Provide an easy method that initializes all variables?
+
     # Returns the contents that are yielded to a layout, given a name or a block.
     #
     # You can think of a layout as a method that is called with a block. If the user calls
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index d60b42a284..d987bc122a 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -60,11 +60,26 @@ module ActionView
       def each(&block)
         begin
           @start.call(block)
-        rescue
+        rescue Exception => exception
+          log_error(exception)
           block.call ActionView::Base.streaming_completion_on_exception
         end
         self
       end
+
+      private
+
+      # This is the same logging logic as in ShowExceptions middleware.
+      # TODO Once "exceptron" is in, refactor this piece to simply re-use exceptron.
+      def log_error(exception) #:nodoc:
+        logger = ActionController::Base.logger
+        return unless logger
+
+        message = "\n#{exception.class} (#{exception.message}):\n"
+        message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
+        message << "  " << exception.backtrace.join("\n  ")
+        logger.fatal("#{message}\n\n")
+      end
     end
 
     # For streaming, instead of rendering a given a template, we return a Body
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index fed8d40b47..48cf0ab9cb 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -83,6 +83,19 @@ module RenderStreaming
       assert_streaming!
     end
 
+    test "rendering with template exception logs the exception" do
+      io = StringIO.new
+      _old, ActionController::Base.logger = ActionController::Base.logger, Logger.new(io)
+
+      begin
+        get "/render_streaming/basic/template_exception"
+        io.rewind
+        assert_match "(undefined method `invalid!' for nil:NilClass)", io.read
+      ensure
+        ActionController::Base.logger = _old
+      end
+    end
+
     test "do not stream on HTTP/1.0" do
       get "/render_streaming/basic/hello_world", nil, "HTTP_VERSION" => "HTTP/1.0"
       assert_body "Hello world, I'm here!"
diff --git a/actionpack/test/template/streaming_render_test.rb b/actionpack/test/template/streaming_render_test.rb
index 4d69081570..b2df8efee3 100644
--- a/actionpack/test/template/streaming_render_test.rb
+++ b/actionpack/test/template/streaming_render_test.rb
@@ -13,8 +13,12 @@ class FiberedTest < ActiveSupport::TestCase
     @controller_view = TestController.new.view_context
   end
 
+  def render_body(options)
+    @view.view_renderer.render_body(@view, options)
+  end
+
   def buffered_render(options)
-    body = @view.render_body(options)
+    body = render_body(options)
     string = ""
     body.each do |piece|
       string << piece
@@ -24,7 +28,7 @@ class FiberedTest < ActiveSupport::TestCase
 
   def test_streaming_works
     content = []
-    body = @view.render_body(:template => "test/hello_world.erb", :layout => "layouts/yield")
+    body = render_body(:template => "test/hello_world.erb", :layout => "layouts/yield")
 
     body.each do |piece|
       content << piece
-- 
cgit v1.2.3


From 8dbee3aba6920edcae20abf3af7f803e528f9ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 14:50:42 +0200
Subject: Streaming docs.

---
 .../lib/action_controller/metal/streaming.rb       | 202 ++++++++++++++++++++-
 actionpack/lib/action_view/base.rb                 |   1 -
 .../renderer/streaming_template_renderer.rb        |  41 +----
 3 files changed, 202 insertions(+), 42 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 5b8111f30d..0dd847f967 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -2,7 +2,207 @@ require 'active_support/core_ext/file/path'
 require 'rack/chunked'
 
 module ActionController #:nodoc:
-  # Methods for sending streaming templates back to the client.
+  # Allow views to be streamed back to the client as they are rendered.
+  #
+  # The default way Rails renders views is by first rendering the template
+  # and then the layout. The first chunk of response is sent to the client
+  # just after the whole template is rendered, all queries are made and the
+  # layout is processed.
+  #
+  # Streaming inverts the rendering flow by rendering the layout first and
+  # streaming each part of the layout as they are processed. This allows the
+  # header of the html (which is usually in the layout) to be streamed back
+  # to client very quickly, allowing javascripts and stylesheets to be loaded
+  # earlier than usual.
+  #
+  # This approach was introduced in Rails 3.1 and is still improving. Several
+  # Rack middlewares may not work and you need to be careful when streaming.
+  # Those points are going to be addressed soon.
+  #
+  # In order to use streaming, you will need to use a Ruby version that
+  # supports Fibers (Fibers are supported since version 1.9.2 of the main
+  # Ruby implementation).
+  #
+  # == Examples
+  #
+  # Streaming can be added to a controller easily, all you need to do is
+  # call stream at the controller class:
+  #
+  #   class PostsController
+  #     stream
+  #   end
+  #
+  # The +stream+ method accepts the same options as +before_filter+ and friends:
+  #
+  #   class PostsController
+  #     stream :only => :index
+  #   end
+  #
+  # You can also selectively turn on streaming for specific actions:
+  #
+  #   class PostsController
+  #     def index
+  #       @post = Post.scoped
+  #       render :stream => true
+  #     end
+  #   end
+  #
+  # == When to use streaming
+  #
+  # Streaming may be considering an overkill for common actions like
+  # new or edit. The real benefit of streaming is on expensive actions
+  # that, for example, does a lot of queries on the database.
+  #
+  # In such actions, you want to delay queries execution as much as you can.
+  # For example, imagine the following dashboard action:
+  #
+  #   def dashboard
+  #     @posts = Post.all
+  #     @pages = Page.all
+  #     @articles = Article.all
+  #   end
+  #
+  # Most of the queries here are happening in the controller. In order to benefit
+  # most of streaming, you would want to rewrite it as:
+  #
+  #   def dashboard
+  #     # Allow lazily execution of the query
+  #     @posts = Post.scoped
+  #     @pages = Page.scoped
+  #     @articles = Article.scoped
+  #     render :stream => true
+  #   end
+  #
+  # == Communication between layout and template
+  #
+  # When streaming, the layout is rendered first than the template.
+  # This means that, if your application currently rely on variables set
+  # in the template to be used in the layout, they won't work once you
+  # move to streaming. The proper way to communicate between layout and
+  # template, regardless if you use streaming or not, is by using
+  # +content_for+, +provide+ and +yield+.
+  #
+  # Take a simple example where the layout expects the template to tell
+  # which title to use:
+  #
+  #   <html>
+  #     <head><title><%= yield :title %></title></head>
+  #     <body><%= yield %></body>
+  #   </html>
+  #
+  # You would use +content_for+ in your template to specify the title:
+  #
+  #   <%= content_for :title, "Main" %>
+  #   Hello
+  #
+  # And the final result would be:
+  #
+  #   <html>
+  #     <head><title>Main</title></head>
+  #     <body>Hello</body>
+  #   </html>
+  #
+  # However, if +content_for+ is called several times, the final result
+  # would have all calls concatenated. For instance, if we have the following
+  # template:
+  #
+  #   <%= content_for :title, "Main" %>
+  #   Hello
+  #   <%= content_for :title, " page" %>
+  #
+  # The final result would be:
+  #
+  #   <html>
+  #     <head><title>Main page</title></head>
+  #     <body>Hello</body>
+  #   </html>
+  #
+  # This means that, if you have <code>yield :title</code> in your layout
+  # and you want to use streaming, you would have to render the whole template
+  # (and eventually trigger all queries) before streaming the title and all
+  # assets, which kills the purpose of streaming. For this reason Rails 3.1
+  # introduces a helper called +provide+ that does the same as +content_for+
+  # but tells the layout to stop searching for other entries and continue rendering.
+  #
+  # For instance, the template below, using +provide+:
+  #
+  #   <%= provide :title, "Main" %>
+  #   Hello
+  #   <%= content_for :title, " page" %>
+  #
+  # Has as final result:
+  #
+  #   <html>
+  #     <head><title>Main</title></head>
+  #     <body>Hello</body>
+  #   </html>
+  #
+  # That said, when streaming, you need to properly check your templates
+  # and chose when to use +provide+ and +content_for+.
+  #
+  # == Headers, cookies, session and flash
+  #
+  # When streaming, the HTTP headers are sent to the client right before
+  # it renders the first line. This means that, modifying headers, cookies,
+  # session or flash after the template start rendering will not propagate
+  # to the client.
+  #
+  # If you try to modify cookies, session or flash, a ClosedError will be
+  # raised, showing those objects are closed for modification.
+  #
+  # == Middlewares
+  #
+  # Middlewares that need to manipulate the body won't work with streaming.
+  # You should disable those middlewares whenever streaming in development
+  # or production. For instance, Rack::Bug won't work when streaming as it
+  # needs to inject contents in the HTML body.
+  #
+  # Also Rack::Cache won't work with streaming as it does not support
+  # streaming bodies yet. So, whenever streaming, Cache-Control is automatically
+  # set to "no-cache".
+  #
+  # == Errors
+  #
+  # When it comes to streaming, exceptions get a bit more complicated. This
+  # happens because part of the template was already rendered and streamed to
+  # the client, making it impossible to render a whole exception page.
+  #
+  # Currently, when an exception happens in development or production, Rails
+  # will automatically stream to the client:
+  #
+  #   "><script type="text/javascript">window.location = "/500.html"</script></html>
+  #
+  # The first two characters (">) are required in case the exception happens
+  # while rendering attributes for a given tag. You can check the real cause
+  # for the exception in your logger.
+  #
+  # == Web server support
+  #
+  # Not all web servers support streaming out-of-the-box. You need to check
+  # the instructions for each of them.
+  #
+  # ==== Unicorn
+  #
+  # Unicorn supports streaming but it needs to be configured. For this, you
+  # need to create a config file as follow:
+  #
+  #   # unicorn.config.rb
+  #   listen 3000, :tcp_nopush => false
+  #
+  # And use it on initialization:
+  #
+  #   unicorn_rails --config-file unicorn.config.rb
+  #
+  # You may also want to configure other parameters like :tcp_nodelay. Please
+  # check its documentation for more information: http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-listen
+  #
+  # If you are using unicorn with nginx, you may need to tweak nginx.
+  # Streaming should work out of the box on Rainbows.
+  #
+  # ==== Passenger
+  #
+  # To be described.
+  # 
   module Streaming
     extend ActiveSupport::Concern
 
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 1890259ca0..baa2c5729f 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -139,7 +139,6 @@ module ActionView #:nodoc:
 
     # How to complete the streaming when an exception occurs.
     # This is our best guess: first try to close the attribute, then the tag.
-    # Currently this is private API and may be changed at *any* time.
     cattr_accessor :streaming_completion_on_exception
     @@streaming_completion_on_exception = %("><script type="text/javascript">window.location = "/500.html"</script></html>)
 
diff --git a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
index d987bc122a..1ccf5a8ddb 100644
--- a/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -4,50 +4,11 @@
 require 'fiber' if defined?(Fiber)
 
 module ActionView
-  # Consider the following layout:
-  # 
-  #   <%= yield :header %>
-  #   2
-  #   <%= yield %>
-  #   5
-  #   <%= yield :footer %>
-  #
-  # And template:
-  #
-  #     <%= provide :header, "1" %>
-  #     3
-  #     4
-  #     <%= provide :footer, "6" %>
-  # 
-  # It will stream:
-  # 
-  #     "1\n", "2\n", "3\n4\n", "5\n", "6\n"
-  #
-  # Notice that once you <%= yield %>, it will render the whole template
-  # before streaming again. In the future, we can also support streaming
-  # from the template and not only the layout.
-  #
-  # Also, notice we use +provide+ instead of +content_for+, as +provide+
-  # gives the control back to the layout as soon as it is called.
-  # With +content_for+, it would render all the template to find all
-  # +content_for+ calls. For instance, consider this layout:
-  #
-  #   <%= yield :header %>
-  #
-  # With this template:
-  #
-  #   <%= content_for :header, "1" %>
-  #   <%= provide :header, "2" %>
-  #   <%= provide :header, "3" %>
-  #
-  # It will return "12\n" because +content_for+ continues rendering the
-  # template but it is returns back to the layout as soon as it sees the
-  # first +provide+.
-  #
   # == TODO
   #
   # * Support streaming from child templates, partials and so on.
   # * Integrate exceptions with exceptron
+  # * Rack::Cache needs to support streaming bodies
   class StreamingTemplateRenderer < TemplateRenderer #:nodoc:
     # A valid Rack::Body (i.e. it responds to each).
     # It is initialized with a block that, when called, starts
-- 
cgit v1.2.3


From 13df194c002f362556560303da9c73a24ebb189e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 19:39:57 +0200
Subject: Tidy up pending TODOs after discussion with Mr. Gatoz (@wycats).

---
 actionpack/lib/action_view.rb                      |  1 -
 actionpack/lib/action_view/base.rb                 |  9 +--
 actionpack/lib/action_view/context.rb              | 76 ++++--------------
 actionpack/lib/action_view/helpers.rb              |  2 +
 .../lib/action_view/helpers/rendering_helper.rb    | 92 ++++++++++++++++++++++
 actionpack/lib/action_view/rendering.rb            | 33 --------
 .../controller/new_base/render_context_test.rb     | 14 ++--
 7 files changed, 120 insertions(+), 107 deletions(-)
 create mode 100644 actionpack/lib/action_view/helpers/rendering_helper.rb
 delete mode 100644 actionpack/lib/action_view/rendering.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 69c50a056c..92b6f7c770 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -35,7 +35,6 @@ module ActionView
     autoload :Helpers
     autoload :LookupContext
     autoload :PathSet
-    autoload :Rendering
     autoload :Template
     autoload :TestCase
 
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index baa2c5729f..ca0a89c8a5 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -131,7 +131,7 @@ module ActionView #:nodoc:
   #
   # More builder documentation can be found at http://builder.rubyforge.org.
   class Base
-    include Helpers, Rendering, ::ERB::Util, Context
+    include Helpers, ::ERB::Util, Context
 
     # Specify the proc used to decorate input tags that refer to attributes with errors.
     cattr_accessor :field_error_proc
@@ -186,11 +186,6 @@ module ActionView #:nodoc:
       assign(assigns_for_first_render)
       self.helpers = Module.new unless self.class.helpers
 
-      # Context vars initialization
-      @view_flow = OutputFlow.new
-      @output_buffer = nil
-      @virtual_path  = nil
-
       @_config = {}
       if @_controller = controller
         @_request = controller.request if controller.respond_to?(:request)
@@ -207,6 +202,8 @@ module ActionView #:nodoc:
         lookup_context.formats = formats if formats
         @view_renderer = ActionView::Renderer.new(lookup_context, controller)
       end
+
+      _prepare_context
     end
 
     # TODO Is this needed anywhere? Maybe deprecate it?
diff --git a/actionpack/lib/action_view/context.rb b/actionpack/lib/action_view/context.rb
index d501a6eaf9..083856b2ca 100644
--- a/actionpack/lib/action_view/context.rb
+++ b/actionpack/lib/action_view/context.rb
@@ -10,71 +10,27 @@ module ActionView
   #
   # In order to work with ActionController, a Context must just include this module.
   # The initialization of the variables used by the context (@output_buffer, @view_flow,
-  # and @virtual_path) is responsibility of the object that includes this module.
+  # and @virtual_path) is responsibility of the object that includes this module
+  # (although you can call _prepare_context defined below).
   module Context
     include CompiledTemplates
     attr_accessor :output_buffer, :view_flow
 
-    # TODO Provide an easy method that initializes all variables?
-
-    # Returns the contents that are yielded to a layout, given a name or a block.
-    #
-    # You can think of a layout as a method that is called with a block. If the user calls
-    # <tt>yield :some_name</tt>, the block, by default, returns <tt>content_for(:some_name)</tt>.
-    # If the user calls simply +yield+, the default block returns <tt>content_for(:layout)</tt>.
-    #
-    # The user can override this default by passing a block to the layout:
-    #
-    #   # The template
-    #   <%= render :layout => "my_layout" do %>
-    #     Content
-    #   <% end %>
-    #
-    #   # The layout
-    #   <html>
-    #     <%= yield %>
-    #   </html>
-    #
-    # In this case, instead of the default block, which would return <tt>content_for(:layout)</tt>,
-    # this method returns the block that was passed in to <tt>render :layout</tt>, and the response
-    # would be
-    #
-    #   <html>
-    #     Content
-    #   </html>
-    #
-    # Finally, the block can take block arguments, which can be passed in by +yield+:
-    #
-    #   # The template
-    #   <%= render :layout => "my_layout" do |customer| %>
-    #     Hello <%= customer.name %>
-    #   <% end %>
-    #
-    #   # The layout
-    #   <html>
-    #     <%= yield Struct.new(:name).new("David") %>
-    #   </html>
-    #
-    # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
-    # and the struct specified would be passed into the block as an argument. The result
-    # would be
-    #
-    #   <html>
-    #     Hello David
-    #   </html>
-    #
-    def _layout_for(*args, &block)
-      name = args.first
+    # Prepares the context by setting the appropriate instance variables.
+    # :api: plugin
+    def _prepare_context
+      @view_flow     = OutputFlow.new
+      @output_buffer = nil
+      @virtual_path  = nil
+    end
 
-      if name.is_a?(Symbol)
-        view_flow.get(name).html_safe
-      elsif block
-        # TODO Import capture into AV::Context or
-        # leave it as implicit dependency?
-        capture(*args, &block)
-      else
-        view_flow.get(:layout).html_safe
-      end
+    # Encapsulates the interaction with the view flow so it
+    # returns the correct buffer on yield. This is usually
+    # overwriten by helpers to add more behavior.
+    # :api: plugin
+    def _layout_for(name=nil)
+      name ||= :layout
+      view_flow.get(name).html_safe
     end
   end
 end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index 205116f610..3ef9826d30 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -19,6 +19,7 @@ module ActionView #:nodoc:
     autoload :NumberHelper
     autoload :OutputSafetyHelper
     autoload :RecordTagHelper
+    autoload :RenderingHelper
     autoload :SanitizeHelper
     autoload :SprocketsHelper
     autoload :TagHelper
@@ -48,6 +49,7 @@ module ActionView #:nodoc:
     include NumberHelper
     include OutputSafetyHelper
     include RecordTagHelper
+    include RenderingHelper
     include SanitizeHelper
     include SprocketsHelper
     include TagHelper
diff --git a/actionpack/lib/action_view/helpers/rendering_helper.rb b/actionpack/lib/action_view/helpers/rendering_helper.rb
new file mode 100644
index 0000000000..c91e03b7e8
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/rendering_helper.rb
@@ -0,0 +1,92 @@
+module ActionView
+  module Helpers
+    # = Action View Rendering
+    #
+    # Implements methods that allow rendering from a view context.
+    # In order to use this module, all you need is to implement
+    # view_renderer that returns an ActionView::Renderer object.
+    module RenderingHelper
+      # Returns the result of a render that's dictated by the options hash. The primary options are:
+      #
+      # * <tt>:partial</tt> - See ActionView::Partials.
+      # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
+      # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
+      # * <tt>:text</tt> - Renders the text passed in out.
+      #
+      # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
+      # as the locals hash.
+      def render(options = {}, locals = {}, &block)
+        case options
+        when Hash
+          if block_given?
+            view_renderer.render_partial(self, options.merge(:partial => options[:layout]), &block)
+          elsif options.key?(:partial)
+            view_renderer.render_partial(self, options)
+          else
+            view_renderer.render_template(self, options)
+          end
+        else
+          view_renderer.render_partial(self, :partial => options, :locals => locals)
+        end
+      end
+
+      # Overwrites _layout_for in the context object so it supports the case a block is
+      # passed to a partial. Returns the contents that are yielded to a layout, given a
+      # name or a block.
+      #
+      # You can think of a layout as a method that is called with a block. If the user calls
+      # <tt>yield :some_name</tt>, the block, by default, returns <tt>content_for(:some_name)</tt>.
+      # If the user calls simply +yield+, the default block returns <tt>content_for(:layout)</tt>.
+      #
+      # The user can override this default by passing a block to the layout:
+      #
+      #   # The template
+      #   <%= render :layout => "my_layout" do %>
+      #     Content
+      #   <% end %>
+      #
+      #   # The layout
+      #   <html>
+      #     <%= yield %>
+      #   </html>
+      #
+      # In this case, instead of the default block, which would return <tt>content_for(:layout)</tt>,
+      # this method returns the block that was passed in to <tt>render :layout</tt>, and the response
+      # would be
+      #
+      #   <html>
+      #     Content
+      #   </html>
+      #
+      # Finally, the block can take block arguments, which can be passed in by +yield+:
+      #
+      #   # The template
+      #   <%= render :layout => "my_layout" do |customer| %>
+      #     Hello <%= customer.name %>
+      #   <% end %>
+      #
+      #   # The layout
+      #   <html>
+      #     <%= yield Struct.new(:name).new("David") %>
+      #   </html>
+      #
+      # In this case, the layout would receive the block passed into <tt>render :layout</tt>,
+      # and the struct specified would be passed into the block as an argument. The result
+      # would be
+      #
+      #   <html>
+      #     Hello David
+      #   </html>
+      #
+      def _layout_for(*args, &block)
+        name = args.first
+
+        if block && !name.is_a?(Symbol)
+          capture(*args, &block)
+        else
+          super
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
deleted file mode 100644
index 25ec450e6e..0000000000
--- a/actionpack/lib/action_view/rendering.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-module ActionView
-  # = Action View Rendering
-  #
-  # Implements methods that allow rendering from a view context.
-  # In order to use this module, all you need is to implement
-  # view_renderer that returns an ActionView::Renderer object.
-  module Rendering
-    # Returns the result of a render that's dictated by the options hash. The primary options are:
-    #
-    # * <tt>:partial</tt> - See ActionView::Partials.
-    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
-    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
-    # * <tt>:text</tt> - Renders the text passed in out.
-    #
-    # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
-    # as the locals hash.
-    # def render(options = {}, locals = {}, &block)
-    def render(options = {}, locals = {}, &block)
-      case options
-      when Hash
-        if block_given?
-          view_renderer.render_partial(self, options.merge(:partial => options[:layout]), &block)
-        elsif options.key?(:partial)
-          view_renderer.render_partial(self, options)
-        else
-          view_renderer.render_template(self, options)
-        end
-      else
-        view_renderer.render_partial(self, :partial => options, :locals => locals)
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/actionpack/test/controller/new_base/render_context_test.rb b/actionpack/test/controller/new_base/render_context_test.rb
index 3174bf42ab..f41b14d5d6 100644
--- a/actionpack/test/controller/new_base/render_context_test.rb
+++ b/actionpack/test/controller/new_base/render_context_test.rb
@@ -1,5 +1,8 @@
 require 'abstract_unit'
 
+# This is testing the decoupling of view renderer and view context
+# by allowing the controller to be used as view context. This is
+# similar to the way sinatra renders templates.
 module RenderContext
   class BasicController < ActionController::Base
     self.view_paths = [ActionView::FixtureResolver.new(
@@ -7,15 +10,11 @@ module RenderContext
       "layouts/basic.html.erb" => "?<%= yield %>?"
     )]
 
-    # Include ViewContext
+    # 1) Include ActionView::Context to bring the required dependencies
     include ActionView::Context
 
-    # And initialize the required variables
-    before_filter do
-      @output_buffer = nil
-      @virtual_path  = nil
-      @view_flow     = ActionView::OutputFlow.new
-    end
+    # 2) Call _prepare_context that will do the required initialization
+    before_filter :_prepare_context
 
     def hello_world
       @value = "Hello"
@@ -29,6 +28,7 @@ module RenderContext
 
     protected
 
+    # 3) Set view_context to self
     def view_context
       self
     end
-- 
cgit v1.2.3


From 2db538c8a86d0a15d37d830179bce2452a1531b7 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 2 May 2011 01:26:53 +0200
Subject: made a copy-edit pass on the streaming RDoc

---
 .../lib/action_controller/metal/streaming.rb       | 68 +++++++++++-----------
 1 file changed, 35 insertions(+), 33 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 0dd847f967..1d27c3aa51 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -2,17 +2,16 @@ require 'active_support/core_ext/file/path'
 require 'rack/chunked'
 
 module ActionController #:nodoc:
-  # Allow views to be streamed back to the client as they are rendered.
+  # Allows views to be streamed back to the client as they are rendered.
   #
   # The default way Rails renders views is by first rendering the template
-  # and then the layout. The first chunk of response is sent to the client
-  # just after the whole template is rendered, all queries are made and the
-  # layout is processed.
+  # and then the layout. The response is sent to the client after the whole
+  # template is rendered, all queries are made, and the layout is processed.
   #
   # Streaming inverts the rendering flow by rendering the layout first and
   # streaming each part of the layout as they are processed. This allows the
-  # header of the html (which is usually in the layout) to be streamed back
-  # to client very quickly, allowing javascripts and stylesheets to be loaded
+  # header of the HTML (which is usually in the layout) to be streamed back
+  # to client very quickly, allowing JavaScripts and stylesheets to be loaded
   # earlier than usual.
   #
   # This approach was introduced in Rails 3.1 and is still improving. Several
@@ -20,13 +19,13 @@ module ActionController #:nodoc:
   # Those points are going to be addressed soon.
   #
   # In order to use streaming, you will need to use a Ruby version that
-  # supports Fibers (Fibers are supported since version 1.9.2 of the main
+  # supports fibers (fibers are supported since version 1.9.2 of the main
   # Ruby implementation).
   #
   # == Examples
   #
   # Streaming can be added to a controller easily, all you need to do is
-  # call stream at the controller class:
+  # call +stream+ in the controller class:
   #
   #   class PostsController
   #     stream
@@ -42,19 +41,19 @@ module ActionController #:nodoc:
   #
   #   class PostsController
   #     def index
-  #       @post = Post.scoped
+  #       @posts = Post.scoped
   #       render :stream => true
   #     end
   #   end
   #
   # == When to use streaming
   #
-  # Streaming may be considering an overkill for common actions like
-  # new or edit. The real benefit of streaming is on expensive actions
-  # that, for example, does a lot of queries on the database.
+  # Streaming may be considered to be overkill for lightweight actions like
+  # +new+ or +edit+. The real benefit of streaming is on expensive actions
+  # that, for example, do a lot of queries on the database.
   #
   # In such actions, you want to delay queries execution as much as you can.
-  # For example, imagine the following dashboard action:
+  # For example, imagine the following +dashboard+ action:
   #
   #   def dashboard
   #     @posts = Post.all
@@ -63,10 +62,10 @@ module ActionController #:nodoc:
   #   end
   #
   # Most of the queries here are happening in the controller. In order to benefit
-  # most of streaming, you would want to rewrite it as:
+  # from streaming you would want to rewrite it as:
   #
   #   def dashboard
-  #     # Allow lazily execution of the query
+  #     # Allow lazy execution of the queries
   #     @posts = Post.scoped
   #     @pages = Page.scoped
   #     @articles = Article.scoped
@@ -75,12 +74,15 @@ module ActionController #:nodoc:
   #
   # == Communication between layout and template
   #
-  # When streaming, the layout is rendered first than the template.
-  # This means that, if your application currently rely on variables set
-  # in the template to be used in the layout, they won't work once you
-  # move to streaming. The proper way to communicate between layout and
-  # template, regardless if you use streaming or not, is by using
-  # +content_for+, +provide+ and +yield+.
+  # When streaming, rendering happens top-down instead of inside-out.
+  # Rails starts with the layout, and the template is rendered later,
+  # when its +yield+ is reached.
+  #
+  # This means that, if your application currently relies on instance
+  # variables set in the template to be used in the layout, they won't
+  # work once you move to streaming. The proper way to communicate
+  # between layout and template, regardless of whether you use streaming
+  # or not, is by using +content_for+, +provide+ and +yield+.
   #
   # Take a simple example where the layout expects the template to tell
   # which title to use:
@@ -121,16 +123,16 @@ module ActionController #:nodoc:
   # and you want to use streaming, you would have to render the whole template
   # (and eventually trigger all queries) before streaming the title and all
   # assets, which kills the purpose of streaming. For this reason Rails 3.1
-  # introduces a helper called +provide+ that does the same as +content_for+
+  # introduces a new helper called +provide+ that does the same as +content_for+
   # but tells the layout to stop searching for other entries and continue rendering.
   #
-  # For instance, the template below, using +provide+:
+  # For instance, the template above using +provide+ would be:
   #
   #   <%= provide :title, "Main" %>
   #   Hello
   #   <%= content_for :title, " page" %>
   #
-  # Has as final result:
+  # Giving:
   #
   #   <html>
   #     <head><title>Main</title></head>
@@ -138,26 +140,26 @@ module ActionController #:nodoc:
   #   </html>
   #
   # That said, when streaming, you need to properly check your templates
-  # and chose when to use +provide+ and +content_for+.
+  # and choose when to use +provide+ and +content_for+.
   #
   # == Headers, cookies, session and flash
   #
   # When streaming, the HTTP headers are sent to the client right before
   # it renders the first line. This means that, modifying headers, cookies,
-  # session or flash after the template start rendering will not propagate
+  # session or flash after the template starts rendering will not propagate
   # to the client.
   #
-  # If you try to modify cookies, session or flash, a ClosedError will be
-  # raised, showing those objects are closed for modification.
+  # If you try to modify cookies, session or flash, an +ActionDispatch::ClosedError+
+  # will be raised, showing those objects are closed for modification.
   #
   # == Middlewares
   #
   # Middlewares that need to manipulate the body won't work with streaming.
   # You should disable those middlewares whenever streaming in development
-  # or production. For instance, Rack::Bug won't work when streaming as it
+  # or production. For instance, +Rack::Bug+ won't work when streaming as it
   # needs to inject contents in the HTML body.
   #
-  # Also Rack::Cache won't work with streaming as it does not support
+  # Also +Rack::Cache+ won't work with streaming as it does not support
   # streaming bodies yet. So, whenever streaming, Cache-Control is automatically
   # set to "no-cache".
   #
@@ -193,10 +195,10 @@ module ActionController #:nodoc:
   #
   #   unicorn_rails --config-file unicorn.config.rb
   #
-  # You may also want to configure other parameters like :tcp_nodelay. Please
-  # check its documentation for more information: http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-listen
+  # You may also want to configure other parameters like <tt>:tcp_nodelay</tt>.
+  # Please check its documentation for more information: http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-listen
   #
-  # If you are using unicorn with nginx, you may need to tweak nginx.
+  # If you are using Unicorn with Nginx, you may need to tweak Nginx.
   # Streaming should work out of the box on Rainbows.
   #
   # ==== Passenger
-- 
cgit v1.2.3


From f76726c09d74c4de937054b75464857d8b8edb76 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sun, 1 May 2011 23:23:31 -0700
Subject: Use sprockets beta gem

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

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 0d667a76a7..a2570587ce 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.7')
   s.add_dependency('rack-mount',       '~> 0.7.2')
+  s.add_dependency('sprockets',        '~> 2.0.0.beta.1')
   s.add_dependency('tzinfo',           '~> 0.3.23')
   s.add_dependency('erubis',           '~> 2.7.0')
 end
-- 
cgit v1.2.3


From c577f186aa4b7bcf12acfcc5b7fc7760d96cc663 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Tue, 3 May 2011 02:33:31 +0700
Subject: Update CHANGELOG file to mention my name

On the commit for updating :format parameters, seems like I've left out
the credit name after the CHANGELOG entry. This should fix it, and in
case someone has a problem they could seek assistance easier.
---
 actionpack/CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 76dbfe7895..07a23ddb63 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -4,7 +4,9 @@
 
 * Implicit actions named not_implemented can be rendered [Santiago Pastorino]
 
-* Wildcard route will always matching the optional format segment by default. For example if you have this route:
+* Wildcard route will always matching the optional format segment by default. [Prem Sichanugrist]
+
+  For example if you have this route:
 
     map '*pages' => 'pages#show'
 
-- 
cgit v1.2.3


From 8c9e4d520291871e5319bc0e0a890527d8aea099 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Thu, 28 Apr 2011 15:56:11 +0700
Subject: Add `ActionController::ParamsWrapper` to wrap parameters into a
 nested hash

This will allow us to do a rootless JSON/XML request to server.
---
 actionpack/CHANGELOG                               |   4 +
 actionpack/lib/action_controller.rb                |   1 +
 actionpack/lib/action_controller/base.rb           |   1 +
 .../lib/action_controller/metal/params_wrapper.rb  | 197 +++++++++++++++++++++
 actionpack/test/controller/params_wrapper_test.rb  | 187 +++++++++++++++++++
 .../dispatch/request/json_params_parsing_test.rb   |  53 ++++++
 .../dispatch/request/xml_params_parsing_test.rb    |  38 ++++
 7 files changed, 481 insertions(+)
 create mode 100644 actionpack/lib/action_controller/metal/params_wrapper.rb
 create mode 100644 actionpack/test/controller/params_wrapper_test.rb

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 76dbfe7895..f692b169df 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,9 @@
 *Rails 3.1.0 (unreleased)*
 
+* Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default [Prem Sichanugrist]
+
+  This can be customizabled by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
+
 * RJS has been extracted out to a gem. [fxn]
 
 * Implicit actions named not_implemented can be rendered [Santiago Pastorino]
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index aab2b9dc25..eba5e9377b 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -23,6 +23,7 @@ module ActionController
     autoload :ImplicitRender
     autoload :Instrumentation
     autoload :MimeResponds
+    autoload :ParamsWrapper
     autoload :RackDelegation
     autoload :Redirecting
     autoload :Renderers
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ca0dccf575..373df7fb55 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -194,6 +194,7 @@ module ActionController
       Caching,
       MimeResponds,
       ImplicitRender,
+      ParamsWrapper,
 
       Cookies,
       Flash,
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
new file mode 100644
index 0000000000..29ff546139
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -0,0 +1,197 @@
+require 'active_support/core_ext/class/attribute'
+require 'action_dispatch/http/mime_types'
+
+module ActionController
+  # Wraps parameters hash into nested hash. This will allow client to submit
+  # POST request without having to specify a root element in it.
+  #
+  # By default, this functionality won't be enabled by default. You can enable
+  # it globally by setting +ActionController::Base.wrap_parameters+:
+  #
+  #     ActionController::Base.wrap_parameters = [:json]
+  #
+  # You could also turn it on per controller by setting the format array to
+  # non-empty array:
+  #
+  #     class UsersController < ApplicationController
+  #       wrap_parameters :format => [:json, :xml]
+  #     end
+  #
+  # If you enable +ParamsWrapper+ for +:json+ format. Instead of having to
+  # send JSON parameters like this:
+  #
+  #     {"user": {"name": "Konata"}}
+  #
+  # You can now just send a parameters like this:
+  #
+  #     {"name": "Konata"}
+  #
+  # And it will be wrapped into a nested hash with the key name matching
+  # controller's name. For example, if you're posting to +UsersController+,
+  # your new +params+ hash will look like this:
+  #
+  #     {"name" => "Konata", "user" => {"name" => "Konata"}}
+  #
+  # You can also specify the key in which the parameters should be wrapped to,
+  # and also the list of attributes it should wrap by using either +:only+ or
+  # +:except+ options like this:
+  #
+  #     class UsersController < ApplicationController
+  #       wrap_parameters :person, :only => [:username, :password]
+  #     end
+  #
+  # If you're going to pass the parameters to an +ActiveModel+ object (such as
+  # +User.new(params[:user])+), you might consider passing the model class to
+  # the method instead. The +ParamsWrapper+ will actually try to determine the
+  # list of attribute names from the model and only wrap those attributes:
+  #
+  #     class UsersController < ApplicationController
+  #       wrap_parameters Person
+  #     end
+  #
+  # You still could pass +:only+ and +:except+ to set the list of attributes
+  # you want to wrap.
+  #
+  # By default, if you don't specify the key in which the parameters would be
+  # wrapped to, +ParamsWrapper+ will actually try to determine if there's
+  # a model related to it or not. This controller, for example:
+  #
+  #     class Admin::UsersController < ApplicationController
+  #     end
+  #
+  # will try to check if +Admin::User+ or +User+ model exists, and use it to
+  # determine the wrapper key respectively. If both of the model doesn't exists,
+  # it will then fallback to use +user+ as the key.
+  module ParamsWrapper
+    extend ActiveSupport::Concern
+
+    EXCLUDE_PARAMETERS = %w(authenticity_token _method utf8)
+
+    included do
+      class_attribute :_wrapper_options
+      self._wrapper_options = {:format => []}
+    end
+
+    module ClassMethods
+      # Sets the name of the wrapper key, or the model which +ParamsWrapper+
+      # would use to determine the attribute names from.
+      #
+      # ==== Examples
+      #   wrap_parameters :format => :xml
+      #     # enables the parmeter wrappes for XML format
+      #
+      #   wrap_parameters :person
+      #     # wraps parameters into +params[:person]+ hash
+      #
+      #   wrap_parameters Person
+      #     # wraps parameters by determine the wrapper key from Person class
+      #     (+person+, in this case) and the list of attribute names
+      #
+      #   wrap_parameters :only => [:username, :title]
+      #     # wraps only +:username+ and +:title+ attributes from parameters.
+      #
+      #   wrap_parameters false
+      #     # disable parameters wrapping for this controller altogether.
+      #
+      # ==== Options
+      # * <tt>:format</tt> - The list of formats in which the parameters wrapper
+      #   will be enabled.
+      # * <tt>:only</tt> - The list of attribute names which parmeters wrapper
+      #   will wrap into a nested hash.
+      # * <tt>:only</tt> - The list of attribute names which parmeters wrapper
+      #   will exclude from a nested hash.
+      def wrap_parameters(name_or_model_or_options, options = {})
+        if !name_or_model_or_options.is_a? Hash
+          if name_or_model_or_options != false
+            options = options.merge(:name_or_model => name_or_model_or_options)
+          else
+            options = opions.merge(:format => [])
+          end
+        else
+          options = name_or_model_or_options
+        end
+
+        options[:name_or_model] ||= _default_wrap_model
+        self._wrapper_options = self._wrapper_options.merge(options)
+      end
+
+      # Sets the default wrapper key or model which will be used to determine
+      # wrapper key and attribute names. Will be called automatically when the
+      # module is inherited.
+      def inherited(klass)
+        if klass._wrapper_options[:format].present?
+          klass._wrapper_options = klass._wrapper_options.merge(:name_or_model => klass._default_wrap_model)
+        end
+        super
+      end
+
+      # Determine the wrapper model from the controller's name. By convention,
+      # this could be done by trying to find the defined model that has the
+      # same singularize name as the controller. For example, +UsersController+
+      # will try to find if the +User+ model exists.
+      def _default_wrap_model
+        model_name = self.name.sub(/Controller$/, '').singularize
+
+        begin
+          model_klass = model_name.constantize
+        rescue NameError => e
+          unscoped_model_name = model_name.split("::", 2).last
+          break if unscoped_model_name == model_name
+          model_name = unscoped_model_name
+        end until model_klass
+
+        model_klass
+      end
+    end
+
+    # Performs parameters wrapping upon the request. Will be called automatically
+    # by the metal call stack.
+    def process_action(*args)
+      if _wrapper_enabled?
+        wrapped_hash = { _wrapper_key => request.request_parameters.slice(*_wrapped_keys) }
+        wrapped_filtered_hash = { _wrapper_key => request.filtered_parameters.slice(*_wrapped_keys) }
+
+        # This will make the wrapped hash accessible from controller and view
+        request.parameters.merge! wrapped_hash
+        request.request_parameters.merge! wrapped_hash
+
+        # This will make the wrapped hash displayed in the log file
+        request.filtered_parameters.merge! wrapped_filtered_hash
+      end
+      super
+    end
+
+    private
+      # Returns the wrapper key which will use to stored wrapped parameters.
+      def _wrapper_key
+        @_wrapper_key ||= if _wrapper_options[:name_or_model]
+            _wrapper_options[:name_or_model].to_s.demodulize.underscore
+          else
+            self.class.controller_name.singularize
+          end
+      end
+
+      # Returns the list of parameters which will be selected for wrapped.
+      def _wrapped_keys
+        @_wrapped_keys ||= if _wrapper_options[:only]
+            Array(_wrapper_options[:only]).collect(&:to_s)
+          elsif _wrapper_options[:except]
+            request.request_parameters.keys - Array(_wrapper_options[:except]).collect(&:to_s) - EXCLUDE_PARAMETERS
+          elsif _wrapper_options[:name_or_model].respond_to?(:column_names)
+            _wrapper_options[:name_or_model].column_names
+          else
+            request.request_parameters.keys - EXCLUDE_PARAMETERS
+          end
+      end
+
+      # Returns the list of enabled formats.
+      def _wrapper_formats
+        Array(_wrapper_options[:format])
+      end
+
+      # Checks if we should perform parameters wrapping.
+      def _wrapper_enabled?
+        _wrapper_formats.any?{ |format| format == request.content_mime_type.try(:ref) } && request.request_parameters[_wrapper_key].nil?
+      end
+  end
+end
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
new file mode 100644
index 0000000000..2e5d096fcd
--- /dev/null
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -0,0 +1,187 @@
+require 'abstract_unit'
+
+module Admin; class User; end; end
+
+class ParamsWrapperTest < ActionController::TestCase
+  class UsersController < ActionController::Base
+    def test
+      render :json => params.except(:controller, :action)
+    end
+  end
+
+  class User; end
+  class Person; end
+
+  tests UsersController
+
+  def test_derivered_name_from_controller
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu' }
+      assert_equal '{"username":"sikachu","user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_specify_wrapper_name
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu' }
+      assert_equal '{"username":"sikachu","person":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_specify_wrapper_model
+    with_default_wrapper_options do
+      UsersController.wrap_parameters Person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu' }
+      assert_equal '{"username":"sikachu","person":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_specify_only_option
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :only => :username
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_specify_except_option
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :except => :title
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_specify_both_wrapper_name_and_only_option
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :person, :only => :username
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","person":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_not_enabled_format
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/xml'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer"}', @response.body
+    end
+  end
+
+  def test_specify_format
+    with_default_wrapper_options do
+      UsersController.wrap_parameters :format => :xml
+
+      @request.env['CONTENT_TYPE'] = 'application/xml'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu","title":"Developer"}}', @response.body
+    end
+  end
+
+  def test_not_wrap_reserved_parameters
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'authenticity_token' => 'pwned', '_method' => 'put', 'utf8' => '&#9731;', 'username' => 'sikachu' }
+      assert_equal '{"authenticity_token":"pwned","_method":"put","utf8":"&#9731;","username":"sikachu","user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_no_double_wrap_if_key_exists
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'user' => { 'username' => 'sikachu' }}
+      assert_equal '{"user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_nested_params
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'person' => { 'username' => 'sikachu' }}
+      assert_equal '{"person":{"username":"sikachu"},"user":{"person":{"username":"sikachu"}}}', @response.body
+    end
+  end
+
+  def test_derived_wrapped_keys_from_matching_model
+    with_default_wrapper_options do
+      User.expects(:respond_to?).with(:column_names).returns(true)
+      User.expects(:column_names).returns(["username"])
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_derived_wrapped_keys_from_specified_model
+    with_default_wrapper_options do
+      Person.expects(:respond_to?).with(:column_names).returns(true)
+      Person.expects(:column_names).returns(["username"])
+
+      UsersController.wrap_parameters Person
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","person":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  private
+    def with_default_wrapper_options(&block)
+      @controller.class._wrapper_options = {:format => [:json]}
+      @controller.class.inherited(@controller.class)
+      yield
+    end
+end
+
+class NamespacedParamsWrapperTest < ActionController::TestCase
+  module Admin
+    class UsersController < ActionController::Base
+      def test
+        render :json => params.except(:controller, :action)
+      end
+    end
+
+    class User; end
+  end
+  class User; end
+  class Person; end
+
+  tests Admin::UsersController
+
+  def test_derivered_name_from_controller
+    with_default_wrapper_options do
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu' }
+      assert_equal '{"username":"sikachu","user":{"username":"sikachu"}}', @response.body
+    end
+  end
+
+  def test_namespace_lookup_when_namespaced_model_available
+    with_default_wrapper_options do
+      Admin::User.expects(:respond_to?).with(:column_names).returns(false)
+
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu' }
+    end
+  end
+
+  private
+    def with_default_wrapper_options(&block)
+      @controller.class._wrapper_options = {:format => [:json]}
+      @controller.class.inherited(@controller.class)
+      yield
+    end
+end
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index 34db7a4c66..d854d55173 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -63,3 +63,56 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
       end
     end
 end
+
+class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
+  class UsersController < ActionController::Base
+    wrap_parameters :format => :json
+
+    class << self
+      attr_accessor :last_request_parameters, :last_parameters
+    end
+
+    def parse
+      self.class.last_request_parameters = request.request_parameters
+      self.class.last_parameters = params
+      head :ok
+    end
+  end
+
+  def teardown
+    UsersController.last_request_parameters = nil
+  end
+
+  test "parses json params for application json" do
+    assert_parses(
+      {"user" => {"username" => "sikachu"}, "username" => "sikachu"},
+      "{\"username\": \"sikachu\"}", { 'CONTENT_TYPE' => 'application/json' }
+    )
+  end
+
+  test "parses json params for application jsonrequest" do
+    assert_parses(
+      {"user" => {"username" => "sikachu"}, "username" => "sikachu"},
+      "{\"username\": \"sikachu\"}", { 'CONTENT_TYPE' => 'application/jsonrequest' }
+    )
+  end
+
+  private
+    def assert_parses(expected, actual, headers = {})
+      with_test_routing(UsersController) do
+        post "/parse", actual, headers
+        assert_response :ok
+        assert_equal(expected, UsersController.last_request_parameters)
+        assert_equal(expected.merge({"action" => "parse"}), UsersController.last_parameters)
+      end
+    end
+
+    def with_test_routing(controller)
+      with_routing do |set|
+        set.draw do
+          match ':action', :to => controller
+        end
+        yield
+      end
+    end
+end
diff --git a/actionpack/test/dispatch/request/xml_params_parsing_test.rb b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
index ad9de02eb4..38453dfe48 100644
--- a/actionpack/test/dispatch/request/xml_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/xml_params_parsing_test.rb
@@ -115,3 +115,41 @@ class LegacyXmlParamsParsingTest < XmlParamsParsingTest
       {'HTTP_X_POST_DATA_FORMAT' => 'xml'}
     end
 end
+
+class RootLessXmlParamsParsingTest < ActionDispatch::IntegrationTest
+  class TestController < ActionController::Base
+    wrap_parameters :person, :format => :xml
+
+    class << self
+      attr_accessor :last_request_parameters
+    end
+
+    def parse
+      self.class.last_request_parameters = request.request_parameters
+      head :ok
+    end
+  end
+
+  def teardown
+    TestController.last_request_parameters = nil
+  end
+
+  test "parses hash params" do
+    with_test_routing do
+      xml = "<name>David</name>"
+      post "/parse", xml, {'CONTENT_TYPE' => 'application/xml'}
+      assert_response :ok
+      assert_equal({"name" => "David", "person" => {"name" => "David"}}, TestController.last_request_parameters)
+    end
+  end
+
+  private
+    def with_test_routing
+      with_routing do |set|
+        set.draw do
+          match ':action', :to => ::RootLessXmlParamsParsingTest::TestController
+        end
+        yield
+      end
+    end
+end
-- 
cgit v1.2.3


From 73c94ed97ab6639d06dade1738aa5b9f49294340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 2 May 2011 23:33:58 +0200
Subject: Add ignore_accept_header config to AD::Request.

---
 .../lib/action_dispatch/http/mime_negotiation.rb   | 27 ++++++++++++++++++----
 actionpack/test/dispatch/request_test.rb           | 22 ++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 68ba1a81b5..980c658ab7 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -1,6 +1,13 @@
 module ActionDispatch
   module Http
     module MimeNegotiation
+      extend ActiveSupport::Concern
+
+      included do
+        mattr_accessor :ignore_accept_header
+        self.ignore_accept_header = false
+      end
+
       # The MIME type of the HTTP request, such as Mime::XML.
       #
       # For backward compatibility, the post \format is extracted from the
@@ -42,16 +49,14 @@ module ActionDispatch
         formats.first
       end
 
-      BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
-
       def formats
-        accept = @env['HTTP_ACCEPT']
-
         @env["action_dispatch.request.formats"] ||=
           if parameters[:format]
             Array(Mime[parameters[:format]])
-          elsif xhr? || (accept && accept !~ BROWSER_LIKE_ACCEPTS)
+          elsif use_accept_header && valid_accept_header
             accepts
+          elsif xhr?
+            [Mime::JS]
           else
             [Mime::HTML]
           end
@@ -87,6 +92,18 @@ module ActionDispatch
 
         order.include?(Mime::ALL) ? formats.first : nil
       end
+
+      protected
+
+      BROWSER_LIKE_ACCEPTS = /,\s*\*\/\*|\*\/\*\s*,/
+
+      def valid_accept_header
+        xhr? || (accept && accept !~ BROWSER_LIKE_ACCEPTS)
+      end
+
+      def use_accept_header
+        !self.class.ignore_accept_header
+      end
     end
   end
 end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index f03ae7f2b3..86bbbab175 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -452,6 +452,28 @@ class RequestTest < ActiveSupport::TestCase
     assert request.formats.empty?
   end
 
+  test "ignore_accept_header" do
+    ActionDispatch::Request.ignore_accept_header = true
+
+    begin
+      request = stub_request 'HTTP_ACCEPT' => 'application/xml'
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::HTML ], request.formats
+
+      request = stub_request 'HTTP_ACCEPT' => 'application/xml',
+                             'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::JS ], request.formats
+
+      request = stub_request 'HTTP_ACCEPT' => 'application/xml',
+                             'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
+      request.expects(:parameters).at_least_once.returns({:format => :json})
+      assert_equal [ Mime::JSON ], request.formats
+    ensure
+      ActionDispatch::Request.ignore_accept_header = false
+    end
+  end
+
   test "negotiate_mime" do
     request = stub_request 'HTTP_ACCEPT' => 'text/html',
                            'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
-- 
cgit v1.2.3


From 83e35b9c08b97db7605542e69a8fa8d23c7df211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 2 May 2011 23:38:39 +0200
Subject: Allow ignore_accept_header through configuration option.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 0a3bd5fe40..f51cc3711b 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -9,10 +9,12 @@ module ActionDispatch
     config.action_dispatch.show_exceptions = true
     config.action_dispatch.best_standards_support = true
     config.action_dispatch.tld_length = 1
+    config.action_dispatch.ignore_accept_header = false
     config.action_dispatch.rack_cache = {:metastore => "rails:/", :entitystore => "rails:/", :verbose => true}
 
     initializer "action_dispatch.configure" do |app|
       ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length
+      ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header
     end
   end
 end
-- 
cgit v1.2.3


From 11db2ae4e0f6e60c9619a808350c1550c4c78c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 2 May 2011 23:44:23 +0200
Subject: Koz asked to test something crazy.

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

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 86bbbab175..fb2faf7a4e 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -460,6 +460,18 @@ class RequestTest < ActiveSupport::TestCase
       request.expects(:parameters).at_least_once.returns({})
       assert_equal [ Mime::HTML ], request.formats
 
+      request = stub_request 'HTTP_ACCEPT' => 'koz-asked/something-crazy'
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::HTML ], request.formats
+
+      request = stub_request 'HTTP_ACCEPT' => '*/*;q=0.1'
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::HTML ], request.formats
+
+      request = stub_request 'HTTP_ACCEPT' => 'application/jxw'
+      request.expects(:parameters).at_least_once.returns({})
+      assert_equal [ Mime::HTML ], request.formats
+
       request = stub_request 'HTTP_ACCEPT' => 'application/xml',
                              'HTTP_X_REQUESTED_WITH' => "XMLHttpRequest"
       request.expects(:parameters).at_least_once.returns({})
-- 
cgit v1.2.3


From b29a905f949dbed5052c55184bd5e0838517ec8d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 2 May 2011 17:04:21 -0500
Subject: Flunk makes a lot more sense, doesnt it (hat tip @tenderlove)

---
 actionpack/lib/action_dispatch/testing/assertions/response.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
index e209978fb7..3335742d47 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -42,7 +42,7 @@ module ActionDispatch
         elsif type.is_a?(Symbol) && @response.response_code == Rack::Utils::SYMBOL_TO_STATUS_CODE[type]
           assert_block("") { true } # to count the assertion
         else
-          assert(false, build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code))
+          flunk(build_message(message, "Expected response to be a <?>, but was <?>", type, @response.response_code))
         end
       end
 
-- 
cgit v1.2.3


From c894fff60a9146754fc9f7c4ddf992634c2bedd3 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Mon, 2 May 2011 19:07:48 -0300
Subject: Fix ParamsWrapper docs errors

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 29ff546139..7827ed598e 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -5,7 +5,7 @@ module ActionController
   # Wraps parameters hash into nested hash. This will allow client to submit
   # POST request without having to specify a root element in it.
   #
-  # By default, this functionality won't be enabled by default. You can enable
+  # By default this functionality won't be enabled. You can enable
   # it globally by setting +ActionController::Base.wrap_parameters+:
   #
   #     ActionController::Base.wrap_parameters = [:json]
@@ -78,7 +78,7 @@ module ActionController
       #
       # ==== Examples
       #   wrap_parameters :format => :xml
-      #     # enables the parmeter wrappes for XML format
+      #     # enables the parmeter wrapper for XML format
       #
       #   wrap_parameters :person
       #     # wraps parameters into +params[:person]+ hash
-- 
cgit v1.2.3


From 81cfbf4146d3c5a58054b64112b8ce196f2fc061 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 2 May 2011 15:42:38 -0700
Subject: removing auto_link and moving it to the rails_autolink gem.  :bomb:

---
 actionpack/CHANGELOG                              |   6 +
 actionpack/lib/action_view/helpers/text_helper.rb | 125 -----------
 actionpack/test/template/text_helper_test.rb      | 254 ----------------------
 3 files changed, 6 insertions(+), 379 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 184b2af018..448ee878b1 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,11 @@
 *Rails 3.1.0 (unreleased)*
 
+* auto_link has been removed with no replacement.  If you still use auto_link
+  please install the rails_autolink gem:
+    http://github.com/tenderlove/rails_autolink
+
+  [tenderlove]
+
 * Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default [Prem Sichanugrist]
 
   This can be customizabled by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 06e2b027da..ca09c77b5c 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -265,60 +265,6 @@ module ActionView
         text.html_safe.safe_concat("</p>")
       end
 
-      # Turns all URLs and e-mail addresses into clickable links. The <tt>:link</tt> option
-      # will limit what should be linked. You can add HTML attributes to the links using
-      # <tt>:html</tt>. Possible values for <tt>:link</tt> are <tt>:all</tt> (default),
-      # <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
-      # e-mail address is yielded and the result is used as the link text.
-      #
-      # ==== Examples
-      #   auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com")
-      #   # => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> and
-      #   #     say hello to <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
-      #
-      #   auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :link => :urls)
-      #   # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
-      #   #     or e-mail david@loudthinking.com"
-      #
-      #   auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :link => :email_addresses)
-      #   # => "Visit http://www.loudthinking.com/ or e-mail <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
-      #
-      #   post_body = "Welcome to my new blog at http://www.myblog.com/.  Please e-mail me at me@email.com."
-      #   auto_link(post_body, :html => { :target => '_blank' }) do |text|
-      #     truncate(text, :length => 15)
-      #   end
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.
-      #         Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
-      #
-      #
-      # You can still use <tt>auto_link</tt> with the old API that accepts the
-      # +link+ as its optional second parameter and the +html_options+ hash
-      # as its optional third parameter:
-      #   post_body = "Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com."
-      #   auto_link(post_body, :urls)
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\">http://www.myblog.com</a>.
-      #         Please e-mail me at me@email.com."
-      #
-      #   auto_link(post_body, :all, :target => "_blank")
-      #   # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.myblog.com</a>.
-      #         Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
-      def auto_link(text, *args, &block)#link = :all, html = {}, &block)
-        return '' if text.blank?
-
-        options = args.size == 2 ? {} : args.extract_options! # this is necessary because the old auto_link API has a Hash as its last parameter
-        unless args.empty?
-          options[:link] = args[0] || :all
-          options[:html] = args[1] || {}
-        end
-        options.reverse_merge!(:link => :all, :html => {})
-
-        case options[:link].to_sym
-          when :all                         then auto_link_email_addresses(auto_link_urls(text, options[:html], options, &block), options[:html], &block)
-          when :email_addresses             then auto_link_email_addresses(text, options[:html], &block)
-          when :urls                        then auto_link_urls(text, options[:html], options, &block)
-        end
-      end
-
       # Creates a Cycle object whose _to_s_ method cycles through elements of an
       # array every time it is called. This can be used for example, to alternate
       # classes for table rows.  You can use named cycles to allow nesting in loops.
@@ -464,77 +410,6 @@ module ActionView
           @_cycles = Hash.new unless defined?(@_cycles)
           @_cycles[name] = cycle_object
         end
-
-        AUTO_LINK_RE = %r{
-            (?: ([0-9A-Za-z+.:-]+:)// | www\. )
-            [^\s<]+
-          }x
-
-        # regexps for determining context, used high-volume
-        AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, /<\/a>/i]
-
-        AUTO_EMAIL_RE = /[\w.!#\$%+-]+@[\w-]+(?:\.[\w-]+)+/
-
-        BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
-
-        # Turns all urls into clickable links.  If a block is given, each url
-        # is yielded and the result is used as the link text.
-        def auto_link_urls(text, html_options = {}, options = {})
-          link_attributes = html_options.stringify_keys
-          text.gsub(AUTO_LINK_RE) do
-            scheme, href = $1, $&
-            punctuation = []
-
-            if auto_linked?($`, $')
-              # do not change string; URL is already linked
-              href
-            else
-              # don't include trailing punctuation character as part of the URL
-              while href.sub!(/[^\w\/-]$/, '')
-                punctuation.push $&
-                if opening = BRACKETS[punctuation.last] and href.scan(opening).size > href.scan(punctuation.last).size
-                  href << punctuation.pop
-                  break
-                end
-              end
-
-              link_text = block_given?? yield(href) : href
-              href = 'http://' + href unless scheme
-
-              unless options[:sanitize] == false
-                link_text = sanitize(link_text)
-                href      = sanitize(href)
-              end
-              content_tag(:a, link_text, link_attributes.merge('href' => href), !!options[:sanitize]) + punctuation.reverse.join('')
-            end
-          end
-        end
-
-        # Turns all email addresses into clickable links.  If a block is given,
-        # each email is yielded and the result is used as the link text.
-        def auto_link_email_addresses(text, html_options = {}, options = {})
-          text.gsub(AUTO_EMAIL_RE) do
-            text = $&
-
-            if auto_linked?($`, $')
-              text.html_safe
-            else
-              display_text = (block_given?) ? yield(text) : text
-
-              unless options[:sanitize] == false
-                text         = sanitize(text)
-                display_text = sanitize(display_text) unless text == display_text
-              end
-              mail_to text, display_text, html_options
-            end
-          end
-        end
-
-        # Detects already linked context or position in the middle of a tag
-        def auto_linked?(left, right)
-          (left =~ AUTO_LINK_CRE[0] and right =~ AUTO_LINK_CRE[1]) or
-            (left.rindex(AUTO_LINK_CRE[2]) and $' !~ AUTO_LINK_CRE[3])
-        end
     end
   end
 end
diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb
index a4fcff5167..740f577a6e 100644
--- a/actionpack/test/template/text_helper_test.rb
+++ b/actionpack/test/template/text_helper_test.rb
@@ -278,260 +278,6 @@ class TextHelperTest < ActionView::TestCase
     assert_equal("12 berries", pluralize(12, "berry"))
   end
 
-  def test_auto_link_parsing
-    urls = %w(
-      http://www.rubyonrails.com
-      http://www.rubyonrails.com:80
-      http://www.rubyonrails.com/~minam
-      https://www.rubyonrails.com/~minam
-      http://www.rubyonrails.com/~minam/url%20with%20spaces
-      http://www.rubyonrails.com/foo.cgi?something=here
-      http://www.rubyonrails.com/foo.cgi?something=here&and=here
-      http://www.rubyonrails.com/contact;new
-      http://www.rubyonrails.com/contact;new%20with%20spaces
-      http://www.rubyonrails.com/contact;new?with=query&string=params
-      http://www.rubyonrails.com/~minam/contact;new?with=query&string=params
-      http://en.wikipedia.org/wiki/Wikipedia:Today%27s_featured_picture_%28animation%29/January_20%2C_2007
-      http://www.mail-archive.com/rails@lists.rubyonrails.org/
-      http://www.amazon.com/Testing-Equal-Sign-In-Path/ref=pd_bbs_sr_1?ie=UTF8&s=books&qid=1198861734&sr=8-1
-      http://en.wikipedia.org/wiki/Texas_hold'em
-      https://www.google.com/doku.php?id=gps:resource:scs:start
-      http://connect.oraclecorp.com/search?search[q]=green+france&search[type]=Group
-      http://of.openfoundry.org/projects/492/download#4th.Release.3
-      http://maps.google.co.uk/maps?f=q&q=the+london+eye&ie=UTF8&ll=51.503373,-0.11939&spn=0.007052,0.012767&z=16&iwloc=A
-    )
-
-    urls.each do |url|
-      assert_equal generate_result(url), auto_link(url)
-    end
-  end
-
-  def generate_result(link_text, href = nil, escape = false)
-    href ||= link_text
-    if escape
-      %{<a href="#{CGI::escapeHTML href}">#{CGI::escapeHTML link_text}</a>}
-    else
-      %{<a href="#{href}">#{link_text}</a>}
-    end
-  end
-
-  def test_auto_link_should_not_be_html_safe
-    email_raw    = 'santiago@wyeworks.com'
-    link_raw     = 'http://www.rubyonrails.org'
-
-    assert !auto_link(nil).html_safe?, 'should not be html safe'
-    assert !auto_link('').html_safe?, 'should not be html safe'
-    assert !auto_link("#{link_raw} #{link_raw} #{link_raw}").html_safe?, 'should not be html safe'
-    assert !auto_link("hello #{email_raw}").html_safe?, 'should not be html safe'
-  end
-
-  def test_auto_link_email_address
-    email_raw    = 'aaron@tenderlovemaking.com'
-    email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
-    assert !auto_link_email_addresses(email_result).html_safe?, 'should not be html safe'
-  end
-
-  def test_auto_link
-    email_raw    = 'david@loudthinking.com'
-    email_result = %{<a href="mailto:#{email_raw}">#{email_raw}</a>}
-    link_raw     = 'http://www.rubyonrails.com'
-    link_result  = generate_result(link_raw)
-    link_result_with_options = %{<a href="#{link_raw}" target="_blank">#{link_raw}</a>}
-
-    assert_equal '', auto_link(nil)
-    assert_equal '', auto_link('')
-    assert_equal "#{link_result} #{link_result} #{link_result}", auto_link("#{link_raw} #{link_raw} #{link_raw}")
-
-    assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses)
-    assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls)
-    assert_equal %(Go to #{link_raw}), auto_link("Go to #{link_raw}", :email_addresses)
-    assert_equal %(Go to #{link_result} and say hello to #{email_result}), auto_link("Go to #{link_raw} and say hello to #{email_raw}")
-    assert_equal %(<p>Link #{link_result}</p>), auto_link("<p>Link #{link_raw}</p>")
-    assert_equal %(<p>#{link_result} Link</p>), auto_link("<p>#{link_raw} Link</p>")
-    assert_equal %(<p>Link #{link_result_with_options}</p>), auto_link("<p>Link #{link_raw}</p>", :all, {:target => "_blank"})
-    assert_equal %(Go to #{link_result}.), auto_link(%(Go to #{link_raw}.))
-    assert_equal %(<p>Go to #{link_result}, then say hello to #{email_result}.</p>), auto_link(%(<p>Go to #{link_raw}, then say hello to #{email_raw}.</p>))
-    assert_equal %(#{link_result} #{link_result}), auto_link(%(#{link_result} #{link_raw}))
-
-    email2_raw    = '+david@loudthinking.com'
-    email2_result = %{<a href="mailto:#{email2_raw}">#{email2_raw}</a>}
-    assert_equal email2_result, auto_link(email2_raw)
-
-    email3_raw    = '+david@loudthinking.com'
-    email3_result = %{<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;+%64%61%76%69%64@%6c%6f%75%64%74%68%69%6e%6b%69%6e%67.%63%6f%6d">#{email3_raw}</a>}
-    assert_equal email3_result, auto_link(email3_raw, :all, :encode => :hex)
-    assert_equal email3_result, auto_link(email3_raw, :email_addresses, :encode => :hex)
-
-    link2_raw    = 'www.rubyonrails.com'
-    link2_result = generate_result(link2_raw, "http://#{link2_raw}")
-    assert_equal %(Go to #{link2_result}), auto_link("Go to #{link2_raw}", :urls)
-    assert_equal %(Go to #{link2_raw}), auto_link("Go to #{link2_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link2_result}</p>), auto_link("<p>Link #{link2_raw}</p>")
-    assert_equal %(<p>#{link2_result} Link</p>), auto_link("<p>#{link2_raw} Link</p>")
-    assert_equal %(Go to #{link2_result}.), auto_link(%(Go to #{link2_raw}.))
-    assert_equal %(<p>Say hello to #{email_result}, then go to #{link2_result}.</p>), auto_link(%(<p>Say hello to #{email_raw}, then go to #{link2_raw}.</p>))
-
-    link3_raw    = 'http://manuals.ruby-on-rails.com/read/chapter.need_a-period/103#page281'
-    link3_result = generate_result(link3_raw)
-    assert_equal %(Go to #{link3_result}), auto_link("Go to #{link3_raw}", :urls)
-    assert_equal %(Go to #{link3_raw}), auto_link("Go to #{link3_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link3_result}</p>), auto_link("<p>Link #{link3_raw}</p>")
-    assert_equal %(<p>#{link3_result} Link</p>), auto_link("<p>#{link3_raw} Link</p>")
-    assert_equal %(Go to #{link3_result}.), auto_link(%(Go to #{link3_raw}.))
-    assert_equal %(<p>Go to #{link3_result}. Seriously, #{link3_result}? I think I'll say hello to #{email_result}. Instead.</p>),
-       auto_link(%(<p>Go to #{link3_raw}. Seriously, #{link3_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
-
-    link4_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123'
-    link4_result = generate_result(link4_raw)
-    assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>")
-    assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>")
-
-    link5_raw    = 'http://foo.example.com:3000/controller/action'
-    link5_result = generate_result(link5_raw)
-    assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>")
-
-    link6_raw    = 'http://foo.example.com:3000/controller/action+pack'
-    link6_result = generate_result(link6_raw)
-    assert_equal %(<p>#{link6_result} Link</p>), auto_link("<p>#{link6_raw} Link</p>")
-
-    link7_raw    = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor-123'
-    link7_result = generate_result(link7_raw)
-    assert_equal %(<p>#{link7_result} Link</p>), auto_link("<p>#{link7_raw} Link</p>")
-
-    link8_raw    = 'http://foo.example.com:3000/controller/action.html'
-    link8_result = generate_result(link8_raw)
-    assert_equal %(Go to #{link8_result}), auto_link("Go to #{link8_raw}", :urls)
-    assert_equal %(Go to #{link8_raw}), auto_link("Go to #{link8_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link8_result}</p>), auto_link("<p>Link #{link8_raw}</p>")
-    assert_equal %(<p>#{link8_result} Link</p>), auto_link("<p>#{link8_raw} Link</p>")
-    assert_equal %(Go to #{link8_result}.), auto_link(%(Go to #{link8_raw}.))
-    assert_equal %(<p>Go to #{link8_result}. Seriously, #{link8_result}? I think I'll say hello to #{email_result}. Instead.</p>),
-       auto_link(%(<p>Go to #{link8_raw}. Seriously, #{link8_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
-
-    link9_raw    = 'http://business.timesonline.co.uk/article/0,,9065-2473189,00.html'
-    link9_result = generate_result(link9_raw)
-    assert_equal %(Go to #{link9_result}), auto_link("Go to #{link9_raw}", :urls)
-    assert_equal %(Go to #{link9_raw}), auto_link("Go to #{link9_raw}", :email_addresses)
-    assert_equal %(<p>Link #{link9_result}</p>), auto_link("<p>Link #{link9_raw}</p>")
-    assert_equal %(<p>#{link9_result} Link</p>), auto_link("<p>#{link9_raw} Link</p>")
-    assert_equal %(Go to #{link9_result}.), auto_link(%(Go to #{link9_raw}.))
-    assert_equal %(<p>Go to #{link9_result}. Seriously, #{link9_result}? I think I'll say hello to #{email_result}. Instead.</p>),
-       auto_link(%(<p>Go to #{link9_raw}. Seriously, #{link9_raw}? I think I'll say hello to #{email_raw}. Instead.</p>))
-
-    link10_raw    = 'http://www.mail-archive.com/ruby-talk@ruby-lang.org/'
-    link10_result = generate_result(link10_raw)
-    assert_equal %(<p>#{link10_result} Link</p>), auto_link("<p>#{link10_raw} Link</p>")
-
-    link11_raw    = 'http://asakusa.rubyist.net/'
-    link11_result = generate_result(link11_raw)
-    with_kcode 'u' do
-      assert_equal %(浅草.rbの公式サイトはこちら#{link11_result}), auto_link("浅草.rbの公式サイトはこちら#{link11_raw}")
-    end
-  end
-
-  def test_auto_link_should_sanitize_input_when_sanitize_option_is_not_false
-    link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
-    assert_equal %{<a href="http://www.rubyonrails.com?id=1&num=2">http://www.rubyonrails.com?id=1&num=2</a>}, auto_link(link_raw)
-  end
-
-  def test_auto_link_should_not_sanitize_input_when_sanitize_option_is_false
-    link_raw     = %{http://www.rubyonrails.com?id=1&num=2}
-    assert_equal %{<a href="http://www.rubyonrails.com?id=1&num=2">http://www.rubyonrails.com?id=1&num=2</a>}, auto_link(link_raw, :sanitize => false)
-  end
-
-  def test_auto_link_other_protocols
-    ftp_raw = 'ftp://example.com/file.txt'
-    assert_equal %(Download #{generate_result(ftp_raw)}), auto_link("Download #{ftp_raw}")
-
-    file_scheme   = 'file:///home/username/RomeoAndJuliet.pdf'
-    z39_scheme    = 'z39.50r://host:696/db'
-    chrome_scheme = 'chrome://package/section/path'
-    view_source   = 'view-source:http://en.wikipedia.org/wiki/URI_scheme'
-    assert_equal generate_result(file_scheme), auto_link(file_scheme)
-    assert_equal generate_result(z39_scheme), auto_link(z39_scheme)
-    assert_equal generate_result(chrome_scheme), auto_link(chrome_scheme)
-    assert_equal generate_result(view_source), auto_link(view_source)
-  end
-
-  def test_auto_link_already_linked
-    linked1 = generate_result('Ruby On Rails', 'http://www.rubyonrails.com')
-    linked2 = %('<a href="http://www.example.com">www.example.com</a>')
-    linked3 = %('<a href="http://www.example.com" rel="nofollow">www.example.com</a>')
-    linked4 = %('<a href="http://www.example.com"><b>www.example.com</b></a>')
-    linked5 = %('<a href="#close">close</a> <a href="http://www.example.com"><b>www.example.com</b></a>')
-    assert_equal linked1, auto_link(linked1)
-    assert_equal linked2, auto_link(linked2)
-    assert_equal linked3, auto_link(linked3)
-    assert_equal linked4, auto_link(linked4)
-    assert_equal linked5, auto_link(linked5)
-
-    linked_email = %Q(<a href="mailto:david@loudthinking.com">Mail me</a>)
-    assert_equal linked_email, auto_link(linked_email)
-  end
-
-  def test_auto_link_within_tags
-    link_raw    = 'http://www.rubyonrails.org/images/rails.png'
-    link_result = %Q(<img src="#{link_raw}" />)
-    assert_equal link_result, auto_link(link_result)
-  end
-
-  def test_auto_link_with_brackets
-    link1_raw = 'http://en.wikipedia.org/wiki/Sprite_(computer_graphics)'
-    link1_result = generate_result(link1_raw)
-    assert_equal link1_result, auto_link(link1_raw)
-    assert_equal "(link: #{link1_result})", auto_link("(link: #{link1_raw})")
-
-    link2_raw = 'http://en.wikipedia.org/wiki/Sprite_[computer_graphics]'
-    link2_result = generate_result(link2_raw)
-    assert_equal link2_result, auto_link(link2_raw)
-    assert_equal "[link: #{link2_result}]", auto_link("[link: #{link2_raw}]")
-
-    link3_raw = 'http://en.wikipedia.org/wiki/Sprite_{computer_graphics}'
-    link3_result = generate_result(link3_raw)
-    assert_equal link3_result, auto_link(link3_raw)
-    assert_equal "{link: #{link3_result}}", auto_link("{link: #{link3_raw}}")
-  end
-
-  def test_auto_link_at_eol
-    url1 = "http://api.rubyonrails.com/Foo.html"
-    url2 = "http://www.ruby-doc.org/core/Bar.html"
-
-    assert_equal %(<p><a href="#{url1}">#{url1}</a><br /><a href="#{url2}">#{url2}</a><br /></p>), auto_link("<p>#{url1}<br />#{url2}<br /></p>")
-  end
-
-  def test_auto_link_with_block
-    url = "http://api.rubyonrails.com/Foo.html"
-    email = "fantabulous@shiznadel.ic"
-
-    assert_equal %(<p><a href="#{url}">#{url[0...7]}...</a><br /><a href="mailto:#{email}">#{email[0...7]}...</a><br /></p>), auto_link("<p>#{url}<br />#{email}<br /></p>") { |_url| truncate(_url, :length => 10) }
-  end
-
-  def test_auto_link_with_block_with_html
-    pic = "http://example.com/pic.png"
-    url = "http://example.com/album?a&b=c"
-
-    assert_equal %(My pic: <a href="#{pic}"><img src="#{pic}" width="160px"></a> -- full album here #{generate_result(url)}), auto_link("My pic: #{pic} -- full album here #{url}") { |link|
-      if link =~ /\.(jpg|gif|png|bmp|tif)$/i
-        raw %(<img src="#{link}" width="160px">)
-      else
-        link
-      end
-    }
-  end
-
-  def test_auto_link_with_options_hash
-    assert_dom_equal 'Welcome to my new blog at <a href="http://www.myblog.com/" class="menu" target="_blank">http://www.myblog.com/</a>. Please e-mail me at <a href="mailto:me@email.com" class="menu" target="_blank">me@email.com</a>.',
-      auto_link("Welcome to my new blog at http://www.myblog.com/. Please e-mail me at me@email.com.",
-                :link => :all, :html => { :class => "menu", :target => "_blank" })
-  end
-
-  def test_auto_link_with_multiple_trailing_punctuations
-    url = "http://youtube.com"
-    url_result = generate_result(url)
-    assert_equal url_result, auto_link(url)
-    assert_equal "(link: #{url_result}).", auto_link("(link: #{url}).")
-  end
-
   def test_cycle_class
     value = Cycle.new("one", 2, "3")
     assert_equal("one", value.to_s)
-- 
cgit v1.2.3


From 3cca86641e91400e3317ce2d03b483edf1db3ec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 2 May 2011 23:53:53 +0200
Subject: Update CHANGELOG.

---
 actionpack/CHANGELOG                                | 20 ++++++++++++++++----
 actionpack/lib/action_controller/metal/streaming.rb |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 448ee878b1..ba01c4749f 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -6,15 +6,27 @@
 
   [tenderlove]
 
-* Add `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default [Prem Sichanugrist]
+* Added streaming support, you can enable it with: [José Valim]
 
-  This can be customizabled by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
+    class PostsController < ActionController::Base
+      stream :only => :index
+    end
+  
+  Please read the docs at `ActionController::Streaming` for more information.
+
+* Added `ActionDispatch::Request.ignore_accept_header` to ignore accept headers and only consider the format given as parameter [José Valim]
+
+* Created `ActionView::Renderer` and specified an API for `ActionView::Context`, check those objects for more information [José Valim]
+
+* Added `ActionController::ParamsWrapper` to wrap parameters into a nested hash, and will be turned on for JSON request in new applications by default [Prem Sichanugrist]
+
+  This can be customized by setting `ActionController::Base.wrap_parameters` in `config/initializer/wrap_parameters.rb`
 
 * RJS has been extracted out to a gem. [fxn]
 
-* Implicit actions named not_implemented can be rendered [Santiago Pastorino]
+* Implicit actions named not_implemented can be rendered. [Santiago Pastorino]
 
-* Wildcard route will always matching the optional format segment by default. [Prem Sichanugrist]
+* Wildcard route will always match the optional format segment by default. [Prem Sichanugrist]
 
   For example if you have this route:
 
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 1d27c3aa51..3892a12407 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -160,7 +160,7 @@ module ActionController #:nodoc:
   # needs to inject contents in the HTML body.
   #
   # Also +Rack::Cache+ won't work with streaming as it does not support
-  # streaming bodies yet. So, whenever streaming, Cache-Control is automatically
+  # streaming bodies yet. Whenever streaming Cache-Control is automatically
   # set to "no-cache".
   #
   # == Errors
-- 
cgit v1.2.3


From 4bddc06e83acecce662b4282159c5eb0096c4783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 00:37:40 +0200
Subject: Move most processing to load time for performance and improve test
 suite.

---
 .../lib/action_controller/metal/params_wrapper.rb  | 74 ++++++++++++++--------
 actionpack/test/controller/params_wrapper_test.rb  | 39 ++++++++----
 2 files changed, 76 insertions(+), 37 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 7827ed598e..3262e24f67 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -1,4 +1,6 @@
 require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/array/wrap'
 require 'action_dispatch/http/mime_types'
 
 module ActionController
@@ -96,23 +98,25 @@ module ActionController
       # ==== Options
       # * <tt>:format</tt> - The list of formats in which the parameters wrapper
       #   will be enabled.
-      # * <tt>:only</tt> - The list of attribute names which parmeters wrapper
+      # * <tt>:only</tt> - The list of attribute names which parameters wrapper
       #   will wrap into a nested hash.
-      # * <tt>:only</tt> - The list of attribute names which parmeters wrapper
+      # * <tt>:except</tt> - The list of attribute names which parameters wrapper
       #   will exclude from a nested hash.
       def wrap_parameters(name_or_model_or_options, options = {})
-        if !name_or_model_or_options.is_a? Hash
-          if name_or_model_or_options != false
-            options = options.merge(:name_or_model => name_or_model_or_options)
-          else
-            options = opions.merge(:format => [])
-          end
-        else
+        model = nil
+
+        case name_or_model_or_options
+        when Hash
           options = name_or_model_or_options
+        when false
+          options = options.merge(:format => [])
+        when Symbol, String
+          options = options.merge(:name => name_or_model_or_options)
+        else
+          model = name_or_model_or_options
         end
 
-        options[:name_or_model] ||= _default_wrap_model
-        self._wrapper_options = self._wrapper_options.merge(options)
+        _set_wrapper_defaults(_wrapper_options.slice(:format).merge(options), model)
       end
 
       # Sets the default wrapper key or model which will be used to determine
@@ -120,11 +124,13 @@ module ActionController
       # module is inherited.
       def inherited(klass)
         if klass._wrapper_options[:format].present?
-          klass._wrapper_options = klass._wrapper_options.merge(:name_or_model => klass._default_wrap_model)
+          klass._set_wrapper_defaults(klass._wrapper_options)
         end
         super
       end
 
+      protected
+
       # Determine the wrapper model from the controller's name. By convention,
       # this could be done by trying to find the defined model that has the
       # same singularize name as the controller. For example, +UsersController+
@@ -142,6 +148,29 @@ module ActionController
 
         model_klass
       end
+
+      def _set_wrapper_defaults(options, model=nil)
+        options = options.dup
+
+        unless options[:only] || options[:except]
+          model ||= _default_wrap_model
+          if model.respond_to?(:column_names)
+            options[:only] = model.column_names
+          end
+        end
+
+        unless options[:name]
+          model ||= _default_wrap_model
+          options[:name] = model ? model.to_s.demodulize.underscore :
+            controller_name.singularize
+        end
+
+        options[:only]   = Array.wrap(options[:only]).collect(&:to_s)   if options[:only]
+        options[:except] = Array.wrap(options[:except]).collect(&:to_s) if options[:except]
+        options[:format] = Array.wrap(options[:format])
+
+        self._wrapper_options = options
+      end
     end
 
     # Performs parameters wrapping upon the request. Will be called automatically
@@ -164,21 +193,15 @@ module ActionController
     private
       # Returns the wrapper key which will use to stored wrapped parameters.
       def _wrapper_key
-        @_wrapper_key ||= if _wrapper_options[:name_or_model]
-            _wrapper_options[:name_or_model].to_s.demodulize.underscore
-          else
-            self.class.controller_name.singularize
-          end
+        _wrapper_options[:name]
       end
 
       # Returns the list of parameters which will be selected for wrapped.
       def _wrapped_keys
-        @_wrapped_keys ||= if _wrapper_options[:only]
-            Array(_wrapper_options[:only]).collect(&:to_s)
-          elsif _wrapper_options[:except]
-            request.request_parameters.keys - Array(_wrapper_options[:except]).collect(&:to_s) - EXCLUDE_PARAMETERS
-          elsif _wrapper_options[:name_or_model].respond_to?(:column_names)
-            _wrapper_options[:name_or_model].column_names
+        @_wrapped_keys ||= if only = _wrapper_options[:only]
+            only
+          elsif except = _wrapper_options[:except]
+            request.request_parameters.keys - except - EXCLUDE_PARAMETERS
           else
             request.request_parameters.keys - EXCLUDE_PARAMETERS
           end
@@ -186,12 +209,13 @@ module ActionController
 
       # Returns the list of enabled formats.
       def _wrapper_formats
-        Array(_wrapper_options[:format])
+        _wrapper_options[:format]
       end
 
       # Checks if we should perform parameters wrapping.
       def _wrapper_enabled?
-        _wrapper_formats.any?{ |format| format == request.content_mime_type.try(:ref) } && request.request_parameters[_wrapper_key].nil?
+        ref = request.content_mime_type.try(:ref)
+        _wrapper_formats.any? { |format| format == ref } && !request.request_parameters[_wrapper_key]
       end
   end
 end
diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 2e5d096fcd..314b27cf47 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -80,6 +80,15 @@ class ParamsWrapperTest < ActionController::TestCase
     end
   end
 
+  def test_wrap_parameters_false
+    with_default_wrapper_options do
+      UsersController.wrap_parameters false
+      @request.env['CONTENT_TYPE'] = 'application/json'
+      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer"}', @response.body
+    end
+  end
+
   def test_specify_format
     with_default_wrapper_options do
       UsersController.wrap_parameters :format => :xml
@@ -115,10 +124,10 @@ class ParamsWrapperTest < ActionController::TestCase
   end
 
   def test_derived_wrapped_keys_from_matching_model
-    with_default_wrapper_options do
-      User.expects(:respond_to?).with(:column_names).returns(true)
-      User.expects(:column_names).returns(["username"])
+    User.expects(:respond_to?).with(:column_names).returns(true)
+    User.expects(:column_names).returns(["username"])
 
+    with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
       post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
       assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
@@ -153,11 +162,13 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
         render :json => params.except(:controller, :action)
       end
     end
+  end
 
-    class User; end
+  class Sample
+    def self.column_names
+      ["username"]
+    end
   end
-  class User; end
-  class Person; end
 
   tests Admin::UsersController
 
@@ -169,12 +180,16 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
     end
   end
 
-  def test_namespace_lookup_when_namespaced_model_available
-    with_default_wrapper_options do
-      Admin::User.expects(:respond_to?).with(:column_names).returns(false)
-
-      @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu' }
+  def test_namespace_lookup_from_model
+    Admin.const_set(:User, Class.new(Sample))
+    begin
+      with_default_wrapper_options do
+        @request.env['CONTENT_TYPE'] = 'application/json'
+        post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+      end
+    ensure
+      Admin.send :remove_const, :User
     end
   end
 
-- 
cgit v1.2.3


From 1afb56f4818381098c6ed0babc4a5899e324e2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 00:47:11 +0200
Subject: Instrumentation should have callbacks.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 373df7fb55..ccf1632a14 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -207,14 +207,14 @@ module ActionController
       HttpAuthentication::Digest::ControllerMethods,
       HttpAuthentication::Token::ControllerMethods,
 
-      # Add instrumentations hooks at the bottom, to ensure they instrument
-      # all the methods properly.
-      Instrumentation,
-
       # Before callbacks should also be executed the earliest as possible, so
       # also include them at the bottom.
       AbstractController::Callbacks,
 
+      # Add instrumentations hooks at the bottom, to ensure they instrument
+      # all the methods properly.
+      Instrumentation,
+
       # The same with rescue, append it at the end to wrap as much as possible.
       Rescue
     ]
-- 
cgit v1.2.3


From a55f2de0c5baae589b1730df1e4068f0cd1474ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 01:03:21 +0200
Subject: Improve performance for filtered parameters and add tests.

---
 actionpack/lib/action_controller/base.rb                  |  5 ++++-
 actionpack/lib/action_controller/metal/instrumentation.rb |  2 +-
 actionpack/lib/action_controller/metal/params_wrapper.rb  |  5 ++---
 actionpack/lib/action_dispatch/http/filter_parameters.rb  |  5 +++++
 actionpack/test/controller/log_subscriber_test.rb         | 11 +++++++++++
 5 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index ccf1632a14..c03c77cb4a 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -194,7 +194,6 @@ module ActionController
       Caching,
       MimeResponds,
       ImplicitRender,
-      ParamsWrapper,
 
       Cookies,
       Flash,
@@ -215,6 +214,10 @@ module ActionController
       # all the methods properly.
       Instrumentation,
 
+      # Params wrapper should come before instrumentation so they are
+      # properly showed in logs
+      ParamsWrapper,
+
       # The same with rescue, append it at the end to wrap as much as possible.
       Rescue
     ]
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index dc3ea939e6..4e54c2ad88 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -14,7 +14,7 @@ module ActionController
 
     attr_internal :view_runtime
 
-    def process_action(action, *args)
+    def process_action(*args)
       raw_payload = {
         :controller => self.class.name,
         :action     => self.action_name,
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 3262e24f67..d128f6d03c 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -178,14 +178,13 @@ module ActionController
     def process_action(*args)
       if _wrapper_enabled?
         wrapped_hash = { _wrapper_key => request.request_parameters.slice(*_wrapped_keys) }
-        wrapped_filtered_hash = { _wrapper_key => request.filtered_parameters.slice(*_wrapped_keys) }
 
         # This will make the wrapped hash accessible from controller and view
         request.parameters.merge! wrapped_hash
         request.request_parameters.merge! wrapped_hash
 
         # This will make the wrapped hash displayed in the log file
-        request.filtered_parameters.merge! wrapped_filtered_hash
+        request.clear_filtered_parameters
       end
       super
     end
@@ -215,7 +214,7 @@ module ActionController
       # Checks if we should perform parameters wrapping.
       def _wrapper_enabled?
         ref = request.content_mime_type.try(:ref)
-        _wrapper_formats.any? { |format| format == ref } && !request.request_parameters[_wrapper_key]
+        _wrapper_formats.include?(ref) && !request.request_parameters[_wrapper_key]
       end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
index 8dd1af7f3d..9c5b6a6b88 100644
--- a/actionpack/lib/action_dispatch/http/filter_parameters.rb
+++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -33,6 +33,11 @@ module ActionDispatch
         @filtered_parameters ||= parameter_filter.filter(parameters)
       end
 
+      # Clear any filtered parameters forcing them to be filtered again.
+      def clear_filtered_parameters
+        @filtered_parameters = nil
+      end
+
       # Return a hash of request.env with all sensitive data replaced.
       def filtered_env
         @filtered_env ||= env_filter.filter(@env)
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index ddfa3df552..5d7a51e902 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -4,6 +4,8 @@ require "action_controller/log_subscriber"
 
 module Another
   class LogSubscribersController < ActionController::Base
+    wrap_parameters :person, :only => :name, :format => :json
+
     def show
       render :nothing => true
     end
@@ -95,6 +97,15 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_equal 'Parameters: {"id"=>"10"}', logs[1]
   end
 
+  def test_process_action_with_wrapped_parameters
+    @request.env['CONTENT_TYPE'] = 'application/json'
+    post :show, :id => '10', :name => 'jose'
+    wait
+
+    assert_equal 3, logs.size
+    assert_match '"person"=>{"name"=>"jose"}', logs[1]
+  end
+
   def test_process_action_with_view_runtime
     get :show
     wait
-- 
cgit v1.2.3


From 35d0d82ae3edf8fe959624999c858a63b2b4ed52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 01:36:58 +0200
Subject: More performance optimizations.

---
 .../lib/action_controller/metal/params_wrapper.rb  | 30 ++++++++++++----------
 .../lib/action_dispatch/http/filter_parameters.rb  |  5 ----
 2 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index d128f6d03c..21bbe17dc3 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/hash/except'
 require 'active_support/core_ext/array/wrap'
 require 'action_dispatch/http/mime_types'
 
@@ -177,40 +178,43 @@ module ActionController
     # by the metal call stack.
     def process_action(*args)
       if _wrapper_enabled?
-        wrapped_hash = { _wrapper_key => request.request_parameters.slice(*_wrapped_keys) }
+        wrapped_hash = _wrap_parameters request.request_parameters
+        wrapped_filtered_hash = _wrap_parameters request.filtered_parameters
 
         # This will make the wrapped hash accessible from controller and view
         request.parameters.merge! wrapped_hash
         request.request_parameters.merge! wrapped_hash
 
         # This will make the wrapped hash displayed in the log file
-        request.clear_filtered_parameters
+        request.filtered_parameters.merge! wrapped_filtered_hash
       end
       super
     end
 
     private
+
       # Returns the wrapper key which will use to stored wrapped parameters.
       def _wrapper_key
         _wrapper_options[:name]
       end
 
-      # Returns the list of parameters which will be selected for wrapped.
-      def _wrapped_keys
-        @_wrapped_keys ||= if only = _wrapper_options[:only]
-            only
-          elsif except = _wrapper_options[:except]
-            request.request_parameters.keys - except - EXCLUDE_PARAMETERS
-          else
-            request.request_parameters.keys - EXCLUDE_PARAMETERS
-          end
-      end
-
       # Returns the list of enabled formats.
       def _wrapper_formats
         _wrapper_options[:format]
       end
 
+      # Returns the list of parameters which will be selected for wrapped.
+      def _wrap_parameters(parameters)
+        value = if only = _wrapper_options[:only]
+          parameters.slice(*only)
+        else
+          except = _wrapper_options[:except] || []
+          parameters.except(*(except + EXCLUDE_PARAMETERS))
+        end
+
+        { _wrapper_key => value }
+      end
+
       # Checks if we should perform parameters wrapping.
       def _wrapper_enabled?
         ref = request.content_mime_type.try(:ref)
diff --git a/actionpack/lib/action_dispatch/http/filter_parameters.rb b/actionpack/lib/action_dispatch/http/filter_parameters.rb
index 9c5b6a6b88..8dd1af7f3d 100644
--- a/actionpack/lib/action_dispatch/http/filter_parameters.rb
+++ b/actionpack/lib/action_dispatch/http/filter_parameters.rb
@@ -33,11 +33,6 @@ module ActionDispatch
         @filtered_parameters ||= parameter_filter.filter(parameters)
       end
 
-      # Clear any filtered parameters forcing them to be filtered again.
-      def clear_filtered_parameters
-        @filtered_parameters = nil
-      end
-
       # Return a hash of request.env with all sensitive data replaced.
       def filtered_env
         @filtered_env ||= env_filter.filter(@env)
-- 
cgit v1.2.3


From 2fbbd08616c25dc2931eca914349dd2161766f69 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 2 May 2011 19:24:49 -0500
Subject: Use require_self from latest Sprockets

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

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index a2570587ce..4af21366e3 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack',             '~> 1.2.1')
   s.add_dependency('rack-test',        '~> 0.5.7')
   s.add_dependency('rack-mount',       '~> 0.7.2')
-  s.add_dependency('sprockets',        '~> 2.0.0.beta.1')
+  s.add_dependency('sprockets',        '~> 2.0.0.beta.2')
   s.add_dependency('tzinfo',           '~> 0.3.23')
   s.add_dependency('erubis',           '~> 2.7.0')
 end
-- 
cgit v1.2.3


From 8bf5d684fd0c83513d57f8e392c696dd3d12974d Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Tue, 3 May 2011 15:40:52 +0700
Subject: Update Action Pack to depend on Rack 1.3.0

Rack 1.3.0 was released a while ago, which break the hard dependency we set in Action Pack. This dependency bump won't be the issue, as we always depends on edge Rack. Also, we was waiting for Rack 1.3.x release before we can release Rails 3.1 beta anyway.
---
 actionpack/actionpack.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 4af21366e3..d85f077e0f 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack-cache',       '~> 1.0.0')
   s.add_dependency('builder',          '~> 3.0.0')
   s.add_dependency('i18n',             '~> 0.6.0beta1')
-  s.add_dependency('rack',             '~> 1.2.1')
+  s.add_dependency('rack',             '~> 1.3.0')
   s.add_dependency('rack-test',        '~> 0.5.7')
   s.add_dependency('rack-mount',       '~> 0.7.2')
   s.add_dependency('sprockets',        '~> 2.0.0.beta.2')
-- 
cgit v1.2.3


From 31f412fc975033a9293888e8618fc933097d1d35 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Tue, 3 May 2011 16:51:19 +0700
Subject: Fix broken params_wrapper_test on 1.8.7 :bomb:

I have to keep in mind that 1.8.7 does *not* preserve the hash order.

Guys, let's move to use 1.9.2 in production!
---
 actionpack/test/controller/params_wrapper_test.rb | 116 +++++++++++++++-------
 1 file changed, 80 insertions(+), 36 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index 314b27cf47..d6f8f28d0d 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -4,8 +4,13 @@ module Admin; class User; end; end
 
 class ParamsWrapperTest < ActionController::TestCase
   class UsersController < ActionController::Base
-    def test
-      render :json => params.except(:controller, :action)
+    class << self
+      attr_accessor :last_parameters
+    end
+
+    def parse
+      self.class.last_parameters = request.params.except(:controller, :action)
+      head :ok
     end
   end
 
@@ -14,11 +19,15 @@ class ParamsWrapperTest < ActionController::TestCase
 
   tests UsersController
 
+  def teardown
+    UsersController.last_parameters = nil
+  end
+
   def test_derivered_name_from_controller
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu' }
-      assert_equal '{"username":"sikachu","user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'user' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -27,8 +36,8 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters :person
 
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu' }
-      assert_equal '{"username":"sikachu","person":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'person' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -37,8 +46,8 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters Person
 
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu' }
-      assert_equal '{"username":"sikachu","person":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({ 'username' => 'sikachu', 'person' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -47,8 +56,8 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters :only => :username
 
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -57,8 +66,8 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters :except => :title
 
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -67,16 +76,16 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters :person, :only => :username
 
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","person":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
     end
   end
 
   def test_not_enabled_format
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/xml'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer"}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer' })
     end
   end
 
@@ -84,8 +93,8 @@ class ParamsWrapperTest < ActionController::TestCase
     with_default_wrapper_options do
       UsersController.wrap_parameters false
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer"}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer' })
     end
   end
 
@@ -94,32 +103,32 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters :format => :xml
 
       @request.env['CONTENT_TYPE'] = 'application/xml'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu","title":"Developer"}}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }})
     end
   end
 
   def test_not_wrap_reserved_parameters
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'authenticity_token' => 'pwned', '_method' => 'put', 'utf8' => '&#9731;', 'username' => 'sikachu' }
-      assert_equal '{"authenticity_token":"pwned","_method":"put","utf8":"&#9731;","username":"sikachu","user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'authenticity_token' => 'pwned', '_method' => 'put', 'utf8' => '&#9731;', 'username' => 'sikachu' }
+      assert_parameters({ 'authenticity_token' => 'pwned', '_method' => 'put', 'utf8' => '&#9731;', 'username' => 'sikachu', 'user' => { 'username' => 'sikachu' }})
     end
   end
 
   def test_no_double_wrap_if_key_exists
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'user' => { 'username' => 'sikachu' }}
-      assert_equal '{"user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'user' => { 'username' => 'sikachu' }}
+      assert_parameters({ 'user' => { 'username' => 'sikachu' }})
     end
   end
 
   def test_nested_params
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'person' => { 'username' => 'sikachu' }}
-      assert_equal '{"person":{"username":"sikachu"},"user":{"person":{"username":"sikachu"}}}', @response.body
+      post :parse, { 'person' => { 'username' => 'sikachu' }}
+      assert_parameters({ 'person' => { 'username' => 'sikachu' }, 'user' => {'person' => { 'username' => 'sikachu' }}})
     end
   end
 
@@ -129,8 +138,8 @@ class ParamsWrapperTest < ActionController::TestCase
 
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -142,8 +151,8 @@ class ParamsWrapperTest < ActionController::TestCase
       UsersController.wrap_parameters Person
 
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","person":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+      assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'person' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -153,13 +162,22 @@ class ParamsWrapperTest < ActionController::TestCase
       @controller.class.inherited(@controller.class)
       yield
     end
+
+    def assert_parameters(expected)
+      assert_equal expected, UsersController.last_parameters
+    end
 end
 
 class NamespacedParamsWrapperTest < ActionController::TestCase
   module Admin
     class UsersController < ActionController::Base
-      def test
-        render :json => params.except(:controller, :action)
+      class << self
+        attr_accessor :last_parameters
+      end
+
+      def parse
+        self.class.last_parameters = request.params.except(:controller, :action)
+        head :ok
       end
     end
   end
@@ -172,11 +190,15 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
 
   tests Admin::UsersController
 
+  def teardown
+    Admin::UsersController.last_parameters = nil
+  end
+
   def test_derivered_name_from_controller
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
-      post :test, { 'username' => 'sikachu' }
-      assert_equal '{"username":"sikachu","user":{"username":"sikachu"}}', @response.body
+      post :parse, { 'username' => 'sikachu' }
+      assert_parameters({'username' => 'sikachu', 'user' => { 'username' => 'sikachu' }})
     end
   end
 
@@ -185,18 +207,40 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
     begin
       with_default_wrapper_options do
         @request.env['CONTENT_TYPE'] = 'application/json'
-        post :test, { 'username' => 'sikachu', 'title' => 'Developer' }
-      assert_equal '{"username":"sikachu","title":"Developer","user":{"username":"sikachu"}}', @response.body
+        post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+        assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
       end
     ensure
       Admin.send :remove_const, :User
     end
   end
 
+  def test_heirarchy_namespace_lookup_from_model
+    # Make sure that we cleanup ::Admin::User
+    admin_user_constant = ::Admin::User
+    ::Admin.send :remove_const, :User
+
+    Object.const_set(:User, Class.new(Sample))
+    begin
+      with_default_wrapper_options do
+        @request.env['CONTENT_TYPE'] = 'application/json'
+        post :parse, { 'username' => 'sikachu', 'title' => 'Developer' }
+        assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu' }})
+      end
+    ensure
+      Object.send :remove_const, :User
+      ::Admin.const_set(:User, admin_user_constant)
+    end
+  end
+
   private
     def with_default_wrapper_options(&block)
       @controller.class._wrapper_options = {:format => [:json]}
       @controller.class.inherited(@controller.class)
       yield
     end
+
+    def assert_parameters(expected)
+      assert_equal expected, Admin::UsersController.last_parameters
+    end
 end
-- 
cgit v1.2.3


From ed3e667415e191d1677a3b7e55b077f55504214c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 12:10:11 +0200
Subject: Multipart is now fixed in Rack.

---
 .../request/multipart_params_parsing_test.rb       | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
index 3ff558ec5a..560ea00923 100644
--- a/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/multipart_params_parsing_test.rb
@@ -82,21 +82,15 @@ class MultipartParamsParsingTest < ActionDispatch::IntegrationTest
     assert_equal 19512, file.size
   end
 
-  # Pending fix in Rack 1.2.2
-  # http://rack.lighthouseapp.com/projects/22435-rack/tickets/79-multipart-handling-incorrectly-assuming-file-upload
   test "parses mixed files" do
-    if Rack.release <= '1.2.1'
-      $stderr.puts 'multipart/mixed parsing pending fix in Rack 1.2.2'
-    else
-      params = parse_multipart('mixed_files')
-      assert_equal %w(files foo), params.keys.sort
-      assert_equal 'bar', params['foo']
-
-      # Rack doesn't handle multipart/mixed for us.
-      files = params['files']
-      files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
-      assert_equal 19756, files.size
-    end
+    params = parse_multipart('mixed_files')
+    assert_equal %w(files foo), params.keys.sort
+    assert_equal 'bar', params['foo']
+
+    # Rack doesn't handle multipart/mixed for us.
+    files = params['files']
+    files.force_encoding('ASCII-8BIT') if files.respond_to?(:force_encoding)
+    assert_equal 19756, files.size
   end
 
   test "does not create tempfile if no file has been selected" do
-- 
cgit v1.2.3


From e1c16850168fbadc5ae8a0688e23170021a84955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 12:32:14 +0200
Subject: Static middleware accepts cache control.

---
 actionpack/lib/action_dispatch/middleware/static.rb | 8 ++++----
 actionpack/test/dispatch/static_test.rb             | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 348f7b86b8..360c1209bb 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -2,10 +2,10 @@ require 'rack/utils'
 
 module ActionDispatch
   class FileHandler
-    def initialize(root)
+    def initialize(root, cache_control)
       @root          = root.chomp('/')
       @compiled_root = /^#{Regexp.escape(root)}/
-      @file_server   = ::Rack::File.new(@root)
+      @file_server   = ::Rack::File.new(@root, cache_control)
     end
 
     def match?(path)
@@ -37,9 +37,9 @@ module ActionDispatch
   class Static
     FILE_METHODS = %w(GET HEAD).freeze
 
-    def initialize(app, path)
+    def initialize(app, path, cache_control=nil)
       @app = app
-      @file_handler = FileHandler.new(path)
+      @file_handler = FileHandler.new(path, cache_control)
     end
 
     def call(env)
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 2ebbed4414..9f3cbd19ef 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -5,6 +5,12 @@ module StaticTests
     assert_equal "Hello, World!", get("/nofile").body
   end
 
+  def test_sets_cache_control
+    response = get("/index.html")
+    assert_html "/index.html", response
+    assert_equal "public, max-age=60", response.headers["Cache-Control"]
+  end
+
   def test_serves_static_index_at_root
     assert_html "/index.html", get("/index.html")
     assert_html "/index.html", get("/index")
@@ -40,7 +46,7 @@ class StaticTest < ActiveSupport::TestCase
   DummyApp = lambda { |env|
     [200, {"Content-Type" => "text/plain"}, ["Hello, World!"]]
   }
-  App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public")
+  App = ActionDispatch::Static.new(DummyApp, "#{FIXTURE_LOAD_PATH}/public", "public, max-age=60")
 
   def setup
     @app = App
-- 
cgit v1.2.3


From f7c711baee9ccd25fb976d45cb9fca033878fd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 12:42:42 +0200
Subject: No need for a regexp here.

---
 actionpack/lib/action_view/helpers/asset_paths.rb                   | 1 -
 actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb | 3 ++-
 actionpack/lib/action_view/helpers/sprockets_helper.rb              | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/asset_paths.rb b/actionpack/lib/action_view/helpers/asset_paths.rb
index cb6737b94e..958f0e0a10 100644
--- a/actionpack/lib/action_view/helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_paths.rb
@@ -21,7 +21,6 @@ module ActionView
         return source if is_uri?(source)
 
         source = rewrite_extension(source, dir, ext) if ext
-        source = "/#{dir}/#{source}" unless source[0] == ?/
         source = rewrite_asset_path(source, dir)
 
         if controller && include_host
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
index 38860431b4..cd0f8c8878 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/asset_paths.rb
@@ -41,7 +41,8 @@ module ActionView
 
         # Break out the asset path rewrite in case plugins wish to put the asset id
         # someplace other than the query string.
-        def rewrite_asset_path(source, path = nil)
+        def rewrite_asset_path(source, dir)
+          source = "/#{dir}/#{source}" unless source[0] == ?/
           path = config.asset_path
 
           if path && path.respond_to?(:call)
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index b43b91178c..ab98da9624 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -40,10 +40,10 @@ module ActionView
 
       class AssetPaths < ActionView::Helpers::AssetPaths #:nodoc:
         def rewrite_asset_path(source, dir)
-          if source =~ /^\/#{dir}\/(.+)/
-            assets.path($1, performing_caching?, dir)
-          else
+          if source[0] == ?/
             source
+          else
+            assets.path(source, performing_caching?, dir)
           end
         end
 
-- 
cgit v1.2.3


From 06ddda0a5f659cab8c2c76cfcb3b27ac5bb47ea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 12:56:57 +0200
Subject: We no longer depend on those git repos.

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

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index d85f077e0f..2385ac611f 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rack-cache',       '~> 1.0.0')
   s.add_dependency('builder',          '~> 3.0.0')
   s.add_dependency('i18n',             '~> 0.6.0beta1')
-  s.add_dependency('rack',             '~> 1.3.0')
+  s.add_dependency('rack',             '~> 1.3.0.beta')
   s.add_dependency('rack-test',        '~> 0.5.7')
   s.add_dependency('rack-mount',       '~> 0.7.2')
   s.add_dependency('sprockets',        '~> 2.0.0.beta.2')
-- 
cgit v1.2.3


From c7f7a45676f929195d6b12824acd7f200610e081 Mon Sep 17 00:00:00 2001
From: Matias Korhonen <matias@kiskolabs.com>
Date: Tue, 3 May 2011 13:44:31 +0300
Subject: Rescues template HTML5 doctype and the utf8 charset meta tag, and
 better font choices for Mac users.

---
 .../lib/action_dispatch/middleware/templates/rescues/layout.erb     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index 6c32fb17b8..6e71fd7ddc 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -1,11 +1,13 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html lang="en">
 <head>
+  <meta charset="utf-8" />
   <title>Action Controller: Exception caught</title>
   <style>
     body { background-color: #fff; color: #333; }
 
     body, p, ol, ul, td {
-      font-family: verdana, arial, helvetica, sans-serif;
+      font-family: helvetica, verdana, arial, sans-serif;
       font-size:   13px;
       line-height: 18px;
     }
-- 
cgit v1.2.3


From 49b825e502d57f10aa2cee10c1d631a95f3cef64 Mon Sep 17 00:00:00 2001
From: Matias Korhonen <matias@kiskolabs.com>
Date: Tue, 3 May 2011 16:30:59 +0300
Subject: Sets the HTTP charset parameter for rescue response.

---
 actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 2 +-
 actionpack/test/dispatch/show_exceptions_test.rb             | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index b1adf3d2d1..c17c746096 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -116,7 +116,7 @@ module ActionDispatch
       end
 
       def render(status, body)
-        [status, {'Content-Type' => 'text/html', 'Content-Length' => body.bytesize.to_s}, [body]]
+        [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
       end
 
       def public_path
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index e453dd11ce..cc57a6cba0 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -137,4 +137,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
     assert_response 500
     assert_match(/RuntimeError\n    in FeaturedTilesController/, body)
   end
+
+  test "sets the HTTP charset parameter" do
+    @app = DevelopmentApp
+
+    get "/", {}, {'action_dispatch.show_exceptions' => true}
+    assert_equal "text/html; charset=utf-8", response.headers["Content-Type"]
+  end
 end
-- 
cgit v1.2.3


From 275529446e765cb3c6d1e84bb8c1c8707e1b34a4 Mon Sep 17 00:00:00 2001
From: Josh Kalderimis <josh.kalderimis@gmail.com>
Date: Tue, 3 May 2011 16:07:25 +0200
Subject: raise an error if the old router draw method is used, along with a
 message advising them to either upgrade their routes or add
 rails_legacy_mapper to their Gemfile

---
 actionpack/lib/action_dispatch/routing/route_set.rb | 5 +++++
 actionpack/test/controller/routing_test.rb          | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 1d09091dc7..963a9107da 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -240,6 +240,11 @@ module ActionDispatch
       end
 
       def eval_block(block)
+        if block.arity == 1
+          raise "You are using the old router DSL which has been removed in Rails 3.1. " <<
+            "Please check how to update your routes file at: http://www.engineyard.com/blog/2010/the-lowdown-on-routes-in-rails-3/ " <<
+            "or add the rails_legacy_mapper gem to your Gemfile"
+        end
         mapper = Mapper.new(self)
         if default_scope
           mapper.with_default_scope(default_scope, &block)
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 18cf944f46..aa9d193436 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -92,6 +92,12 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     @rs.clear!
   end
 
+  def test_draw_with_block_arity_one_raises
+    assert_raise(RuntimeError) do
+      @rs.draw { |map| map.match '/:controller(/:action(/:id))' }
+    end
+  end
+
   def test_default_setup
     @rs.draw { match '/:controller(/:action(/:id))' }
     assert_equal({:controller => "content", :action => 'index'}, rs.recognize_path("/content"))
-- 
cgit v1.2.3


From c5d54be746473ce5610e5e6de51f6b9d2495c935 Mon Sep 17 00:00:00 2001
From: Daniel Lopes <danielvlopes@gmail.com>
Date: Tue, 3 May 2011 11:39:27 -0300
Subject: fix select_tag to have the same behavior of select

---
 .../lib/action_view/helpers/form_tag_helper.rb     | 22 ++++++++++++++++------
 actionpack/test/template/form_tag_helper_test.rb   | 10 ++++++++--
 2 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 49aa434020..9e0f8f32b7 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -74,6 +74,8 @@ module ActionView
       # ==== Options
       # * <tt>:multiple</tt> - If set to true the selection will allow multiple choices.
       # * <tt>:disabled</tt> - If set to true, the user will not be able to use this input.
+      # * <tt>:include_blank</tt> - If set to true, an empty option will be create
+      # * <tt>:prompt</tt> - Create a prompt option with blank value and the text asking user to select something
       # * Any other key creates standard HTML attributes for the tag.
       #
       # ==== Examples
@@ -99,18 +101,26 @@ module ActionView
       #   # => <select class="form_input" id="access" multiple="multiple" name="access[]"><option>Read</option>
       #   #    <option>Write</option></select>
       #
+      #   select_tag "people", options_from_collection_for_select(@people, "id", "name"), :include_blank => true
+      #   # => <select id="people" name="people"><option value=""></option><option value="1">David</option></select>
+      #
+      #   select_tag "people", options_from_collection_for_select(@people, "id", "name"), :prompt => "Select something"
+      #   # => <select id="people" name="people"><option value="">Select something</option><option value="1">David</option></select>
+      #
       #   select_tag "destination", "<option>NYC</option><option>Paris</option><option>Rome</option>", :disabled => true
       #   # => <select disabled="disabled" id="destination" name="destination"><option>NYC</option>
       #   #    <option>Paris</option><option>Rome</option></select>
       def select_tag(name, option_tags = nil, options = {})
         html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name
-        if blank = options.delete(:include_blank)
-          if blank.kind_of?(String)
-            option_tags = "<option value=\"\">#{blank}</option>".html_safe + option_tags
-          else
-            option_tags = "<option value=\"\"></option>".html_safe + option_tags
-          end
+
+        if options.delete(:include_blank)
+          option_tags = "<option value=\"\"></option>".html_safe + option_tags
+        end
+
+        if prompt = options.delete(:prompt)
+          option_tags = "<option value=\"\">#{prompt}</option>".html_safe + option_tags
         end
+
         content_tag :select, option_tags, { "name" => html_name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
       end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 656fa0356b..f95308b847 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -200,12 +200,18 @@ class FormTagHelperTest < ActionView::TestCase
     assert_dom_equal expected, actual
   end
 
-  def test_select_tag_with_include_blank_with_string
-    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :include_blank => "string"
+  def test_select_tag_with_prompt
+    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :prompt => "string"
     expected = %(<select id="places" name="places"><option value="">string</option><option>Home</option><option>Work</option><option>Pub</option></select>)
     assert_dom_equal expected, actual
   end
 
+  def test_select_tag_with_prompt_and_include_blank
+    actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :prompt => "string", :include_blank => true
+    expected = %(<select name="places" id="places"><option value="">string</option><option value=""></option><option>Home</option><option>Work</option><option>Pub</option></select>)
+    assert_dom_equal expected, actual
+  end
+
   def test_text_area_tag_size_string
     actual = text_area_tag "body", "hello world", "size" => "20x40"
     expected = %(<textarea cols="20" id="body" name="body" rows="40">hello world</textarea>)
-- 
cgit v1.2.3


From f9849070acb4c7df0b60c61cea3a927191851e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 16:51:08 +0200
Subject: Add a shared entry point for AV and AC render which can be used as
 extension in the future.

---
 actionpack/lib/abstract_controller/rendering.rb        | 6 +-----
 actionpack/lib/action_view/helpers/rendering_helper.rb | 4 +---
 actionpack/lib/action_view/renderer/renderer.rb        | 9 +++++++++
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index db6ff41f55..7f1a790ecc 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -132,11 +132,7 @@ module AbstractController
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
-      if options.key?(:partial)
-        view_renderer.render_partial(view_context, options)
-      else
-        view_renderer.render_template(view_context, options)
-      end
+      view_renderer.render(view_context, options)
     end
 
     # The prefixes used in render "foo" shortcuts.
diff --git a/actionpack/lib/action_view/helpers/rendering_helper.rb b/actionpack/lib/action_view/helpers/rendering_helper.rb
index c91e03b7e8..47efdded42 100644
--- a/actionpack/lib/action_view/helpers/rendering_helper.rb
+++ b/actionpack/lib/action_view/helpers/rendering_helper.rb
@@ -20,10 +20,8 @@ module ActionView
         when Hash
           if block_given?
             view_renderer.render_partial(self, options.merge(:partial => options[:layout]), &block)
-          elsif options.key?(:partial)
-            view_renderer.render_partial(self, options)
           else
-            view_renderer.render_template(self, options)
+            view_renderer.render(self, options)
           end
         else
           view_renderer.render_partial(self, :partial => options, :locals => locals)
diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb
index 3c0126f6bb..1fa51d276f 100644
--- a/actionpack/lib/action_view/renderer/renderer.rb
+++ b/actionpack/lib/action_view/renderer/renderer.rb
@@ -10,6 +10,15 @@ module ActionView
       @controller = controller
     end
 
+    # Main render entry point shared by AV and AC.
+    def render(context, options)
+      if options.key?(:partial)
+        render_partial(context, options)
+      else
+        render_template(context, options)
+      end
+    end
+
     # Render but returns a valid Rack body. If fibers are defined, we return
     # a streaming body that renders the template piece by piece.
     #
-- 
cgit v1.2.3


From af8c54be0a88af7e8227f156257236a10da7ffbe Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 2 May 2011 17:05:20 -0700
Subject: cache strings in the AST for faster comparison than include?

---
 actionpack/lib/action_dispatch/middleware/static.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 360c1209bb..404943d720 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -35,18 +35,15 @@ module ActionDispatch
   end
 
   class Static
-    FILE_METHODS = %w(GET HEAD).freeze
-
     def initialize(app, path, cache_control=nil)
       @app = app
       @file_handler = FileHandler.new(path, cache_control)
     end
 
     def call(env)
-      path   = env['PATH_INFO'].chomp('/')
-      method = env['REQUEST_METHOD']
-
-      if FILE_METHODS.include?(method)
+      case env['REQUEST_METHOD']
+      when 'GET', 'HEAD'
+        path = env['PATH_INFO'].chomp('/')
         if match = @file_handler.match?(path)
           env["PATH_INFO"] = match
           return @file_handler.call(env)
-- 
cgit v1.2.3


From f490a81443c9ae27dfb86964e5b74299dbae34ac Mon Sep 17 00:00:00 2001
From: Vijay Dev <vijaydev.cse@gmail.com>
Date: Tue, 3 May 2011 23:35:01 +0530
Subject: Fix typos in test method names

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

(limited to 'actionpack')

diff --git a/actionpack/test/controller/params_wrapper_test.rb b/actionpack/test/controller/params_wrapper_test.rb
index d6f8f28d0d..548cd02dc0 100644
--- a/actionpack/test/controller/params_wrapper_test.rb
+++ b/actionpack/test/controller/params_wrapper_test.rb
@@ -23,7 +23,7 @@ class ParamsWrapperTest < ActionController::TestCase
     UsersController.last_parameters = nil
   end
 
-  def test_derivered_name_from_controller
+  def test_derived_name_from_controller
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
       post :parse, { 'username' => 'sikachu' }
@@ -194,7 +194,7 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
     Admin::UsersController.last_parameters = nil
   end
 
-  def test_derivered_name_from_controller
+  def test_derived_name_from_controller
     with_default_wrapper_options do
       @request.env['CONTENT_TYPE'] = 'application/json'
       post :parse, { 'username' => 'sikachu' }
@@ -215,7 +215,7 @@ class NamespacedParamsWrapperTest < ActionController::TestCase
     end
   end
 
-  def test_heirarchy_namespace_lookup_from_model
+  def test_hierarchy_namespace_lookup_from_model
     # Make sure that we cleanup ::Admin::User
     admin_user_constant = ::Admin::User
     ::Admin.send :remove_const, :User
-- 
cgit v1.2.3


From bff374050d5a7e237fda98a1d4cc6256484e94f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 May 2011 23:03:07 +0200
Subject: Use latest rack-test.

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

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 2385ac611f..4aa2c894f9 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('builder',          '~> 3.0.0')
   s.add_dependency('i18n',             '~> 0.6.0beta1')
   s.add_dependency('rack',             '~> 1.3.0.beta')
-  s.add_dependency('rack-test',        '~> 0.5.7')
+  s.add_dependency('rack-test',        '~> 0.6.0')
   s.add_dependency('rack-mount',       '~> 0.7.2')
   s.add_dependency('sprockets',        '~> 2.0.0.beta.2')
   s.add_dependency('tzinfo',           '~> 0.3.23')
-- 
cgit v1.2.3


From 37f448e05e411cb07e829a0d93f6a83ee95ccdf3 Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Tue, 3 May 2011 23:38:44 +0200
Subject: added :prefixes accessor to LookupContext.

---
 actionpack/lib/action_view/lookup_context.rb    | 2 ++
 actionpack/test/template/lookup_context_test.rb | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 06c607931d..89729b70b3 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -9,6 +9,8 @@ module ActionView
   # generate a key, given to view paths, used in the resolver cache lookup. Since
   # this key is generated just once during the request, it speeds up all cache accesses.
   class LookupContext #:nodoc:
+    attr_accessor :prefixes
+    
     mattr_accessor :fallbacks
     @@fallbacks = FallbackFileSystemResolver.instances
 
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index ff94cba59f..82ca7ba173 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -180,6 +180,12 @@ class LookupContextTest < ActiveSupport::TestCase
 
     assert_not_equal template, old_template
   end
+  
+  test "responds to #prefixes" do
+    assert_equal nil, @lookup_context.prefixes
+    @lookup_context.prefixes = ["foo"]
+    assert_equal ["foo"], @lookup_context.prefixes
+  end
 end
 
 class LookupContextWithFalseCaching < ActiveSupport::TestCase
-- 
cgit v1.2.3


From 65ceccb0ba13dc845e6c73ada09b354583c1557a Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Tue, 3 May 2011 23:41:38 +0200
Subject: controller's prefixes are now added to LookupContext.

---
 actionpack/lib/abstract_controller/view_paths.rb | 7 +++++--
 actionpack/test/controller/view_paths_test.rb    | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index cea0f5ad1e..4fdca2cc5c 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -15,7 +15,10 @@ module AbstractController
     # templates, i.e. view paths and details. Check ActionView::LookupContext for more
     # information.
     def lookup_context
-      @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup)
+      @lookup_context ||=
+        ActionView::LookupContext.new(self.class._view_paths, details_for_lookup).tap do |ctx|
+          ctx.prefixes = _prefixes
+      end
     end
 
     def details_for_lookup
@@ -67,4 +70,4 @@ module AbstractController
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 42356be1ea..3de1849db8 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -179,4 +179,8 @@ class ViewLoadPathsTest < ActionController::TestCase
     assert_nothing_raised { C.append_view_path 'c/path' }
     assert_paths C, "c/path"
   end
+  
+  def test_lookup_context_accessor
+    assert_equal ["test"], TestController.new.lookup_context.prefixes
+  end
 end
-- 
cgit v1.2.3


From 88c21121f1e5ea31cf780cf65c89a143f168b01a Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Wed, 4 May 2011 00:10:21 +0200
Subject: initialize prefixes in LookupContext.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 89729b70b3..797a55b2b6 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -64,6 +64,7 @@ module ActionView
       @details, @details_key = { :handlers => default_handlers }, nil
       @frozen_formats, @skip_default_locale = false, false
       @cache = true
+      @prefixes = []
 
       self.view_paths = view_paths
       self.registered_detail_setters.each do |key, setter|
-- 
cgit v1.2.3


From b4bc2c50ca9887dec7cd9095a5bc84e2d6677e43 Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Wed, 4 May 2011 00:11:34 +0200
Subject: fixed test to assert initialization value.

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

(limited to 'actionpack')

diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index 82ca7ba173..5fb1fdc044 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -182,7 +182,7 @@ class LookupContextTest < ActiveSupport::TestCase
   end
   
   test "responds to #prefixes" do
-    assert_equal nil, @lookup_context.prefixes
+    assert_equal [], @lookup_context.prefixes
     @lookup_context.prefixes = ["foo"]
     assert_equal ["foo"], @lookup_context.prefixes
   end
-- 
cgit v1.2.3


From eb327c1bab918c7d9ab723550f767529771d2e19 Mon Sep 17 00:00:00 2001
From: Nick Sutterer <apotonick@gmail.com>
Date: Wed, 4 May 2011 00:12:11 +0200
Subject: no @controller dependency in Renderers.

---
 actionpack/lib/abstract_controller/rendering.rb          |  2 +-
 actionpack/lib/action_view/base.rb                       |  5 +++--
 actionpack/lib/action_view/renderer/abstract_renderer.rb |  3 +--
 actionpack/lib/action_view/renderer/partial_renderer.rb  | 10 +++-------
 actionpack/lib/action_view/renderer/renderer.rb          | 13 ++++++-------
 5 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 7f1a790ecc..8789168ca7 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -104,7 +104,7 @@ module AbstractController
 
     # Returns an object that is able to render templates.
     def view_renderer
-      @view_renderer ||= ActionView::Renderer.new(lookup_context, self)
+      @view_renderer ||= ActionView::Renderer.new(lookup_context)
     end
 
     # Normalize arguments, options and then delegates render_to_body and
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index ca0a89c8a5..db3c83d028 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -199,8 +199,9 @@ module ActionView #:nodoc:
       elsif
         lookup_context = context.is_a?(ActionView::LookupContext) ?
           context : ActionView::LookupContext.new(context)
-        lookup_context.formats = formats if formats
-        @view_renderer = ActionView::Renderer.new(lookup_context, controller)
+        lookup_context.formats  = formats if formats
+        lookup_context.prefixes = controller._prefixes if controller
+        @view_renderer = ActionView::Renderer.new(lookup_context)
       end
 
       _prepare_context
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index d389105a7a..60c527beeb 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -3,9 +3,8 @@ module ActionView
     delegate :find_template, :template_exists?, :with_fallbacks, :update_details,
       :with_layout_format, :formats, :freeze_formats, :to => :@lookup_context
 
-    def initialize(lookup_context, controller)
+    def initialize(lookup_context)
       @lookup_context = lookup_context
-      @controller = controller
     end
 
     def render
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 70327b16c4..a351fbc04f 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -219,7 +219,7 @@ module ActionView
 
     def initialize(*)
       super
-      @partial_names = PARTIAL_NAMES[@controller.class.name]
+      @partial_names = PARTIAL_NAMES[@lookup_context.prefixes.first]
     end
 
     def render(context, options, block)
@@ -304,10 +304,6 @@ module ActionView
       self
     end
 
-    def controller_prefixes
-      @controller_prefixes ||= @controller && @controller._prefixes
-    end
-
     def collection
       if @options.key?(:collection)
         collection = @options[:collection]
@@ -331,7 +327,7 @@ module ActionView
     end
 
     def find_template(path=@path, locals=@locals.keys)
-      prefixes = path.include?(?/) ? [] : controller_prefixes
+      prefixes = path.include?(?/) ? [] : @lookup_context.prefixes
       @lookup_context.find_template(path, prefixes, true, locals)
     end
 
@@ -372,7 +368,7 @@ module ActionView
         object = object.to_model if object.respond_to?(:to_model)
 
         object.class.model_name.partial_path.dup.tap do |partial|
-          path = controller_prefixes.first
+          path = @lookup_context.prefixes.first
           partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
         end
       end
diff --git a/actionpack/lib/action_view/renderer/renderer.rb b/actionpack/lib/action_view/renderer/renderer.rb
index 1fa51d276f..bf1b5a7d22 100644
--- a/actionpack/lib/action_view/renderer/renderer.rb
+++ b/actionpack/lib/action_view/renderer/renderer.rb
@@ -3,11 +3,10 @@ module ActionView
   # to other objects like TemplateRenderer and PartialRenderer which
   # actually renders the template.
   class Renderer
-    attr_accessor :lookup_context, :controller
+    attr_accessor :lookup_context
 
-    def initialize(lookup_context, controller)
+    def initialize(lookup_context)
       @lookup_context = lookup_context
-      @controller = controller
     end
 
     # Main render entry point shared by AV and AC.
@@ -28,7 +27,7 @@ module ActionView
       if options.key?(:partial)
         [render_partial(context, options)]
       else
-        StreamingTemplateRenderer.new(@lookup_context, @controller).render(context, options)
+        StreamingTemplateRenderer.new(@lookup_context).render(context, options)
       end
     end
 
@@ -45,11 +44,11 @@ module ActionView
     private
 
     def _template_renderer #:nodoc:
-      @_template_renderer ||= TemplateRenderer.new(@lookup_context, @controller)
+      @_template_renderer ||= TemplateRenderer.new(@lookup_context)
     end
 
     def _partial_renderer #:nodoc:
-      @_partial_renderer ||= PartialRenderer.new(@lookup_context, @controller)
+      @_partial_renderer ||= PartialRenderer.new(@lookup_context)
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3


From c9fa3f03fee1b3a191fa64ec4e31b1f84b66e9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 4 May 2011 09:07:11 +0200
Subject: Also allow prefixes as third argument to lookup context.

---
 actionpack/lib/abstract_controller/view_paths.rb         | 4 +---
 actionpack/lib/action_view/lookup_context.rb             | 4 ++--
 actionpack/lib/action_view/renderer/template_renderer.rb | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index 4fdca2cc5c..a777cf866d 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -16,9 +16,7 @@ module AbstractController
     # information.
     def lookup_context
       @lookup_context ||=
-        ActionView::LookupContext.new(self.class._view_paths, details_for_lookup).tap do |ctx|
-          ctx.prefixes = _prefixes
-      end
+        ActionView::LookupContext.new(self.class._view_paths, details_for_lookup, _prefixes)
     end
 
     def details_for_lookup
diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 797a55b2b6..06975ffa2f 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -60,11 +60,11 @@ module ActionView
       end
     end
 
-    def initialize(view_paths, details = {})
+    def initialize(view_paths, details = {}, prefixes = [])
       @details, @details_key = { :handlers => default_handlers }, nil
       @frozen_formats, @skip_default_locale = false, false
       @cache = true
-      @prefixes = []
+      @prefixes = prefixes
 
       self.view_paths = view_paths
       self.registered_detail_setters.each do |key, setter|
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index 6c55a865a1..a09cef8fef 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -20,7 +20,7 @@ module ActionView
       if options.key?(:text)
         Template::Text.new(options[:text], formats.try(:first))
       elsif options.key?(:file)
-        with_fallbacks { find_template(options[:file], options[:prefixes], false, keys) }
+        with_fallbacks { find_template(options[:file], nil, false, keys) }
       elsif options.key?(:inline)
         handler = Template.handler_for_extension(options[:type] || "erb")
         Template.new(options[:inline], "inline template", handler, :locals => keys)
-- 
cgit v1.2.3


From d9c39c3ae9aa9d0f50a4b557781be39e39e5b752 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Mon, 2 May 2011 00:59:57 +0200
Subject: restores the -j option, but now it accepts the name of any library

If passed "foo", a gem "foo-rails" is added to the Gemfile
and "foo" and "foo_ujs" are required in the application
JavaScript manifest.
---
 actionpack/lib/action_view/railtie.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/railtie.rb b/actionpack/lib/action_view/railtie.rb
index f20ba7e6d3..80391d72cc 100644
--- a/actionpack/lib/action_view/railtie.rb
+++ b/actionpack/lib/action_view/railtie.rb
@@ -6,7 +6,7 @@ module ActionView
   class Railtie < Rails::Railtie
     config.action_view = ActiveSupport::OrderedOptions.new
     config.action_view.stylesheet_expansions = {}
-    config.action_view.javascript_expansions = { :defaults => %w(jquery rails) }
+    config.action_view.javascript_expansions = { :defaults => %w(jquery jquery_ujs) }
 
     initializer "action_view.cache_asset_ids" do |app|
       unless app.config.cache_classes
-- 
cgit v1.2.3


From 6afc900191c8edc6f41966827e1cd03ced3f1b17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 4 May 2011 11:26:02 +0200
Subject: Move prefixes to view paths as they are now a lookup context
 dependency.

---
 actionpack/lib/abstract_controller/helpers.rb    |  2 --
 actionpack/lib/abstract_controller/rendering.rb  | 21 ---------------------
 actionpack/lib/abstract_controller/view_paths.rb | 24 ++++++++++++++++++++++++
 actionpack/lib/action_view/test_case.rb          |  2 ++
 actionpack/test/template/test_case_test.rb       |  4 ++++
 5 files changed, 30 insertions(+), 23 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/helpers.rb b/actionpack/lib/abstract_controller/helpers.rb
index 0ff1c0491a..dc9778a416 100644
--- a/actionpack/lib/abstract_controller/helpers.rb
+++ b/actionpack/lib/abstract_controller/helpers.rb
@@ -4,8 +4,6 @@ module AbstractController
   module Helpers
     extend ActiveSupport::Concern
 
-    include Rendering
-
     included do
       class_attribute :_helpers
       self._helpers = Module.new
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 8789168ca7..a5f983a55b 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -62,20 +62,6 @@ module AbstractController
           end
         end
       end
-
-      def parent_prefixes
-        @parent_prefixes ||= begin
-          parent_controller = superclass
-          prefixes = []
-
-          until parent_controller.abstract?
-            prefixes << parent_controller.controller_path
-            parent_controller = parent_controller.superclass
-          end
-
-          prefixes
-        end
-      end
     end
 
     attr_writer :view_context_class
@@ -135,13 +121,6 @@ module AbstractController
       view_renderer.render(view_context, options)
     end
 
-    # The prefixes used in render "foo" shortcuts.
-    def _prefixes
-      @_prefixes ||= begin
-        parent_prefixes = self.class.parent_prefixes
-        parent_prefixes.dup.unshift(controller_path)
-      end
-    end
 
     private
 
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index a777cf866d..0893459e24 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -11,6 +11,30 @@ module AbstractController
     delegate :find_template, :template_exists?, :view_paths, :formats, :formats=,
              :locale, :locale=, :to => :lookup_context
 
+    module ClassMethods
+      def parent_prefixes
+        @parent_prefixes ||= begin
+          parent_controller = superclass
+          prefixes = []
+
+          until parent_controller.abstract?
+            prefixes << parent_controller.controller_path
+            parent_controller = parent_controller.superclass
+          end
+
+          prefixes
+        end
+      end
+    end
+
+    # The prefixes used in render "foo" shortcuts.
+    def _prefixes
+      @_prefixes ||= begin
+        parent_prefixes = self.class.parent_prefixes
+        parent_prefixes.dup.unshift(controller_path)
+      end
+    end
+
     # LookupContext is the object responsible to hold all information required to lookup
     # templates, i.e. view paths and details. Check ActionView::LookupContext for more
     # information.
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 14e032790d..43f9bffe18 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/delegation'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_view'
@@ -43,6 +44,7 @@ module ActionView
       include AbstractController::Helpers
       include ActionView::Helpers
 
+      delegate :lookup_context, :to => :controller
       attr_accessor :controller, :output_buffer, :rendered
 
       module ClassMethods
diff --git a/actionpack/test/template/test_case_test.rb b/actionpack/test/template/test_case_test.rb
index 11c355dc6d..cd4618a505 100644
--- a/actionpack/test/template/test_case_test.rb
+++ b/actionpack/test/template/test_case_test.rb
@@ -73,6 +73,10 @@ module ActionView
       view.request.flash.expects(:alert).with("this message")
       view.alert("this message")
     end
+
+    test "uses controller lookup context" do
+      assert_equal self.lookup_context, @controller.lookup_context
+    end
   end
 
   class ClassMethodsTest < ActionView::TestCase
-- 
cgit v1.2.3


From 1632a3a49fb318be25d832b7efb17093bd7ef8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 4 May 2011 12:04:29 +0200
Subject: More AV::Base cleanup.

---
 actionpack/lib/abstract_controller/rendering.rb    | 18 ++-----
 actionpack/lib/action_view/base.rb                 | 57 +++++++++++-----------
 actionpack/lib/action_view/helpers.rb              |  2 +
 .../lib/action_view/helpers/controller_helper.rb   | 21 ++++++++
 4 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 actionpack/lib/action_view/helpers/controller_helper.rb

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index a5f983a55b..f78365afdb 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -46,20 +46,9 @@ module AbstractController
     module ClassMethods
       def view_context_class
         @view_context_class ||= begin
-          controller = self
-          Class.new(ActionView::Base) do
-            if controller.respond_to?(:_routes) && controller._routes
-              include controller._routes.url_helpers
-              include controller._routes.mounted_helpers
-            end
-
-            if controller.respond_to?(:_helpers)
-              include controller._helpers
-
-              # TODO: Fix RJS to not require this
-              self.helpers = controller._helpers
-            end
-          end
+          routes  = _routes  if respond_to?(:_routes)
+          helpers = _helpers if respond_to?(:_helpers)
+          ActionView::Base.prepare(routes, helpers)
         end
       end
     end
@@ -121,7 +110,6 @@ module AbstractController
       view_renderer.render(view_context, options)
     end
 
-
     private
 
     # This method should return a hash with assigns.
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index db3c83d028..c98110353f 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -156,41 +156,45 @@ module ActionView #:nodoc:
       def cache_template_loading=(value)
         ActionView::Resolver.caching = value
       end
+
+      def process_view_paths(value)
+        value.is_a?(PathSet) ?
+          value.dup : ActionView::PathSet.new(Array.wrap(value))
+      end
+
+      def xss_safe? #:nodoc:
+        true
+      end
+
+      # This method receives routes and helpers from the controller
+      # and return a subclass ready to be used as view context.
+      def prepare(routes, helpers) #:nodoc:
+        Class.new(self) do
+          if routes
+            include routes.url_helpers
+            include routes.mounted_helpers
+          end
+
+          if helpers
+            include helpers
+            self.helpers = helpers
+          end
+        end
+      end
     end
 
     attr_accessor :view_renderer
-    attr_internal :request, :controller, :config, :assigns
+    attr_internal :config, :assigns
 
     delegate :lookup_context, :to => :view_renderer
     delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :to => :lookup_context
 
-    delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
-             :flash, :action_name, :controller_name, :to => :controller
-
-    delegate :logger, :to => :controller, :allow_nil => true
-
-    def self.xss_safe? #:nodoc:
-      true
-    end
-
-    def self.process_view_paths(value)
-      value.is_a?(PathSet) ?
-        value.dup : ActionView::PathSet.new(Array.wrap(value))
-    end
-
     def assign(new_assigns) # :nodoc:
       @_assigns = new_assigns.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
-    def initialize(context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
-      assign(assigns_for_first_render)
-      self.helpers = Module.new unless self.class.helpers
-
+    def initialize(context = nil, assigns = {}, controller = nil, formats = nil) #:nodoc:
       @_config = {}
-      if @_controller = controller
-        @_request = controller.request if controller.respond_to?(:request)
-        @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
-      end
 
       # Handle all these for backwards compatibility.
       # TODO Provide a new API for AV::Base and deprecate this one.
@@ -204,14 +208,11 @@ module ActionView #:nodoc:
         @view_renderer = ActionView::Renderer.new(lookup_context)
       end
 
+      assign(assigns)
+      assign_controller(controller)
       _prepare_context
     end
 
-    # TODO Is this needed anywhere? Maybe deprecate it?
-    def controller_path
-      @controller_path ||= controller && controller.controller_path
-    end
-
     ActiveSupport.run_load_hooks(:action_view, self)
   end
 end
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb
index 3ef9826d30..78a68db282 100644
--- a/actionpack/lib/action_view/helpers.rb
+++ b/actionpack/lib/action_view/helpers.rb
@@ -9,6 +9,7 @@ module ActionView #:nodoc:
     autoload :AtomFeedHelper
     autoload :CacheHelper
     autoload :CaptureHelper
+    autoload :ControllerHelper
     autoload :CsrfHelper
     autoload :DateHelper
     autoload :DebugHelper
@@ -39,6 +40,7 @@ module ActionView #:nodoc:
     include AtomFeedHelper
     include CacheHelper
     include CaptureHelper
+    include ControllerHelper
     include CsrfHelper
     include DateHelper
     include DebugHelper
diff --git a/actionpack/lib/action_view/helpers/controller_helper.rb b/actionpack/lib/action_view/helpers/controller_helper.rb
new file mode 100644
index 0000000000..e22331cb3c
--- /dev/null
+++ b/actionpack/lib/action_view/helpers/controller_helper.rb
@@ -0,0 +1,21 @@
+module ActionView
+  module Helpers
+    # This module keeps all methods and behavior in ActionView
+    # that simply delegates to the controller.
+    module ControllerHelper #:nodoc:
+      attr_internal :controller, :request
+
+      delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
+               :flash, :action_name, :controller_name, :controller_path, :to => :controller
+
+      delegate :logger, :to => :controller, :allow_nil => true
+
+      def assign_controller(controller)
+        if @_controller = controller
+          @_request = controller.request if controller.respond_to?(:request)
+          @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From a93bd11b1d90da5abdef11c2774bb9bafe27bfb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 4 May 2011 19:31:43 +0200
Subject: Use remove possible method here.

---
 actionpack/lib/action_view/test_case.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 43f9bffe18..d0317a148b 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/remove_method'
 require 'action_controller'
 require 'action_controller/test_case'
 require 'action_view'
@@ -129,7 +130,7 @@ module ActionView
 
       def say_no_to_protect_against_forgery!
         _helpers.module_eval do
-          remove_method :protect_against_forgery? if method_defined?(:protect_against_forgery?)
+          remove_possible_method :protect_against_forgery?
           def protect_against_forgery?
             false
           end
-- 
cgit v1.2.3


From 6b79463ed8d04c7807c0695fcb3d4c11e4be9fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 4 May 2011 20:05:35 +0200
Subject: Fix .subdomain regression.

---
 actionpack/lib/action_dispatch/http/url.rb | 2 +-
 actionpack/test/dispatch/request_test.rb   | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index ac0fd9607d..d9c07d6ca3 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -165,7 +165,7 @@ module ActionDispatch
       # such as 2 to catch <tt>["www"]</tt> instead of <tt>"www.rubyonrails"</tt>
       # in "www.rubyonrails.co.uk".
       def subdomain(tld_length = @@tld_length)
-        subdomains(tld_length)
+        subdomains(tld_length).join(".")
       end
     end
   end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index fb2faf7a4e..d128006404 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -137,30 +137,39 @@ class RequestTest < ActiveSupport::TestCase
   test "subdomains" do
     request = stub_request 'HTTP_HOST' => "www.rubyonrails.org"
     assert_equal %w( www ), request.subdomains
+    assert_equal "www", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "www.rubyonrails.co.uk"
     assert_equal %w( www ), request.subdomains(2)
+    assert_equal "www", request.subdomain(2)
 
     request = stub_request 'HTTP_HOST' => "dev.www.rubyonrails.co.uk"
     assert_equal %w( dev www ), request.subdomains(2)
+    assert_equal "dev.www", request.subdomain(2)
 
     request = stub_request 'HTTP_HOST' => "dev.www.rubyonrails.co.uk", :tld_length => 2
     assert_equal %w( dev www ), request.subdomains
+    assert_equal "dev.www", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "foobar.foobar.com"
     assert_equal %w( foobar ), request.subdomains
+    assert_equal "foobar", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "192.168.1.200"
     assert_equal [], request.subdomains
+    assert_equal "", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "foo.192.168.1.200"
     assert_equal [], request.subdomains
+    assert_equal "", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "192.168.1.200.com"
     assert_equal %w( 192 168 1 ), request.subdomains
+    assert_equal "192.168.1", request.subdomain
 
     request = stub_request 'HTTP_HOST' => nil
     assert_equal [], request.subdomains
+    assert_equal "", request.subdomain
   end
 
   test "standard_port" do
-- 
cgit v1.2.3


From afc3ccf74cbb6c3d495558e934ced1c006dacda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 4 May 2011 20:12:27 +0200
Subject: Fix renew feature on cookies.

---
 .../action_dispatch/middleware/session/cookie_store.rb   |  2 +-
 actionpack/test/dispatch/session/cookie_store_test.rb    | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index 9c9ccc62f5..8ebf870b95 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -59,7 +59,7 @@ module ActionDispatch
       end
 
       def set_session(env, sid, session_data, options)
-        persistent_session_id!(session_data, sid)
+        session_data.merge("session_id" => sid)
       end
 
       def set_cookie(env, session_id, cookie)
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 27f55fd7ab..b0efbcef4a 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -50,6 +50,11 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
       get_session_id
     end
 
+    def renew_session_id
+      request.session_options[:renew] = true
+      head :ok
+    end
+
     def rescue_action(e) raise end
   end
 
@@ -102,6 +107,17 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_properly_renew_cookies
+    with_test_route_set do
+      get '/set_session_value'
+      get '/persistent_session_id'
+      session_id = response.body
+      get '/renew_session_id'
+      get '/persistent_session_id'
+      assert_not_equal response.body, session_id
+    end
+  end
+
   def test_does_set_secure_cookies_over_https
     with_test_route_set(:secure => true) do
       get '/set_session_value', nil, 'HTTPS' => 'on'
-- 
cgit v1.2.3


From 9be7911e873e1ba0d0b0bac197b426693b4f3885 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Wed, 4 May 2011 15:13:40 -0300
Subject: Use #remove_possible_method instead here

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 963a9107da..97e8ccc9a5 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -3,6 +3,7 @@ require 'forwardable'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
 require 'active_support/core_ext/hash/slice'
+require 'active_support/core_ext/module/remove_method'
 
 module ActionDispatch
   module Routing
@@ -160,7 +161,7 @@ module ActionDispatch
 
             # We use module_eval to avoid leaks
             @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_method :#{selector} if method_defined?(:#{selector})
+              remove_possible_method :#{selector}
               def #{selector}(*args)
                 options = args.extract_options!
 
@@ -194,7 +195,7 @@ module ActionDispatch
             hash_access_method = hash_access_name(name, kind)
 
             @module.module_eval <<-END_EVAL, __FILE__, __LINE__ + 1
-              remove_method :#{selector} if method_defined?(:#{selector})
+              remove_possible_method :#{selector}
               def #{selector}(*args)
                 url_for(#{hash_access_method}(*args))
               end
-- 
cgit v1.2.3


From bd4831d6995102f6003d401b2f257c8f8e553d7b Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Wed, 4 May 2011 16:47:48 -0300
Subject: Bump up rack-cache, tzinfo and thor

---
 actionpack/actionpack.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index 4aa2c894f9..fdd894fe63 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activesupport',    version)
   s.add_dependency('activemodel',      version)
-  s.add_dependency('rack-cache',       '~> 1.0.0')
+  s.add_dependency('rack-cache',       '~> 1.0.1')
   s.add_dependency('builder',          '~> 3.0.0')
   s.add_dependency('i18n',             '~> 0.6.0beta1')
   s.add_dependency('rack',             '~> 1.3.0.beta')
   s.add_dependency('rack-test',        '~> 0.6.0')
   s.add_dependency('rack-mount',       '~> 0.7.2')
   s.add_dependency('sprockets',        '~> 2.0.0.beta.2')
-  s.add_dependency('tzinfo',           '~> 0.3.23')
+  s.add_dependency('tzinfo',           '~> 0.3.27')
   s.add_dependency('erubis',           '~> 2.7.0')
 end
-- 
cgit v1.2.3


From 5b8801442ea02fc942ae0ee8ef81a9120525f5f0 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 4 May 2011 19:56:56 -0500
Subject: Only show dump of regular env methods on exception screen (not all
 the rack crap) [DHH]

---
 actionpack/CHANGELOG                                             | 2 ++
 actionpack/lib/action_dispatch/http/request.rb                   | 9 +++++----
 .../middleware/templates/rescues/_request_and_response.erb       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index ba01c4749f..046b47cc32 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* Only show dump of regular env methods on exception screen (not all the rack crap) [DHH]
+
 * auto_link has been removed with no replacement.  If you still use auto_link
   please install the rails_autolink gem:
     http://github.com/tenderlove/rails_autolink
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index f07ac44f7a..ccb866f4f7 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -17,16 +17,17 @@ module ActionDispatch
     include ActionDispatch::Http::Upload
     include ActionDispatch::Http::URL
 
-    LOCALHOST = [/^127\.0\.0\.\d{1,3}$/, "::1", /^0:0:0:0:0:0:0:1(%.*)?$/].freeze
-
-    %w[ AUTH_TYPE GATEWAY_INTERFACE
+    LOCALHOST   = [/^127\.0\.0\.\d{1,3}$/, "::1", /^0:0:0:0:0:0:0:1(%.*)?$/].freeze
+    ENV_METHODS = %w[ AUTH_TYPE GATEWAY_INTERFACE
         PATH_TRANSLATED REMOTE_HOST
         REMOTE_IDENT REMOTE_USER REMOTE_ADDR
         SERVER_NAME SERVER_PROTOCOL
 
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_FROM
-        HTTP_NEGOTIATE HTTP_PRAGMA ].each do |env|
+        HTTP_NEGOTIATE HTTP_PRAGMA ].freeze
+      
+    ENV_METHODS.each do |env|
       class_eval <<-METHOD, __FILE__, __LINE__ + 1
         def #{env.sub(/^HTTP_/n, '').downcase}
           @env["#{env}"]
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index 97f7cf0bbe..0c5bafa666 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -24,7 +24,7 @@
 <div id="session_dump" style="display:none"><pre><%= debug_hash @request.session %></pre></div>
 
 <p><a href="#" onclick="document.getElementById('env_dump').style.display='block'; return false;">Show env dump</a></p>
-<div id="env_dump" style="display:none"><pre><%= debug_hash @request.env %></pre></div>
+<div id="env_dump" style="display:none"><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></div>
 
 
 <h2 style="margin-top: 30px">Response</h2>
-- 
cgit v1.2.3


From 169ae75e091392e3852d0dfb56fadacef4b7a20b Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Wed, 4 May 2011 20:21:05 -0500
Subject: Prepare for beta1

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

(limited to 'actionpack')

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


From ffe731c922e2290b6796a74cfe82f80ce9be009e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 5 May 2011 03:01:15 -0700
Subject: Update respond_with docs to deal better with collections.

---
 actionpack/lib/action_controller/metal/responder.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index 59a3621f72..ebadb29ea7 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -68,7 +68,7 @@ module ActionController #:nodoc:
   #     respond_with(@project, @task)
   #   end
   #
-  # Giving an array of resources, you ensure that the responder will redirect to
+  # Giving several resources ensures that the responder will redirect to
   # <code>project_task_url</code> instead of <code>task_url</code>.
   #
   # Namespaced and singleton resources require a symbol to be given, as in
@@ -77,6 +77,11 @@ module ActionController #:nodoc:
   #
   #   respond_with(@project, :manager, @task)
   #
+  # Note that if you give an array, it will be treated as a collection,
+  # so the following is not equivalent:
+  #
+  #   respond_with [@project, :manager, @task]
+  #
   # === Custom options
   #
   # <code>respond_with</code> also allow you to pass options that are forwarded
-- 
cgit v1.2.3


From 41a6d96c1bced4a2e4cba20b8c209c52656f59cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 05:53:27 +0200
Subject: Update CHANGELOGs.

---
 actionpack/CHANGELOG | 2 --
 1 file changed, 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 046b47cc32..2bb1461ec9 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -114,8 +114,6 @@ tested.
 
   Keys are dasherized. Values are JSON-encoded, except for strings and symbols. [Stephen Celis]
 
-* Added render :once. You can pass either a string or an array of strings and Rails will ensure they each of them are rendered just once. [José Valim]
-
 * Deprecate old template handler API. The new API simply requires a template handler to respond to call. [José Valim]
 
 * :rhtml and :rxml were finally removed as template handlers. [José Valim]
-- 
cgit v1.2.3


From 785ee65ddfc3cd361ea2a0dbde3bfb908ed62192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 07:11:06 +0200
Subject: Ensure params wrapper settings are not inherited and calculated each
 time.

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
index 21bbe17dc3..881af74147 100644
--- a/actionpack/lib/action_controller/metal/params_wrapper.rb
+++ b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -125,7 +125,7 @@ module ActionController
       # module is inherited.
       def inherited(klass)
         if klass._wrapper_options[:format].present?
-          klass._set_wrapper_defaults(klass._wrapper_options)
+          klass._set_wrapper_defaults(klass._wrapper_options.slice(:format))
         end
         super
       end
-- 
cgit v1.2.3


From ae7d0d816db3f9a94008d36ab9efbe7583700981 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Mon, 29 Nov 2010 20:45:43 +0530
Subject: Take leap years into account more seriously when calculating year
 distance [#6074 state:resolved]

---
 actionpack/lib/action_view/helpers/date_helper.rb | 17 ++++++++++++++---
 actionpack/test/template/date_helper_test.rb      |  4 ++++
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 9277359d5c..c5f2fb6b2d 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -94,9 +94,20 @@ module ActionView
             when 43200..86399    then locale.t :about_x_months, :count => 1
             when 86400..525599   then locale.t :x_months,       :count => (distance_in_minutes.to_f / 43200.0).round
             else
-              distance_in_years           = distance_in_minutes / 525600
-              minute_offset_for_leap_year = (distance_in_years / 4) * 1440
-              remainder                   = ((distance_in_minutes - minute_offset_for_leap_year) % 525600)
+              fyear = from_time.year
+              fyear += 1 if from_time.month >= 3
+              tyear = to_time.year
+              tyear -= 1 if to_time.month < 3
+              leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
+              minute_offset_for_leap_year = leap_years * 1440
+              # Discount the leap year days when calculating year distance.
+              # e.g. if there are 20 leap year days between 2 dates having the same day 
+              # and month then the based on 365 days calculation
+              # the distance in years will come out to over 80 years when in written 
+              # english it would read better as about 80 years.
+              minutes_with_offset         = distance_in_minutes - minute_offset_for_leap_year
+              remainder                   = (minutes_with_offset % 525600)
+              distance_in_years           = (minutes_with_offset / 525600)
               if remainder < 131400
                 locale.t(:about_x_years,  :count => distance_in_years)
               elsif remainder < 394200
diff --git a/actionpack/test/template/date_helper_test.rb b/actionpack/test/template/date_helper_test.rb
index 12d2410f49..3dd400026c 100644
--- a/actionpack/test/template/date_helper_test.rb
+++ b/actionpack/test/template/date_helper_test.rb
@@ -121,6 +121,10 @@ class DateHelperTest < ActionView::TestCase
     start_date = Date.new 1975, 1, 31
     end_date = Date.new 1977, 1, 31
     assert_equal("about 2 years", distance_of_time_in_words(start_date, end_date))
+
+    start_date = Date.new 1982, 12, 3
+    end_date = Date.new 2010, 11, 30
+    assert_equal("almost 28 years", distance_of_time_in_words(start_date, end_date))
   end
 
   def test_distance_in_words_with_integers
-- 
cgit v1.2.3


From 65a9563209c741757a9a0177019eff3b10de98a8 Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 6 May 2011 15:51:09 +0530
Subject: strip space

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

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index c5f2fb6b2d..eb8c96a6ae 100644
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -101,9 +101,9 @@ module ActionView
               leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
               minute_offset_for_leap_year = leap_years * 1440
               # Discount the leap year days when calculating year distance.
-              # e.g. if there are 20 leap year days between 2 dates having the same day 
+              # e.g. if there are 20 leap year days between 2 dates having the same day
               # and month then the based on 365 days calculation
-              # the distance in years will come out to over 80 years when in written 
+              # the distance in years will come out to over 80 years when in written
               # english it would read better as about 80 years.
               minutes_with_offset         = distance_in_minutes - minute_offset_for_leap_year
               remainder                   = (minutes_with_offset % 525600)
-- 
cgit v1.2.3


From 894bdbd53dd82b6b28ff2672b85f57ed5ce97759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 14:32:48 +0200
Subject: Move variables to underscore format, update protected instance
 variables list.

---
 actionpack/lib/abstract_controller/rendering.rb    | 28 +++++++++++++++++-----
 actionpack/lib/abstract_controller/view_paths.rb   |  2 +-
 .../lib/action_controller/metal/compatibility.rb   |  9 ++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index f78365afdb..09398c322a 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -32,9 +32,13 @@ module AbstractController
 
   module Rendering
     extend ActiveSupport::Concern
-
     include AbstractController::ViewPaths
 
+    included do
+      config_accessor :protected_instance_variables, :instance_reader => false
+      self.protected_instance_variables = []
+    end
+
     # Overwrite process to setup I18n proxy.
     def process(*) #:nodoc:
       old_config, I18n.config = I18n.config, I18nProxy.new(I18n.config, lookup_context)
@@ -53,14 +57,20 @@ module AbstractController
       end
     end
 
-    attr_writer :view_context_class
+    attr_internal_writer :view_context_class
+
+    # Explicitly define protected_instance_variables so it can be
+    # inherited and overwritten by other modules if needed.
+    def protected_instance_variables
+      config.protected_instance_variables
+    end
 
     def view_context_class
-      @view_context_class || self.class.view_context_class
+      @_view_context_class || self.class.view_context_class
     end
 
     def initialize(*)
-      @view_context_class = nil
+      @_view_context_class = nil
       super
     end
 
@@ -79,7 +89,7 @@ module AbstractController
 
     # Returns an object that is able to render templates.
     def view_renderer
-      @view_renderer ||= ActionView::Renderer.new(lookup_context)
+      @_view_renderer ||= ActionView::Renderer.new(lookup_context)
     end
 
     # Normalize arguments, options and then delegates render_to_body and
@@ -112,13 +122,19 @@ module AbstractController
 
     private
 
+    DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
+      @_action_name @_response_body @_formats @_prefixes
+      @_view_context_class @_view_renderer @_lookup_context
+    )
+
     # This method should return a hash with assigns.
     # You can overwrite this configuration per controller.
     # :api: public
     def view_assigns
       hash = {}
       variables  = instance_variable_names
-      variables -= protected_instance_variables if respond_to?(:protected_instance_variables)
+      variables -= protected_instance_variables
+      variables -= DEFAULT_PROTECTED_INSTANCE_VARIABLES
       variables.each { |name| hash[name.to_s[1, name.length]] = instance_variable_get(name) }
       hash
     end
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index 0893459e24..6b7aae8c74 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -39,7 +39,7 @@ module AbstractController
     # templates, i.e. view paths and details. Check ActionView::LookupContext for more
     # information.
     def lookup_context
-      @lookup_context ||=
+      @_lookup_context ||=
         ActionView::LookupContext.new(self.class._view_paths, details_for_lookup, _prefixes)
     end
 
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 006b9fd456..6ee5b41c8d 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -18,13 +18,8 @@ module ActionController
         delegate :default_charset=, :to => "ActionDispatch::Response"
       end
 
-      # TODO: Update protected instance variables list
-      config_accessor :protected_instance_variables
-      self.protected_instance_variables = %w(@assigns @performed_redirect @performed_render
-                                             @variables_added @request_origin @url
-                                             @parent_controller @action_name
-                                             @before_filter_chain_aborted @_headers @_params
-                                             @_response)
+      self.protected_instance_variables = %w(@_headers @_params @_env @_response @_request
+                                             @_view_runtime @_stream @_url_options)
 
       def rescue_action(env)
         raise env["action_dispatch.rescue.exception"]
-- 
cgit v1.2.3


From d42bb6843073b876e6a79e396a947c267fcbbf75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 14:56:51 +0200
Subject: More updates to ivars list.

---
 actionpack/lib/abstract_controller/layouts.rb           | 6 +++---
 actionpack/lib/abstract_controller/rendering.rb         | 2 +-
 actionpack/lib/action_controller/metal/compatibility.rb | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index d1b87b67ee..8f73e244d7 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -292,15 +292,15 @@ module AbstractController
       end
     end
 
-    attr_writer :action_has_layout
+    attr_internal_writer :action_has_layout
 
     def initialize(*)
-      @action_has_layout = true
+      @_action_has_layout = true
       super
     end
 
     def action_has_layout?
-      @action_has_layout
+      @_action_has_layout
     end
 
   private
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 09398c322a..ab2c532859 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -123,7 +123,7 @@ module AbstractController
     private
 
     DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
-      @_action_name @_response_body @_formats @_prefixes
+      @_action_name @_response_body @_formats @_prefixes @_config
       @_view_context_class @_view_renderer @_lookup_context
     )
 
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 6ee5b41c8d..05dca445a4 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -18,8 +18,10 @@ module ActionController
         delegate :default_charset=, :to => "ActionDispatch::Response"
       end
 
-      self.protected_instance_variables = %w(@_headers @_params @_env @_response @_request
-                                             @_view_runtime @_stream @_url_options)
+      self.protected_instance_variables = %w(
+        @_status @_headers @_params @_env @_response @_request
+        @_view_runtime @_stream @_url_options @_action_has_layout
+      )
 
       def rescue_action(env)
         raise env["action_dispatch.rescue.exception"]
-- 
cgit v1.2.3


From 0e5adbceb7d49f3448eec32a7068807f571bf76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 17:00:59 +0200
Subject: Don't pluralize, camelize.

---
 .../lib/action_dispatch/middleware/templates/rescues/diagnostics.erb  | 2 +-
 actionpack/test/dispatch/show_exceptions_test.rb                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
index 2099fd069a..4b9d3141d5 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
@@ -1,7 +1,7 @@
 <h1>
   <%=h @exception.class.to_s %>
   <% if @request.parameters['controller'] %>
-    in <%=h @request.parameters['controller'].classify.pluralize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
+    in <%=h @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
   <% end %>
 </h1>
 <pre><%=h @exception.message %></pre>
diff --git a/actionpack/test/dispatch/show_exceptions_test.rb b/actionpack/test/dispatch/show_exceptions_test.rb
index cc57a6cba0..42f6c7f79f 100644
--- a/actionpack/test/dispatch/show_exceptions_test.rb
+++ b/actionpack/test/dispatch/show_exceptions_test.rb
@@ -131,11 +131,11 @@ class ShowExceptionsTest < ActionDispatch::IntegrationTest
       'action_dispatch.request.parameters' => {
         'action' => 'show',
         'id' => 'unknown',
-        'controller' => 'featured_tiles'
+        'controller' => 'featured_tile'
       }
     })
     assert_response 500
-    assert_match(/RuntimeError\n    in FeaturedTilesController/, body)
+    assert_match(/RuntimeError\n    in FeaturedTileController/, body)
   end
 
   test "sets the HTTP charset parameter" do
-- 
cgit v1.2.3


From 9c2c25c1a1343937e96eed81e38ef4f9fb06ce11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 18:39:10 +0200
Subject: Revert to old semantics, use available_action? instead of
 action_method?.

---
 actionpack/lib/abstract_controller/base.rb         | 38 ++++++++++++++--------
 actionpack/lib/abstract_controller/callbacks.rb    |  4 +--
 .../lib/action_controller/metal/implicit_render.rb | 16 ++++-----
 .../new_base/render_implicit_action_test.rb        |  8 ++---
 4 files changed, 38 insertions(+), 28 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 0951267fea..08a1273a39 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -130,27 +130,39 @@ module AbstractController
       self.class.action_methods
     end
 
-    # Returns true if the name can be considered an action. This can
-    # be overridden in subclasses to modify the semantics of what
-    # can be considered an action.
+    # Returns true if a method for the action is available and
+    # can be dispatched, false otherwise.
     #
-    # For instance, this is overriden by ActionController to add
-    # the implicit rendering feature.
-    #
-    # ==== Parameters
-    # * <tt>name</tt> - The name of an action to be tested
-    #
-    # ==== Returns
-    # * <tt>TrueClass</tt>, <tt>FalseClass</tt>
-    def action_method?(name)
-      self.class.action_methods.include?(name)
+    # Notice that action_methods.include?("foo") may return
+    # false and available_action?("foo") return true because
+    # available action consider actions that are also available
+    # through other means, for example, implicit render ones.
+    def available_action?(action_name)
+      method_for_action(action_name).present?
     end
 
     private
 
+      # Returns true if the name can be considered an action because
+      # it has a method defined in the controller.
+      #
+      # ==== Parameters
+      # * <tt>name</tt> - The name of an action to be tested
+      #
+      # ==== Returns
+      # * <tt>TrueClass</tt>, <tt>FalseClass</tt>
+      #
+      # :api: private
+      def action_method?(name)
+        self.class.action_methods.include?(name)
+      end
+
       # Call the action. Override this in a subclass to modify the
       # behavior around processing an action. This, and not #process,
       # is the intended way to override action dispatching.
+      #
+      # Notice that the first argument is the method to be dispatched
+      # which is *not* necessarily the same as the action name.
       def process_action(method_name, *args)
         send_action(method_name, *args)
       end
diff --git a/actionpack/lib/abstract_controller/callbacks.rb b/actionpack/lib/abstract_controller/callbacks.rb
index f7b2b7ff53..e8426bc52b 100644
--- a/actionpack/lib/abstract_controller/callbacks.rb
+++ b/actionpack/lib/abstract_controller/callbacks.rb
@@ -13,8 +13,8 @@ module AbstractController
 
     # Override AbstractController::Base's process_action to run the
     # process_action callbacks around the normal behavior.
-    def process_action(method_name, *args)
-      run_callbacks(:process_action, method_name) do
+    def process_action(*args)
+      run_callbacks(:process_action, action_name) do
         super
       end
     end
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb
index 3ec0c4c6a4..e8e465d3ba 100644
--- a/actionpack/lib/action_controller/metal/implicit_render.rb
+++ b/actionpack/lib/action_controller/metal/implicit_render.rb
@@ -1,21 +1,19 @@
 module ActionController
   module ImplicitRender
     def send_action(method, *args)
-      if respond_to?(method, true)
-        ret = super
-        default_render unless response_body
-        ret
-      else
-        default_render
-      end
+      ret = super
+      default_render unless response_body
+      ret
     end
 
     def default_render(*args)
       render(*args)
     end
 
-    def action_method?(action_name)
-      super || template_exists?(action_name.to_s, _prefixes)
+    def method_for_action(action_name)
+      super || if template_exists?(action_name.to_s, _prefixes)
+        "default_render"
+      end
     end
   end
 end
diff --git a/actionpack/test/controller/new_base/render_implicit_action_test.rb b/actionpack/test/controller/new_base/render_implicit_action_test.rb
index 3bb3016fdb..1e2191d417 100644
--- a/actionpack/test/controller/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/controller/new_base/render_implicit_action_test.rb
@@ -33,10 +33,10 @@ module RenderImplicitAction
       assert_status 200
     end
 
-    test "action_method? returns true for implicit actions" do
-      assert SimpleController.new.action_method?(:hello_world)
-      assert SimpleController.new.action_method?(:"hyphen-ated")
-      assert SimpleController.new.action_method?(:not_implemented)
+    test "available_action? returns true for implicit actions" do
+      assert SimpleController.new.available_action?(:hello_world)
+      assert SimpleController.new.available_action?(:"hyphen-ated")
+      assert SimpleController.new.available_action?(:not_implemented)
     end
   end
 end
-- 
cgit v1.2.3


From 9899f53184bcac6e9d51da0c6fba843bd8e6de01 Mon Sep 17 00:00:00 2001
From: Sebastian Martinez <sebastian@wyeworks.com>
Date: Fri, 6 May 2011 14:23:25 -0300
Subject: better styling on #available_action? docs

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

(limited to 'actionpack')

diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 08a1273a39..f67d0e558e 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -133,8 +133,8 @@ module AbstractController
     # Returns true if a method for the action is available and
     # can be dispatched, false otherwise.
     #
-    # Notice that action_methods.include?("foo") may return
-    # false and available_action?("foo") return true because
+    # Notice that <tt>action_methods.include?("foo")</tt> may return
+    # false and <tt>available_action?("foo")</tt> returns true because
     # available action consider actions that are also available
     # through other means, for example, implicit render ones.
     def available_action?(action_name)
-- 
cgit v1.2.3


From c515f64f72d070b9481ab8b62c98aaae45b96323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 7 May 2011 02:21:49 +0200
Subject: Use .ref instead of .to_sym.

---
 actionpack/lib/action_controller/log_subscriber.rb        | 4 +++-
 actionpack/lib/action_controller/metal/instrumentation.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 3fae697cc3..8d813a8e38 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -7,8 +7,10 @@ module ActionController
     def start_processing(event)
       payload = event.payload
       params  = payload[:params].except(*INTERNAL_PARAMS)
+      format  = payload[:format]
+      format  = format.to_s.upcase if format.is_a?(Symbol)
 
-      info "  Processing by #{payload[:controller]}##{payload[:action]} as #{payload[:formats].first.to_s.upcase}"
+      info "  Processing by #{payload[:controller]}##{payload[:action]} as #{format}"
       info "  Parameters: #{params.inspect}" unless params.empty?
     end
 
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
index 4e54c2ad88..16cbbce2fb 100644
--- a/actionpack/lib/action_controller/metal/instrumentation.rb
+++ b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -19,7 +19,7 @@ module ActionController
         :controller => self.class.name,
         :action     => self.action_name,
         :params     => request.filtered_parameters,
-        :formats    => request.formats.map(&:to_sym),
+        :format     => request.format.ref,
         :method     => request.method,
         :path       => (request.fullpath rescue "unknown")
       }
-- 
cgit v1.2.3


From 00a1152fa79808dfa86a516fe150911297f7aa58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 7 May 2011 15:31:56 +0200
Subject: Update CHANGELOG.

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

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 2bb1461ec9..428a5d0e1a 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *Rails 3.1.0 (unreleased)*
 
+* Allow AM/PM format in datetime selectors [Aditya Sanghi]
+
 * Only show dump of regular env methods on exception screen (not all the rack crap) [DHH]
 
 * auto_link has been removed with no replacement.  If you still use auto_link
-- 
cgit v1.2.3


From fadd1fa3d314639067404403651de52a7d2b72f7 Mon Sep 17 00:00:00 2001
From: mathieuravaux <mathieu.ravaux@gmail.com>
Date: Sun, 27 Feb 2011 01:52:08 +0100
Subject: Fixes ticket #6379. Improved the handling of Accept headers
 containing */*.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`lookup_context#formats=` being too restrictive, "Accept: text/javascript, */*"
resulted in [:js, "*/*"] formats instead of [:js, :html].

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/lib/action_view/lookup_context.rb    | 11 +++++++----
 actionpack/test/template/lookup_context_test.rb |  5 +++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 06975ffa2f..02114f46da 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -169,10 +169,13 @@ module ActionView
 
       # Overload formats= to reject ["*/*"] values.
       def formats=(values)
-        if values && values.size == 1
-          value = values.first
-          values = nil    if value == "*/*"
-          values << :html if value == :js
+        if values
+          values.pop if values.last == "*/*"
+          if values.size == 0
+            values = nil
+          elsif values == [:js]
+            values << :html
+          end
         end
         super(values)
       end
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index 5fb1fdc044..e7680bc022 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -51,6 +51,11 @@ class LookupContextTest < ActiveSupport::TestCase
     assert_equal Mime::SET, @lookup_context.formats
   end
 
+  test "handles explicitly defined */* formats fallback to :js" do
+    @lookup_context.formats = [:js, Mime::ALL]
+    assert_equal [:js, :html], @lookup_context.formats
+  end
+
   test "adds :html fallback to :js formats" do
     @lookup_context.formats = [:js]
     assert_equal [:js, :html], @lookup_context.formats
-- 
cgit v1.2.3


From 0a1ba4eab0c442f3e9f4027e4b5d3418f8eb6ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sat, 7 May 2011 23:43:25 +0200
Subject: Always expand */*

---
 actionpack/lib/action_view/lookup_context.rb    | 11 ++++-------
 actionpack/test/template/lookup_context_test.rb |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 02114f46da..f0ed3425de 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -167,15 +167,12 @@ module ActionView
         @frozen_formats = true
       end
 
-      # Overload formats= to reject ["*/*"] values.
+      # Overload formats= to expand ["*/*"] values and automatically
+      # add :html as fallback to :js.
       def formats=(values)
         if values
-          values.pop if values.last == "*/*"
-          if values.size == 0
-            values = nil
-          elsif values == [:js]
-            values << :html
-          end
+          values.concat(_formats_defaults) if values.delete "*/*"
+          values << :html if values == [:js]
         end
         super(values)
       end
diff --git a/actionpack/test/template/lookup_context_test.rb b/actionpack/test/template/lookup_context_test.rb
index e7680bc022..f34a40795a 100644
--- a/actionpack/test/template/lookup_context_test.rb
+++ b/actionpack/test/template/lookup_context_test.rb
@@ -53,7 +53,7 @@ class LookupContextTest < ActiveSupport::TestCase
 
   test "handles explicitly defined */* formats fallback to :js" do
     @lookup_context.formats = [:js, Mime::ALL]
-    assert_equal [:js, :html], @lookup_context.formats
+    assert_equal [:js, *Mime::SET.symbols], @lookup_context.formats
   end
 
   test "adds :html fallback to :js formats" do
-- 
cgit v1.2.3