Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Add MimeResponds::Responder#any for managing multiple types with iden…

…tical responses

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3876 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 6480d4974920ba3a22606770b49cb4140fa3ad40 1 parent 6e283e9
@jamis jamis authored
View
2  actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Add MimeResponds::Responder#any for managing multiple types with identical responses [Jamis Buck]
+
* Make the xml_http_request testing method set the HTTP_ACCEPT header [Jamis Buck]
* Add Verification to scaffolds. Prevent destructive actions using GET [Michael Koziarski]
View
4 actionpack/lib/action_controller/mime_responds.rb
@@ -51,6 +51,10 @@ def #{mime_type}(argument = nil, &block)
end
EOT
end
+
+ def any(*args, &block)
+ args.each { |type| send(type, &block) }
+ end
def respond
for priority in @mime_type_priority
View
21 actionpack/test/controller/mime_responds_test.rb
@@ -64,6 +64,13 @@ def custom_type_handling
end
end
+ def handle_any
+ respond_to do |type|
+ type.html { render :text => "HTML" }
+ type.any(:js, :xml) { render :text => "Either JS or XML" }
+ end
+ end
+
def rescue_action(e)
raise unless ActionController::MissingTemplate === e
end
@@ -195,4 +202,18 @@ def test_firefox_simulation
get :html_or_xml
assert_equal 'HTML', @response.body
end
+
+ def test_handle_any
+ @request.env["HTTP_ACCEPT"] = "*/*"
+ get :handle_any
+ assert_equal 'HTML', @response.body
+
+ @request.env["HTTP_ACCEPT"] = "text/javascript"
+ get :handle_any
+ assert_equal 'Either JS or XML', @response.body
+
+ @request.env["HTTP_ACCEPT"] = "text/xml"
+ get :handle_any
+ assert_equal 'Either JS or XML', @response.body
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.