github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5299 from sikachu/3-2-stable-fix-responder

Browse Source 
Always passing a respond block from to responder
This commit is contained in:
José Valim
2012-03-06 00:50:00 -08:00
parent e1a882a15b 82a8698e56
commit 688e4f0fd1
3 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
actionpack/lib/action_controller/metal/mime_responds.rb
View File

@@ -235,16 +235,8 @@ module ActionController #:nodoc:
if collector = retrieve_collector_from_mimes(&block)
options = resources.size == 1 ? {} : resources.extract_options!
if defined_response = collector.response
if action = options.delete(:action)
render :action => action
else
defined_response.call
end
else
(options.delete(:responder) || self.class.responder).call(self, resources, options)
end
options[:default_response] = collector.response
(options.delete(:responder) || self.class.responder).call(self, resources, options)
end
end

13
actionpack/lib/action_controller/metal/responder.rb
View File

@@ -129,6 +129,7 @@ module ActionController #:nodoc:
@resources = resources
@options = options
@action = options.delete(:action)
@default_response = options.delete(:default_response)
end
delegate :head, :render, :redirect_to, :to => :controller
@@ -171,7 +172,7 @@ module ActionController #:nodoc:
# responds to :to_format and display it.
#
def to_format
if get? || !has_errors?
if get? || !has_errors? || response_overridden?
default_render
else
display_errors
@@ -225,7 +226,11 @@ module ActionController #:nodoc:
# controller.
#
def default_render
controller.default_render(options)
if @default_response
@default_response.call(options)
else
controller.default_render(options)
end
end
# Display is just a shortcut to render a resource with the current format.
@@ -273,5 +278,9 @@ module ActionController #:nodoc:
def json_resource_errors
{:errors => resource.errors}
end
def response_overridden?
@default_response.present?
end
end
end

36
actionpack/test/controller/mime_responds_test.rb
View File

@@ -1152,3 +1152,39 @@ class MimeControllerLayoutsTest < ActionController::TestCase
assert_equal '<html><div id="super_iphone">Super iPhone</div></html>', @response.body
end
end
class FlashResponder < ActionController::Responder
def initialize(controller, resources, options={})
super
end
def to_html
controller.flash[:notice] = 'Success'
super
end
end
class FlashResponderController < ActionController::Base
self.responder = FlashResponder
respond_to :html
def index
respond_with Object.new do |format|
format.html { render :text => 'HTML' }
end
end
end
class FlashResponderControllerTest < ActionController::TestCase
tests FlashResponderController
def test_respond_with_block_executed
get :index
assert_equal 'HTML', @response.body
end
def test_flash_responder_executed
get :index
assert_equal 'Success', flash[:notice]
end
end