Changeset 6574

Timestamp:

04/24/07 18:29:37 (1 year ago)

Author:

david

Message:

Added that render :xml will try to call to_xml if it can [DHH]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/render_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added that render :xml will try to call to_xml if it can [DHH]. Makes these work:
+
+    render :xml => post
+    render :xml => comments
-
-* Added :location option to render so that the common pattern of rendering a response after creating a new resource is now a 1-liner [DHH]

trunk/actionpack/lib/action_controller/base.rb

@@ -880 +880 @@
-      def render_xml(xml, status = nil) #:nodoc:
-        response.content_type = Mime::XML
-
+.respond_to?(:to_xml) ? xml.to_xml : xml
-      end
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -257 +257 @@
-  def head_with_status_code_first
-    head :forbidden, :x_custom_header => "something"
+  end
+
+  def render_with_location
+    render :xml => "<hello/>", :location => "http://example.com", :status => 201
+  end
+
+  def render_with_to_xml
+    to_xmlable = Class.new do
+      def to_xml
+        "<i-am-xml/>"
+      end
+    end.new
+    
+    render :xml => to_xmlable
-  end
-
@@ -743 +757 @@
-    assert_response :forbidden
-  end
+
+  def test_rendering_with_location_should_set_header
+    get :render_with_location
+    assert_equal "http://example.com", @response.headers["Location"]
+  end
+  
+  def test_rendering_xml_should_call_to_xml_if_possible
+    get :render_with_to_xml
+    assert_equal "<i-am-xml/>", @response.body
+  end
-end

trunk/actionpack/test/controller/render_test.rb

@@ -72 +72 @@
-  def heading
-    head :ok
-  end
-
-  def location
-    render :xml => "<hello/>", :location => "http://example.com", :status => 201
-  end
-
@@ -373 +369 @@
-  end
-
-  def test_rendering_with_location_should_set_header
-    get :location
-    assert_equal "http://example.com", @response.headers["Location"]
-  end
-
-
-  protected