Permalink
Browse files

Fixed that setting request.format would also affect respond_to blocks…

… [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7479 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c87206c commit d48039cefb684d678480e1f078c6082792038d03 @dhh dhh committed Sep 15, 2007
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that setting request.format would also affect respond_to blocks [DHH]
+
* Add option to force binary mode on tempfile used for fixture_file_upload. #6380 [Jonathan Viney]
* Fixed that resource namespaces wouldn't stick to all nested resources #9399 [pixeltrix]
View
20 actionpack/lib/action_controller/request.rb
@@ -12,9 +12,6 @@ class AbstractRequest
# such as { 'RAILS_ENV' => 'production' }.
attr_reader :env
- # The requested content type, such as :html or :xml.
- attr_writer :format
-
# The HTTP request method as a lowercase symbol, such as :get.
# Note, HEAD is returned as :get since the two are functionally
# equivalent from the application's perspective.
@@ -90,6 +87,23 @@ def accepts
def format
@format ||= parameters[:format] ? Mime::Type.lookup_by_extension(parameters[:format]) : accepts.first
end
+
+
+ # Sets the format by string extension, which can be used to force custom formats that are not controlled by the extension.
+ # Example:
+ #
+ # class ApplicationController < ActionController::Base
+ # before_filter :adjust_format_for_iphone
+ #
+ # private
+ # def adjust_format_for_iphone
+ # request.format = :iphone if request.env["HTTP_USER_AGENT"][/iPhone/]
+ # end
+ # end
+ def format=(extension)
+ parameters[:format] = extension.to_s
+ format
+ end
# Returns true if the request's "X-Requested-With" header contains
# "XMLHttpRequest". (The Prototype Javascript library sends this header with
View
17 actionpack/test/controller/mime_responds_test.rb
@@ -35,6 +35,15 @@ def html_or_xml
end
end
+ def forced_xml
+ request.format = :xml
+
+ respond_to do |type|
+ type.html { render :text => "HTML" }
+ type.xml { render :text => "XML" }
+ end
+ end
+
def just_xml
respond_to do |type|
type.xml { render :text => "XML" }
@@ -343,6 +352,14 @@ def test_forced_format
assert_equal "RSS", @response.body
end
+ def test_internally_forced_format
+ get :forced_xml
+ assert_equal "XML", @response.body
+
+ get :forced_xml, :format => "html"
+ assert_equal "XML", @response.body
+ end
+
def test_extension_synonyms
get :html_xml_or_rss, :format => "xhtml"
assert_equal "HTML", @response.body

0 comments on commit d48039c

Please sign in to comment.