diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/mime_responds.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/controller/mime_responds_test.rb | 21 |
3 files changed, 27 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 9327105989..94c0a6bf95 100644 --- a/actionpack/CHANGELOG +++ b/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] diff --git a/actionpack/lib/action_controller/mime_responds.rb b/actionpack/lib/action_controller/mime_responds.rb index 44b9dd933c..04ec1e5dd8 100644 --- a/actionpack/lib/action_controller/mime_responds.rb +++ b/actionpack/lib/action_controller/mime_responds.rb @@ -51,6 +51,10 @@ module ActionController #:nodoc: end EOT end + + def any(*args, &block) + args.each { |type| send(type, &block) } + end def respond for priority in @mime_type_priority diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb index 94273cf4af..a2b8eaad60 100644 --- a/actionpack/test/controller/mime_responds_test.rb +++ b/actionpack/test/controller/mime_responds_test.rb @@ -64,6 +64,13 @@ class RespondToController < ActionController::Base 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 @@ class MimeControllerTest < Test::Unit::TestCase 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
\ No newline at end of file |