Merge pull request #14062 from sikachu/ps-render-format

Introduce `:plain`, `:html`, and `:body` render options.

4 files changed, 54 insertions, 12 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index f24b03ad16..349bbf4ee7 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -23,7 +23,7 @@ module AbstractController
     def render(*args, &block)
       options = _normalize_render(*args, &block)
       self.response_body = render_to_body(options)
-      _process_format(rendered_format) if rendered_format
+      _process_format(rendered_format, options) if rendered_format
       self.response_body
     end
 
@@ -98,7 +98,7 @@ module AbstractController
 
     # Process the rendered format.
     # :api: private
-    def _process_format(format)
+    def _process_format(format, options = {})
     end
 
     # Normalize args and options.
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index bdf6e88699..e1bee9e60c 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -5,8 +5,8 @@ module ActionController
   module RackDelegation
     extend ActiveSupport::Concern
 
-    delegate :headers, :status=, :location=, :content_type=,
-             :status, :location, :content_type, :to => "@_response"
+    delegate :headers, :status=, :location=, :content_type=, :no_content_type=,
+             :status, :location, :content_type, :no_content_type, :to => "@_response"
 
     def dispatch(action, request)
       set_response!(request)
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 5c48b4ab98..3c4ef596c7 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -2,6 +2,8 @@ module ActionController
   module Rendering
     extend ActiveSupport::Concern
 
+    RENDER_FORMATS_IN_PRIORITY = [:body, :text, :plain, :html]
+
     # Before processing, set the request formats in current controller formats.
     def process_action(*) #:nodoc:
       self.formats = request.formats.map(&:ref).compact
@@ -27,14 +29,29 @@ module ActionController
     end
 
     def render_to_body(options = {})
-      super || options[:text].presence || ' '
+      super || _render_in_priorities(options) || ' '
     end
 
     private
 
-    def _process_format(format)
+    def _render_in_priorities(options)
+      RENDER_FORMATS_IN_PRIORITY.each do |format|
+        return options[format] if options.key?(format)
+      end
+
+      nil
+    end
+
+    def _process_format(format, options = {})
       super
-      self.content_type ||= format.to_s
+
+      if options[:body]
+        self.headers.delete "Content-Type"
+      elsif options[:plain]
+        self.content_type = Mime::TEXT
+      else
+        self.content_type ||= format.to_s
+      end
     end
 
     # Normalize arguments by catching blocks and setting them on :update.
@@ -46,12 +63,14 @@ module ActionController
 
     # Normalize both text and status options.
     def _normalize_options(options) #:nodoc:
-      if options.key?(:text) && options[:text].respond_to?(:to_text)
-        options[:text] = options[:text].to_text
+      _normalize_text(options)
+
+      if options[:html]
+        options[:html] = ERB::Util.html_escape(options[:html])
       end
 
-      if options.delete(:nothing) || (options.key?(:text) && options[:text].nil?)
-        options[:text] = " "
+      if options.delete(:nothing) || _any_render_format_is_nil?(options)
+        options[:body] = " "
       end
 
       if options[:status]
@@ -61,6 +80,18 @@ module ActionController
       super
     end
 
+    def _normalize_text(options)
+      RENDER_FORMATS_IN_PRIORITY.each do |format|
+        if options.key?(format) && options[format].respond_to?(:to_text)
+          options[format] = options[format].to_text
+        end
+      end
+    end
+
+    def _any_render_format_is_nil?(options)
+      RENDER_FORMATS_IN_PRIORITY.any? { |format| options.key?(format) && options[format].nil? }
+    end
+
     # Process controller specific options, as status, content-type and location.
     def _process_options(options) #:nodoc:
       status, content_type, location = options.values_at(:status, :content_type, :location)
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 2c6bcf7b7b..f14ca1ea44 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -63,6 +63,8 @@ module ActionDispatch # :nodoc:
     # content you're giving them, so we need to send that along.
     attr_accessor :charset
 
+    attr_accessor :no_content_type # :nodoc:
+
     CONTENT_TYPE = "Content-Type".freeze
     SET_COOKIE   = "Set-Cookie".freeze
     LOCATION     = "Location".freeze
@@ -303,8 +305,17 @@ module ActionDispatch # :nodoc:
       !@sending_file && @charset != false
     end
 
+    def remove_content_type!
+      headers.delete CONTENT_TYPE
+    end
+
     def rack_response(status, header)
-      assign_default_content_type_and_charset!(header)
+      if no_content_type
+        remove_content_type!
+      else
+        assign_default_content_type_and_charset!(header)
+      end
+
       handle_conditional_get!
 
       header[SET_COOKIE] = header[SET_COOKIE].join("\n") if header[SET_COOKIE].respond_to?(:join)