Changeset 5664

Timestamp:

12/02/06 23:07:04 (2 years ago)

Author:

david

Message:

Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/mime_type.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/request.rb (modified) (1 diff)
• trunk/actionpack/test/controller/request_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH]. Examples:
+
+    GET /posts/5.xml   | request.format => Mime::XML
+    GET /posts/5.xhtml | request.format => Mime::HTML
+    GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
-
-* Added the option for extension aliases to mime type registration [DHH]. Example (already in the default routes):

trunk/actionpack/lib/action_controller/mime_type.rb

@@ -47 +47 @@
-      def lookup(string)
-        LOOKUP[string]
+      end
+
+      def lookup_by_extension(extension)
+        EXTENSION_LOOKUP[extension]
-      end
-

trunk/actionpack/lib/action_controller/request.rb

@@ -84 +84 @@
-    end
-
+    # Returns the Mime type for the format used in the request. If there is no format available, the first of the 
+    # accept types will be used. Examples:
+    #
+    #   GET /posts/5.xml   | request.format => Mime::XML
+    #   GET /posts/5.xhtml | request.format => Mime::HTML
+    #   GET /posts/5       | request.format => request.accepts.first (usually Mime::HTML for browsers)
+    def format
+      parameters[:format] ? Mime::Type.lookup_by_extension(parameters[:format]) : accepts.first
+    end
+
-    # Returns true if the request's "X-Requested-With" header contains
-    # "XMLHttpRequest". (The Prototype Javascript library sends this header with

trunk/actionpack/test/controller/request_test.rb

@@ -304 +304 @@
-  end
-
+  def test_format
+    @request.instance_eval { @parameters = { :format => 'xml' } }
+    assert_equal Mime::XML, @request.format
+
+    @request.instance_eval { @parameters = { :format => 'xhtml' } }
+    assert_equal Mime::HTML, @request.format
+
+    @request.instance_eval { @parameters = { :format => nil } }
+    @request.env["HTTP_ACCEPT"] = "text/javascript"
+    assert_equal Mime::JS, @request.format
+  end
+
-  protected
-    def set_request_method_to(method)