Changeset 7479

Timestamp:

09/15/07 04:18:32 (1 year ago)

Author:

david

Message:

Fixed that setting request.format would also affect respond_to blocks [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/mime_responds_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_controller/request.rb

@@ -12 +12 @@
-    # 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.
@@ -90 +87 @@
-    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
-

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -33 +33 @@
-      type.xml  { render :text => "XML"     }
-      type.all  { render :text => "Nothing" }
+    end
+  end
+
+  def forced_xml
+    request.format = :xml
+
+    respond_to do |type|
+      type.html { render :text => "HTML"    }
+      type.xml  { render :text => "XML"     }
-    end
-  end
@@ -344 +353 @@
-  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"