Changeset 8987

Timestamp:

03/07/08 11:17:05 (2 months ago)

Author:

pratik

Message:

Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make MimeResponds::Responder#any work without explicit types. Closes #11140 [jaw6]
-
-* Better error message for type conflicts when parsing params.  Closes #7962 [spicycode, matt]

trunk/actionpack/lib/action_controller/mime_responds.rb

@@ -126 +126 @@
-        @order << mime_type
-
-
+||
-          @response.template.template_format = mime_type.to_sym
-          @response.content_type = mime_type.to_s
@@ -134 +134 @@
-
-      def any(*args, &block)
-
+
+
+
+
+
-      end
-

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -106 +106 @@
-      type.html { render :text => "HTML" }
-      type.any(:js, :xml) { render :text => "Either JS or XML" }
+    end
+  end
+  
+  def handle_any_any
+    respond_to do |type|
+      type.html { render :text => 'HTML' }
+      type.any { render :text => 'Whatever you ask for, I got it' }
-    end
-  end
@@ -334 +341 @@
-    get :handle_any
-    assert_equal 'Either JS or XML', @response.body
+  end
+
+  def test_handle_any_any
+    @request.env["HTTP_ACCEPT"] = "*/*"
+    get :handle_any_any
+    assert_equal 'HTML', @response.body
+  end
+  
+  def test_handle_any_any_parameter_format
+    get :handle_any_any, {:format=>'html'}
+    assert_equal 'HTML', @response.body
+  end
+  
+  def test_handle_any_any_explicit_html
+    @request.env["HTTP_ACCEPT"] = "text/html"
+    get :handle_any_any
+    assert_equal 'HTML', @response.body
+  end
+
+  def test_handle_any_any_javascript
+    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    get :handle_any_any
+    assert_equal 'Whatever you ask for, I got it', @response.body
+  end
+  
+  def test_handle_any_any_xml
+    @request.env["HTTP_ACCEPT"] = "text/xml"
+    get :handle_any_any
+    assert_equal 'Whatever you ask for, I got it', @response.body
-  end
-