Ensure that blocks are also handled inside the responder.

1 files changed, 16 insertions, 18 deletions

diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 6a32aeae24..3026067868 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -178,7 +178,10 @@ module ActionController #:nodoc:
     #
     def respond_to(*mimes, &block)
       raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?
-      collect_mimes_for_render(mimes, block){ default_render }
+
+      if response = retrieve_response_from_mimes(mimes, &block)
+        response.call
+      end
     end
 
     # respond_with wraps a resource around a responder for default representation.
@@ -211,8 +214,9 @@ module ActionController #:nodoc:
     # a proc to it.
     #
     def respond_with(*resources, &block)
-      collect_mimes_for_render([], block) do
+      if response = retrieve_response_from_mimes([], &block)
         options = resources.extract_options!
+        options.merge!(:default_response => response)
         (options.delete(:responder) || responder).call(self, resources, options)
       end
     end
@@ -242,34 +246,29 @@ module ActionController #:nodoc:
       end
     end
 
-    # Receives a collection of mimes and a block with formats and initialize a
-    # collector. If a response was added to the collector, uses it to satisfy
-    # the request, otherwise yields the block given.
+    # Collects mimes and return the response for the negotiated format. Returns
+    # nil if :not_acceptable was sent to the client.
     #
-    def collect_mimes_for_render(mimes, formats)
-      collector = Collector.new
+    def retrieve_response_from_mimes(mimes, &block)
+      collector = Collector.new { default_render }
       mimes = collect_mimes_from_class_level if mimes.empty?
       mimes.each { |mime| collector.send(mime) }
-      formats.call(collector) if formats
+      block.call(collector) if block_given?
 
       if format = request.negotiate_mime(collector.order)
         self.formats = [format.to_sym]
-
-        if response = collector.response_for(format)
-          response.call
-        else
-          yield
-        end
+        collector.response_for(format)
       else
         head :not_acceptable
+        nil
       end
     end
 
     class Collector #:nodoc:
       attr_accessor :order
 
-      def initialize
-        @order, @responses = [], {}
+      def initialize(&block)
+        @order, @responses, @default_response = [], {}, block
       end
 
       def any(*args, &block)
@@ -283,13 +282,12 @@ module ActionController #:nodoc:
 
       def custom(mime_type, &block)
         mime_type = mime_type.is_a?(Mime::Type) ? mime_type : Mime::Type.lookup(mime_type.to_s)
-
         @order << mime_type
         @responses[mime_type] ||= block
       end
 
       def response_for(mime)
-        @responses[mime] || @responses[Mime::ALL]
+        @responses[mime] || @responses[Mime::ALL] || @default_response
       end
 
       def self.generate_method_for_mime(mime)