Introduce `render :body` for render raw content

This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail.
author: Prem Sichanugrist <s@sikac.hu> 2014-01-31 15:37:58 -0500
committer: Prem Sichanugrist <s@sikac.hu> 2014-02-18 12:08:36 -0500
commit: 103e18c87d50a53cd0a33b4e03f2c8a8eff19ece (patch)
tree: 07f0d46e80ea3dd978e4a6ca3e533087d76ca7f8 /actionpack/test
parent: 6c496a6d2a21fb8f6f5fb4a97acf1f2de828d1d5 (diff)
download: rails-103e18c87d50a53cd0a33b4e03f2c8a8eff19ece.tar.gz
rails-103e18c87d50a53cd0a33b4e03f2c8a8eff19ece.tar.bz2
rails-103e18c87d50a53cd0a33b4e03f2c8a8eff19ece.zip
2 files changed, 183 insertions, 0 deletions
diff --git a/actionpack/test/controller/new_base/render_body_test.rb b/actionpack/test/controller/new_base/render_body_test.rb
new file mode 100644
index 0000000000..a7e4f87bd9
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_body_test.rb
@@ -0,0 +1,175 @@
+require 'abstract_unit'
+
+module RenderBody
+  class MinimalController < ActionController::Metal
+    include AbstractController::Rendering
+    include ActionController::Rendering
+
+    def index
+      render body: "Hello World!"
+    end
+  end
+
+  class SimpleController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new]
+
+    def index
+      render body: "hello david"
+    end
+  end
+
+  class WithLayoutController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.erb" => "<%= yield %>, I'm here!",
+      "layouts/greetings.erb"   => "<%= yield %>, I wish thee well.",
+      "layouts/ivar.erb"        => "<%= yield %>, <%= @ivar %>"
+    )]
+
+    def index
+      render body: "hello david"
+    end
+
+    def custom_code
+      render body: "hello world", status: 404
+    end
+
+    def with_custom_code_as_string
+      render body: "hello world", status: "404 Not Found"
+    end
+
+    def with_nil
+      render body: nil
+    end
+
+    def with_nil_and_status
+      render body: nil, status: 403
+    end
+
+    def with_false
+      render body: false
+    end
+
+    def with_layout_true
+      render body: "hello world", layout: true
+    end
+
+    def with_layout_false
+      render body: "hello world", layout: false
+    end
+
+    def with_layout_nil
+      render body: "hello world", layout: nil
+    end
+
+    def with_custom_layout
+      render body: "hello world", layout: "greetings"
+    end
+
+    def with_ivar_in_layout
+      @ivar = "hello world"
+      render body: "hello world", layout: "ivar"
+    end
+  end
+
+  class RenderBodyTest < Rack::TestCase
+    test "rendering body from a minimal controller" do
+      get "/render_body/minimal/index"
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering body from an action with default options renders the body with the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_body/simple"
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering body from an action with default options renders the body without the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_body/with_layout"
+
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering body, while also providing a custom status code" do
+      get "/render_body/with_layout/custom_code"
+
+      assert_body "hello world"
+      assert_status 404
+    end
+
+    test "rendering body with nil returns an empty body padded for Safari" do
+      get "/render_body/with_layout/with_nil"
+
+      assert_body " "
+      assert_status 200
+    end
+
+    test "Rendering body with nil and custom status code returns an empty body padded for Safari and the status" do
+      get "/render_body/with_layout/with_nil_and_status"
+
+      assert_body " "
+      assert_status 403
+    end
+
+    test "rendering body with false returns the string 'false'" do
+      get "/render_body/with_layout/with_false"
+
+      assert_body "false"
+      assert_status 200
+    end
+
+    test "rendering body with layout: true" do
+      get "/render_body/with_layout/with_layout_true"
+
+      assert_body "hello world, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering body with layout: 'greetings'" do
+      get "/render_body/with_layout/with_custom_layout"
+
+      assert_body "hello world, I wish thee well."
+      assert_status 200
+    end
+
+    test "rendering body with layout: false" do
+      get "/render_body/with_layout/with_layout_false"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering body with layout: nil" do
+      get "/render_body/with_layout/with_layout_nil"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering from minimal controller returns response with no content type" do
+      get "/render_body/minimal/index"
+
+      assert_header_no_content_type
+    end
+
+    test "rendering from normal controller returns response with no content type" do
+      get "/render_body/simple/index"
+
+      assert_header_no_content_type
+    end
+
+    def assert_header_no_content_type
+      assert_not response.headers.has_key?("Content-Type"),
+        %(Expect response not to have Content-Type header, got "#{response.headers["Content-Type"]}")
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 959a3bc5cd..26b77dfaf7 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -235,6 +235,14 @@ class ResponseTest < ActiveSupport::TestCase
       assert_equal @response.body, body.each.to_a.join
     end
   end
+
+  test "does not add default content-type if Content-Type is none" do
+    resp = ActionDispatch::Response.new.tap { |response|
+      response.content_type = 'none'
+    }
+
+    assert_not resp.headers.has_key?('Content-Type')
+  end
 end
 
 class ResponseIntegrationTest < ActionDispatch::IntegrationTest
author	Prem Sichanugrist <s@sikac.hu>	2014-01-31 15:37:58 -0500
committer	Prem Sichanugrist <s@sikac.hu>	2014-02-18 12:08:36 -0500
commit	103e18c87d50a53cd0a33b4e03f2c8a8eff19ece (patch)
tree	07f0d46e80ea3dd978e4a6ca3e533087d76ca7f8 /actionpack/test
parent	6c496a6d2a21fb8f6f5fb4a97acf1f2de828d1d5 (diff)
download	rails-103e18c87d50a53cd0a33b4e03f2c8a8eff19ece.tar.gz rails-103e18c87d50a53cd0a33b4e03f2c8a8eff19ece.tar.bz2 rails-103e18c87d50a53cd0a33b4e03f2c8a8eff19ece.zip