From 6e30361260205cb7029fbc78b4a98b66a884ce45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 1 Dec 2009 13:11:24 -0200
Subject: Allow ActionController::Responder to have a common entry point for
 all formats.

Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
---
 actionpack/lib/action_controller/metal/responder.rb | 11 ++++++++---
 actionpack/test/controller/mime_responds_test.rb    | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb
index e8e88e7479..6c76c57839 100644
--- a/actionpack/lib/action_controller/metal/responder.rb
+++ b/actionpack/lib/action_controller/metal/responder.rb
@@ -102,9 +102,14 @@ module ActionController #:nodoc:
     # not defined, call to_format.
     #
     def self.call(*args)
-      responder = new(*args)
-      method = :"to_#{responder.format}"
-      responder.respond_to?(method) ? responder.send(method) : responder.to_format
+      new(*args).respond
+    end
+
+    # Main entry point for responder responsible to dispatch to the proper format.
+    #
+    def respond
+      method = :"to_#{format}"
+      respond_to?(method) ? send(method) : to_format
     end
 
     # HTML format does not render the resource, it always attempt to render a
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index fee9cf46f9..c1fa74b8c8 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -507,6 +507,13 @@ class RespondWithController < ActionController::Base
     end
   end
 
+  def using_responder_with_respond
+    responder = Class.new(ActionController::Responder) do
+      def respond; @controller.render :text => "respond #{format}"; end
+    end
+    respond_with(Customer.new("david", 13), :responder => responder)
+  end
+
 protected
 
   def _render_js(js, options)
@@ -735,6 +742,16 @@ class RespondWithControllerTest < ActionController::TestCase
     assert_equal "foo - #{[:html].to_s}", @controller.response_body
   end
 
+  def test_respond_as_responder_entry_point
+    @request.accept = "text/html"
+    get :using_responder_with_respond
+    assert_equal "respond html", @response.body
+
+    @request.accept = "application/xml"
+    get :using_responder_with_respond
+    assert_equal "respond xml", @response.body
+  end
+
   def test_clear_respond_to
     @controller = InheritedRespondWithController.new
     @request.accept = "text/html"
-- 
cgit v1.2.3


From 0c4990b5f4b8c99ea656170eff9bb9c3490de642 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 1 Dec 2009 12:19:42 -0800
Subject: Fix caching test to ensure notifications are all delivered

---
 actionpack/test/controller/caching_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 54de920740..682a8f3995 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -640,6 +640,7 @@ class FragmentCachingTest < ActionController::TestCase
 
     assert fragment_computed
     assert_equal 'generated till now -> ', buffer
+    ActiveSupport::Notifications.notifier.wait
     assert_equal [:fragment_exist?, :write_fragment], events.map(&:first)
   end
 
-- 
cgit v1.2.3