mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Raise an error if respond_with is invoked and no format is declared.
This commit is contained in:
parent
8d72ba51ba
commit
d2e7c1b97d
6 changed files with 71 additions and 77 deletions
|
@ -215,7 +215,10 @@ module ActionController #:nodoc:
|
|||
# a proc to it.
|
||||
#
|
||||
def respond_with(*resources, &block)
|
||||
if response = retrieve_response_from_mimes([], &block)
|
||||
raise "In order to use respond_with, first you need to declare the formats your " <<
|
||||
"controller responds to in the class level" if mimes_for_respond_to.empty?
|
||||
|
||||
if response = retrieve_response_from_mimes(&block)
|
||||
options = resources.extract_options!
|
||||
options.merge!(:default_response => response)
|
||||
(options.delete(:responder) || responder).call(self, resources, options)
|
||||
|
@ -246,9 +249,9 @@ module ActionController #:nodoc:
|
|||
# Collects mimes and return the response for the negotiated format. Returns
|
||||
# nil if :not_acceptable was sent to the client.
|
||||
#
|
||||
def retrieve_response_from_mimes(mimes, &block)
|
||||
def retrieve_response_from_mimes(mimes=nil, &block)
|
||||
collector = Collector.new { default_render }
|
||||
mimes = collect_mimes_from_class_level if mimes.empty?
|
||||
mimes ||= collect_mimes_from_class_level
|
||||
mimes.each { |mime| collector.send(mime) }
|
||||
block.call(collector) if block_given?
|
||||
|
||||
|
|
|
@ -461,31 +461,27 @@ end
|
|||
|
||||
class RespondWithController < ActionController::Base
|
||||
respond_to :html, :json
|
||||
respond_to :xml, :except => :using_defaults
|
||||
respond_to :js, :only => [ :using_defaults, :using_resource ]
|
||||
respond_to :xml, :except => :using_resource_with_block
|
||||
respond_to :js, :only => [ :using_resource_with_block, :using_resource ]
|
||||
|
||||
def using_defaults
|
||||
respond_to do |format|
|
||||
def using_resource
|
||||
respond_with(resource)
|
||||
end
|
||||
|
||||
def using_resource_with_block
|
||||
respond_with(resource) do |format|
|
||||
format.csv { render :text => "CSV" }
|
||||
end
|
||||
end
|
||||
|
||||
def using_defaults_with_type_list
|
||||
respond_to(:js, :xml)
|
||||
end
|
||||
|
||||
def default_overwritten
|
||||
respond_to do |format|
|
||||
def using_resource_with_overwrite_block
|
||||
respond_with(resource) do |format|
|
||||
format.html { render :text => "HTML" }
|
||||
end
|
||||
end
|
||||
|
||||
def using_resource
|
||||
respond_with(Customer.new("david", 13))
|
||||
end
|
||||
|
||||
def using_resource_with_collection
|
||||
respond_with([Customer.new("david", 13), Customer.new("jamis", 9)])
|
||||
respond_with([resource, Customer.new("jamis", 9)])
|
||||
end
|
||||
|
||||
def using_resource_with_parent
|
||||
|
@ -493,16 +489,16 @@ class RespondWithController < ActionController::Base
|
|||
end
|
||||
|
||||
def using_resource_with_status_and_location
|
||||
respond_with(Customer.new("david", 13), :location => "http://test.host/", :status => :created)
|
||||
respond_with(resource, :location => "http://test.host/", :status => :created)
|
||||
end
|
||||
|
||||
def using_resource_with_responder
|
||||
responder = proc { |c, r, o| c.render :text => "Resource name is #{r.first.name}" }
|
||||
respond_with(Customer.new("david", 13), :responder => responder)
|
||||
respond_with(resource, :responder => responder)
|
||||
end
|
||||
|
||||
def using_resource_with_action
|
||||
respond_with(Customer.new("david", 13), :action => :foo) do |format|
|
||||
respond_with(resource, :action => :foo) do |format|
|
||||
format.html { raise ActionView::MissingTemplate.new([], "method") }
|
||||
end
|
||||
end
|
||||
|
@ -511,11 +507,15 @@ class RespondWithController < ActionController::Base
|
|||
responder = Class.new(ActionController::Responder) do
|
||||
def respond; @controller.render :text => "respond #{format}"; end
|
||||
end
|
||||
respond_with(Customer.new("david", 13), :responder => responder)
|
||||
respond_with(resource, :responder => responder)
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def resource
|
||||
Customer.new("david", 13)
|
||||
end
|
||||
|
||||
def _render_js(js, options)
|
||||
self.content_type ||= Mime::JS
|
||||
self.response_body = js.respond_to?(:to_js) ? js.to_js : js
|
||||
|
@ -527,12 +527,18 @@ class InheritedRespondWithController < RespondWithController
|
|||
respond_to :xml, :json
|
||||
|
||||
def index
|
||||
respond_with(Customer.new("david", 13)) do |format|
|
||||
respond_with(resource) do |format|
|
||||
format.json { render :text => "JSON" }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
class EmptyRespondWithController < ActionController::Base
|
||||
def index
|
||||
respond_with(Customer.new("david", 13))
|
||||
end
|
||||
end
|
||||
|
||||
class RespondWithControllerTest < ActionController::TestCase
|
||||
tests RespondWithController
|
||||
|
||||
|
@ -547,41 +553,6 @@ class RespondWithControllerTest < ActionController::TestCase
|
|||
ActionController::Base.use_accept_header = false
|
||||
end
|
||||
|
||||
def test_using_defaults
|
||||
@request.accept = "*/*"
|
||||
get :using_defaults
|
||||
assert_equal "text/html", @response.content_type
|
||||
assert_equal 'Hello world!', @response.body
|
||||
|
||||
@request.accept = "text/csv"
|
||||
get :using_defaults
|
||||
assert_equal "text/csv", @response.content_type
|
||||
assert_equal "CSV", @response.body
|
||||
|
||||
@request.accept = "text/javascript"
|
||||
get :using_defaults
|
||||
assert_equal "text/javascript", @response.content_type
|
||||
assert_equal '$("body").visualEffect("highlight");', @response.body
|
||||
end
|
||||
|
||||
def test_using_defaults_with_type_list
|
||||
@request.accept = "*/*"
|
||||
get :using_defaults_with_type_list
|
||||
assert_equal "text/javascript", @response.content_type
|
||||
assert_equal '$("body").visualEffect("highlight");', @response.body
|
||||
|
||||
@request.accept = "application/xml"
|
||||
get :using_defaults_with_type_list
|
||||
assert_equal "application/xml", @response.content_type
|
||||
assert_equal "<p>Hello world!</p>\n", @response.body
|
||||
end
|
||||
|
||||
def test_default_overwritten
|
||||
get :default_overwritten
|
||||
assert_equal "text/html", @response.content_type
|
||||
assert_equal "HTML", @response.body
|
||||
end
|
||||
|
||||
def test_using_resource
|
||||
@request.accept = "text/javascript"
|
||||
get :using_resource
|
||||
|
@ -599,6 +570,39 @@ class RespondWithControllerTest < ActionController::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
def test_using_resource_with_block
|
||||
@request.accept = "*/*"
|
||||
get :using_resource_with_block
|
||||
assert_equal "text/html", @response.content_type
|
||||
assert_equal 'Hello world!', @response.body
|
||||
|
||||
@request.accept = "text/csv"
|
||||
get :using_resource_with_block
|
||||
assert_equal "text/csv", @response.content_type
|
||||
assert_equal "CSV", @response.body
|
||||
|
||||
@request.accept = "application/xml"
|
||||
get :using_resource
|
||||
assert_equal "application/xml", @response.content_type
|
||||
assert_equal "<name>david</name>", @response.body
|
||||
end
|
||||
|
||||
def test_using_resource_with_overwrite_block
|
||||
get :using_resource_with_overwrite_block
|
||||
assert_equal "text/html", @response.content_type
|
||||
assert_equal "HTML", @response.body
|
||||
end
|
||||
|
||||
def test_not_acceptable
|
||||
@request.accept = "application/xml"
|
||||
get :using_resource_with_block
|
||||
assert_equal 406, @response.status
|
||||
|
||||
@request.accept = "text/javascript"
|
||||
get :using_resource_with_overwrite_block
|
||||
assert_equal 406, @response.status
|
||||
end
|
||||
|
||||
def test_using_resource_for_post_with_html_redirects_on_success
|
||||
with_test_route_set do
|
||||
post :using_resource
|
||||
|
@ -831,22 +835,12 @@ class RespondWithControllerTest < ActionController::TestCase
|
|||
RespondWithController.responder = ActionController::Responder
|
||||
end
|
||||
|
||||
def test_not_acceptable
|
||||
@request.accept = "application/xml"
|
||||
get :using_defaults
|
||||
assert_equal 406, @response.status
|
||||
|
||||
@request.accept = "text/html"
|
||||
get :using_defaults_with_type_list
|
||||
assert_equal 406, @response.status
|
||||
|
||||
@request.accept = "application/json"
|
||||
get :using_defaults_with_type_list
|
||||
assert_equal 406, @response.status
|
||||
|
||||
@request.accept = "text/javascript"
|
||||
get :default_overwritten
|
||||
assert_equal 406, @response.status
|
||||
def test_error_is_raised_if_no_respond_to_is_declared_and_respond_with_is_called
|
||||
@controller = EmptyRespondWithController.new
|
||||
@request.accept = "*/*"
|
||||
assert_raise RuntimeError do
|
||||
get :index
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
page[:body].visual_effect :highlight
|
|
@ -1 +0,0 @@
|
|||
page[:body].visual_effect :highlight
|
|
@ -1 +0,0 @@
|
|||
xml.p "Hello world!"
|
Loading…
Reference in a new issue