Fix streaming body close.

Author: samuel-williams-shopify

lib/protocol/rack/body/enumerable.rb

@@ -69,13 +69,15 @@ def ready?
 				# 
 				# @parameter error [Exception] Optional error that occurred during processing.
 				def close(error = nil)
-					if @body and @body.respond_to?(:close)
-						@body.close
-					end
-					
-					@body = nil
 					@chunks = nil
 
+					if body = @body
+						@body = nil
+						if body.respond_to?(:close)
+							body.close
+						end
+					end
+					
 					super
 				end
 

lib/protocol/rack/body/streaming.rb

@@ -8,7 +8,24 @@
 module Protocol
 	module Rack
 		module Body
-			Streaming = ::Protocol::HTTP::Body::Streamable::ResponseBody
+			class Streaming < ::Protocol::HTTP::Body::Streamable::ResponseBody
+				def initialize(body, input = nil)
+					@body = body
+					
+					super
+				end
+				
+				def close(error = nil)
+					if body = @body
+						@body = nil
+						if body.respond_to?(:close)
+							body.close
+						end
+					end
+					
+					super
+				end
+			end
 		end
 	end
 end

releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## Unreleased
+
+  - Fix missing `body#close` for streaming bodies.
+
 ## v0.21.0
 
   - For the purpose of constructing the rack request environment, trailers are ignored.

test/protocol/rack/body/streaming.rb

@@ -50,4 +50,29 @@
 			expect(body.read).to be == "Hello"
 		end
 	end
+	
+	with "#close" do
+		it "closes the wrapped body if it responds to close" do
+			close_called = false
+			wrapped_body = Object.new
+			wrapped_body.define_singleton_method(:close) do
+				close_called = true
+			end
+			wrapped_body.define_singleton_method(:call) do |stream|
+				stream.write("Hello")
+			end
+			
+			body = subject.new(wrapped_body)
+			body.close
+			
+			expect(close_called).to be == true
+		end
+		
+		it "does not fail if wrapped body does not respond to close" do
+			wrapped_body = proc { |stream| stream.write("Hello") }
+			
+			body = subject.new(wrapped_body)
+			body.close
+		end
+	end
 end