2 files changed, 54 insertions, 26 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index bea6b88f91..21224b9c3b 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -1,8 +1,38 @@
 module ActionController
-  module Rendering
+  # Basic rendering implements the most minimal rendering layer.
+  # It only supports rendering :text and :nothing. Passing any other option will
+  # result in `UnsupportedOperationError` exception. For more functionality like
+  # different formats, layouts etc. you should use `ActionView` gem.
+  module BasicRendering
     extend ActiveSupport::Concern
 
-    include AbstractController::Rendering
+    # Render text or nothing (empty string) to response_body
+    # :api: public
+    def render(*args, &block)
+      super(*args, &block)
+      opts = args.first
+      if opts.has_key?(:text) && opts[:text].present?
+        self.response_body = opts[:text]
+      elsif opts.has_key?(:nothing) && opts[:nothing]
+        self.response_body = " "
+      else
+        raise UnsupportedOperationError
+      end
+    end
+
+    def rendered_format
+      Mime::TEXT
+    end
+
+    class UnsupportedOperationError < StandardError
+      def initialize
+        super "Unsupported render operation. BasicRendering supports only :text and :nothing options. For more, you need to include ActionView."
+      end
+    end
+  end
+
+  module Rendering
+    extend ActiveSupport::Concern
 
     # Before processing, set the request formats in current controller formats.
     def process_action(*) #:nodoc:
@@ -12,17 +42,17 @@ module ActionController
 
     # Check for double render errors and set the content_type after rendering.
     def render(*args) #:nodoc:
-      raise ::AbstractController::DoubleRenderError if response_body
+      raise ::AbstractController::DoubleRenderError if self.response_body
       super
-      self.content_type ||= Mime[lookup_context.rendered_format].to_s
-      response_body
+      self.content_type ||= rendered_format.to_s
+      self.response_body
     end
 
     # Overwrite render_to_string because body can now be set to a rack body.
     def render_to_string(*)
       if self.response_body = super
         string = ""
-        response_body.each { |r| string << r }
+        self.response_body.each { |r| string << r }
         string
       end
     ensure
diff --git a/actionpack/lib/action_controller/metal/streaming.rb b/actionpack/lib/action_controller/metal/streaming.rb
index 73e9b5660d..62d5931b45 100644
--- a/actionpack/lib/action_controller/metal/streaming.rb
+++ b/actionpack/lib/action_controller/metal/streaming.rb
@@ -193,31 +193,29 @@ module ActionController #:nodoc:
   module Streaming
     extend ActiveSupport::Concern
 
-    include AbstractController::Rendering
-
     protected
 
-    # Set proper cache control and transfer encoding when streaming
-    def _process_options(options) #:nodoc:
-      super
-      if options[:stream]
-        if env["HTTP_VERSION"] == "HTTP/1.0"
-          options.delete(:stream)
-        else
-          headers["Cache-Control"] ||= "no-cache"
-          headers["Transfer-Encoding"] = "chunked"
-          headers.delete("Content-Length")
+      # Set proper cache control and transfer encoding when streaming
+      def _process_options(options) #:nodoc:
+        super
+        if options[:stream]
+          if env["HTTP_VERSION"] == "HTTP/1.0"
+            options.delete(:stream)
+          else
+            headers["Cache-Control"] ||= "no-cache"
+            headers["Transfer-Encoding"] = "chunked"
+            headers.delete("Content-Length")
+          end
         end
       end
-    end
 
-    # Call render_body if we are streaming instead of usual +render+.
-    def _render_template(options) #:nodoc:
-      if options.delete(:stream)
-        Rack::Chunked::Body.new view_renderer.render_body(view_context, options)
-      else
-        super
+      # Call render_body if we are streaming instead of usual +render+.
+      def _render_template(options) #:nodoc:
+        if options.delete(:stream)
+          Rack::Chunked::Body.new view_renderer.render_body(view_context, options)
+        else
+          super
+        end
       end
-    end
   end
 end