aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/body_proxy.rb28
-rw-r--r--actionpack/lib/action_dispatch/middleware/reloader.rb17
2 files changed, 31 insertions, 14 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/body_proxy.rb b/actionpack/lib/action_dispatch/middleware/body_proxy.rb
new file mode 100644
index 0000000000..867afe3b48
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/body_proxy.rb
@@ -0,0 +1,28 @@
+# Keep this file meanwhile https://github.com/rack/rack/pull/313 is not released
+module ActionDispatch
+ class BodyProxy
+ def initialize(body, &block)
+ @body, @block, @closed = body, block, false
+ end
+
+ def respond_to?(*args)
+ super or @body.respond_to?(*args)
+ end
+
+ def close
+ return if @closed
+ @closed = true
+ @body.close if @body.respond_to? :close
+ ensure
+ @block.call
+ end
+
+ def closed?
+ @closed
+ end
+
+ def method_missing(*args, &block)
+ @body.__send__(*args, &block)
+ end
+ end
+end
diff --git a/actionpack/lib/action_dispatch/middleware/reloader.rb b/actionpack/lib/action_dispatch/middleware/reloader.rb
index 4f48f1c974..7a5aff214d 100644
--- a/actionpack/lib/action_dispatch/middleware/reloader.rb
+++ b/actionpack/lib/action_dispatch/middleware/reloader.rb
@@ -1,3 +1,5 @@
+require 'action_dispatch/middleware/body_proxy'
+
module ActionDispatch
# ActionDispatch::Reloader provides prepare and cleanup callbacks,
# intended to assist with code reloading during development.
@@ -61,7 +63,7 @@ module ActionDispatch
@validated = @condition.call
prepare!
response = @app.call(env)
- response[2].extend(module_hook)
+ response[2] = ActionDispatch::BodyProxy.new(response[2]) { cleanup! }
response
rescue Exception
cleanup!
@@ -83,18 +85,5 @@ module ActionDispatch
def validated? #:nodoc:
@validated
end
-
- def module_hook #:nodoc:
- middleware = self
- Module.new do
- define_method :close do
- begin
- super() if defined?(super)
- ensure
- middleware.cleanup!
- end
- end
- end
- end
end
end