Merge pull request rails#1324 from dmathieu/no_error_on_invalid_format

josevalim · josevalim · commit ec08bfc035e7 · 2011-05-26T02:29:23.000-07:00
Don't raise an exception if the format isn't recognized
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb
@@ -19,7 +19,7 @@ def process_action(*args)
         :controller => self.class.name,
         :action     => self.action_name,
         :params     => request.filtered_parameters,
-        :format     => request.format.ref,
+        :format     => request.format.try(:ref),
         :method     => request.method,
         :path       => (request.fullpath rescue "unknown")
       }
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
@@ -498,6 +498,12 @@ def test_format_with_custom_response_type_and_request_headers
     assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
     assert_equal "text/html", @response.content_type
   end
+  
+  def test_invalid_format
+    get :using_defaults, :format => "invalidformat"
+    assert_equal " ", @response.body
+    assert_equal "text/html", @response.content_type
+  end
 end
 
 class RespondWithController < ActionController::Base

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ def process_action(*args)`
`19`	`19`	`:controller => self.class.name,`
`20`	`20`	`:action => self.action_name,`
`21`	`21`	`:params => request.filtered_parameters,`
`22`		`- :format => request.format.ref,`
	`22`	`+ :format => request.format.try(:ref),`
`23`	`23`	`:method => request.method,`
`24`	`24`	`:path => (request.fullpath rescue "unknown")`
`25`	`25`	`}`