Fix previous commit by allowing a proc to be given as response_body. This is deprecated and is going to be removed in future releases.

2 files changed, 53 insertions, 29 deletions

diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index 4f4cb96a74..aaed0d750f 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -42,20 +42,6 @@ module ActionDispatch
         attr_reader :cache_control, :etag
         alias :etag? :etag
 
-        def initialize(*)
-          super
-
-          @cache_control = {}
-          @etag = self["ETag"]
-
-          if cache_control = self["Cache-Control"]
-            cache_control.split(/,\s*/).each do |segment|
-              first, last = segment.split("=")
-              @cache_control[first.to_sym] = last || true
-            end
-          end
-        end
-
         def last_modified
           if last = headers['Last-Modified']
             Time.httpdate(last)
@@ -77,6 +63,18 @@ module ActionDispatch
 
       private
 
+        def prepare_cache_control!
+          @cache_control = {}
+          @etag = self["ETag"]
+
+          if cache_control = self["Cache-Control"]
+            cache_control.split(/,\s*/).each do |segment|
+              first, last = segment.split("=")
+              @cache_control[first.to_sym] = last || true
+            end
+          end
+        end
+
         def handle_conditional_get!
           if etag? || last_modified? || !@cache_control.empty?
             set_conditional_cache_control!
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 1f4f3ac0da..3a6b1da4fd 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -56,26 +56,25 @@ module ActionDispatch # :nodoc:
 
     cattr_accessor(:default_charset) { "utf-8" }
 
-    module Setup
-      def initialize(status = 200, header = {}, body = [])
-        self.body, self.header, self.status = body, header, status
+    include Rack::Response::Helpers
+    include ActionDispatch::Http::Cache::Response
 
-        @sending_file = false
-        @blank = false
+    def initialize(status = 200, header = {}, body = [])
+      self.body, self.header, self.status = body, header, status
 
-        if content_type = self["Content-Type"]
-          type, charset = content_type.split(/;\s*charset=/)
-          @content_type = Mime::Type.lookup(type)
-          @charset = charset || "UTF-8"
-        end
+      @sending_file = false
+      @blank = false
 
-        yield self if block_given?
+      if content_type = self["Content-Type"]
+        type, charset = content_type.split(/;\s*charset=/)
+        @content_type = Mime::Type.lookup(type)
+        @charset = charset || "UTF-8"
       end
-    end
 
-    include Rack::Response::Helpers
-    include Setup
-    include ActionDispatch::Http::Cache::Response
+      prepare_cache_control!
+
+      yield self if block_given?
+    end
 
     def status=(status)
       @status = Rack::Utils.status_code(status)
@@ -116,9 +115,32 @@ module ActionDispatch # :nodoc:
 
     EMPTY = " "
 
+    class BodyBuster #:nodoc:
+      def initialize(response)
+        @response = response
+        @body = ""
+      end
+
+      def bust(body)
+        body.call(@response, self)
+        body.close if body.respond_to?(:close)
+        @body
+      end
+
+      def write(string)
+        @body << string.to_s
+      end
+    end
+
     def body=(body)
       @blank = true if body == EMPTY
 
+      if body.respond_to?(:call)
+        ActiveSupport::Deprecation.warn "Setting a Proc or an object that responds to call " \
+          "in response_body is no longer supported", caller
+        body = BodyBuster.new(self).bust(body)
+      end
+
       # Explicitly check for strings. This is *wrong* theoretically
       # but if we don't check this, the performance on string bodies
       # is bad on Ruby 1.8 (because strings responds to each then).
@@ -150,6 +172,10 @@ module ActionDispatch # :nodoc:
       headers['Location'] = url
     end
 
+    def close
+      @body.close if @body.respond_to?(:close)
+    end
+
     def to_a
       assign_default_content_type_and_charset!
       handle_conditional_get!