lib/rack/lock.rb in rack-1.3.0 vs lib/rack/lock.rb in rack-1.3.1

@@ -1,39 +1,20 @@
 require 'thread'
+require 'rack/body_proxy'
 
 module Rack
   class Lock
-    class Proxy < Struct.new(:target, :mutex) # :nodoc:
-      def each
-        target.each { |x| yield x }
-      end
-
-      def close
-        target.close if target.respond_to?(:close)
-      ensure
-        mutex.unlock
-      end
-
-      def to_path
-        target.to_path
-      end
-
-      def respond_to?(sym)
-        sym.to_sym == :close || target.respond_to?(sym)
-      end
-    end
-
     FLAG = 'rack.multithread'.freeze
 
     def initialize(app, mutex = Mutex.new)
       @app, @mutex = app, mutex
     end
 
     def call(env)
       old, env[FLAG] = env[FLAG], false
       @mutex.lock
       response = @app.call(env)
-      response[2] = Proxy.new(response[2], @mutex)
+      response[2] = BodyProxy.new(response[2]) { @mutex.unlock }
       response
     rescue Exception
       @mutex.unlock
       raise
     ensure