let Rack::BodyProxy raise an IOError (like IO and StringIO do) when c…

…alling #close twice. Related to rack#191.
unders · Jun 14, 2011 · c02443d · c02443d
1 parent 9f803f2
commit c02443d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/lib/rack/body_proxy.rb b/lib/rack/body_proxy.rb
@@ -9,13 +9,11 @@ def respond_to?(*args)
     end
 
     def close
-      return if closed?
-      begin
-        @body.close if @body.respond_to? :close
-      ensure
-        @block.call
-        @closed = true
-      end
+      raise IOError, "closed stream" if @closed
+      @body.close if @body.respond_to? :close
+    ensure
+      @block.call
+      @closed = true
     end
 
     def closed?

diff --git a/test/spec_body_proxy.rb b/test/spec_body_proxy.rb
@@ -1,9 +1,9 @@
 describe Rack::BodyProxy do
   should 'not close more than one time' do
-    count = 0
-    proxy = Rack::BodyProxy.new([]) { count += 1 }
+    proxy = Rack::BodyProxy.new([]) { }
     proxy.close
-    proxy.close
-    count.should == 1
+    lambda {
+      proxy.close
+    }.should.raise(IOError)
   end
 end