Changeset 4384

Timestamp:

05/31/06 18:52:24 (2 years ago)

Author:

david

Message:

Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [DHH]

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added interrogation of params[:format] to determine Accept type. If :format is specified and matches a declared extension, like "rss" or "xml", that mime type will be put in front of the accept handler. This means you can link to the same action from different extensions and use that fact to determine output [DHH]. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.find :all
+      
+      respond_to do |format|
+        format.html
+        format.xml { render :xml => @posts.to_xml }
+        format.rss { render :action => "feed.rxml" }
+      end
+    end
+  end
+  
+  # returns HTML when requested by a browser, since the browser
+  # has the HTML mimetype at the top of its priority list
+  Accept: text/html
+  GET /weblog 
+  
+  # returns the XML 
+  Accept: application/xml
+  GET /weblog 
+
+  # returns the HTML 
+  Accept: application/xml
+  GET /weblog.html
+
+  # returns the XML
+  Accept: text/html
+  GET /weblog.xml
+  
+  All this relies on the fact that you have a route that includes .:format.
+  
-
-* Expanded :method option in FormTagHelper#form_tag, FormHelper#form_for, PrototypeHelper#remote_form_for, PrototypeHelper#remote_form_tag, and PrototypeHelper#link_to_remote to allow for verbs other than GET and POST by automatically creating a hidden form field named _method, which will simulate the other verbs over post [DHH]

trunk/actionpack/lib/action_controller/mime_responds.rb

@@ -111 +111 @@
-      def initialize(block_binding)
-        @block_binding = block_binding
-
+
+
+
+
+
+
-        @order     = []
-        @responses = {}

trunk/actionpack/lib/action_controller/mime_type.rb

@@ -120 +120 @@
-  YAML  = Type.new "application/x-yaml", :yaml, %w( text/yaml )
-
+
-  LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) }
-
@@ -140 +141 @@
-  LOOKUP["application/rss+xml"]      = RSS
-  LOOKUP["application/atom+xml"]     = ATOM
+
+  
+  EXTENSION_LOOKUP = Hash.new { |h, k| h[k] = Type.new(k) }
+
+  EXTENSION_LOOKUP["html"]  = HTML
+  EXTENSION_LOOKUP["xhtml"] = HTML
+
+  EXTENSION_LOOKUP["xml"]   = XML
+
+  EXTENSION_LOOKUP["js"]    = JS
+
+  EXTENSION_LOOKUP["yml"]   = YAML
+  EXTENSION_LOOKUP["yaml"]  = YAML
+
+  EXTENSION_LOOKUP["rss"]   = RSS
+  EXTENSION_LOOKUP["atom"]  = ATOM
-end

trunk/actionpack/test/controller/mime_responds_test.rb

@@ -255 +255 @@
-    assert_equal '$("body").visualEffect("highlight");', @response.body
-  end
+  
+  def test_forced_format
+    get :html_xml_or_rss
+    assert_equal "HTML", @response.body
+
+    get :html_xml_or_rss, :format => "html"
+    assert_equal "HTML", @response.body
+
+    get :html_xml_or_rss, :format => "xml"
+    assert_equal "XML", @response.body
+
+    get :html_xml_or_rss, :format => "rss"
+    assert_equal "RSS", @response.body
+  end
-end