async-http 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b07a59ffce216d83fd5e3f811a083fb0525b61d6678fc4607b9a2092c257ae4e
-  data.tar.gz: b619d0fabeca58dbbecd30d40731c6d5299d4021776442c8f58b3fd8ed0f7cda
+  metadata.gz: 87ea5fdd1668b7c17d499ee05a4d32a295560594c4d6a503c21efd9a3ea82a10
+  data.tar.gz: a1ad20020eecb10d1d295ba881c02c3cbefe82cb3a2e1d6453ce1cc082823535
 SHA512:
-  metadata.gz: 1df280a96aef2b8920d99fe8a60a4a4d7cbdd5067e9b89bec26575ef9959cdcd16ce7782a89f4b2f338726e6777da2c789e0e7337acfe6f58bc751d4ab55cb7b
-  data.tar.gz: cb7c45c8fc13828c789d110c41b2814298d98724802b5f63c2bf18053f10abd6ee7a96bf114cf4fe664e2506270cb44e71ee201dcc54082f108afa1df8754853
+  metadata.gz: 20966b6b196f4429295f9c765734ac52aa90709960fba46955e3769bcb360d820082f6d2555e1d5aa8b821f2f49630e47c592576c80fbc66faccf286915faef9
+  data.tar.gz: 2ed5fee97702faaf317adfca97c2bc5af6c2e1d21b17856fd8e66109cb7e831ba7f960ea809496038eacff1474b5d2694f7da579b87633dc5260f3d4dca3376e

data/lib/async/http/body.rb

@@ -26,24 +26,34 @@ module Async
 			def initialize
 				super
 				
-				@closed = false
+				@finished = false
 			end
 			
-			def closed?
-				@closed
+			def finished?
+				@finished
 			end
 			
 			def each
-				return if @closed
+				return if @finished
 				
 				while chunk = self.dequeue
 					yield chunk
 				end
 				
-				@closed = true
+				@finished = true
 			end
 			
 			def read
+				return if @finished
+				
+				unless chunk = self.dequeue
+					@finished = true
+				end
+				
+				return chunk
+			end
+			
+			def join
 				buffer = Async::IO::BinaryString.new
 				
 				self.each do |chunk|
@@ -59,7 +69,7 @@ module Async
 				self.enqueue(chunk)
 			end
 			
-			def close
+			def finish
 				self.enqueue(nil)
 			end
 		end
@@ -67,6 +77,7 @@ module Async
 		class BufferedBody
 			def initialize(body)
 				@chunks = []
+				@index = 0
 				
 				body.each do |chunk|
 					@chunks << chunk
@@ -74,26 +85,45 @@ module Async
 			end
 			
 			def each(&block)
-				@chunks.each(&block)
+				while @index < @chunks.count
+					yield @chunks[@index]
+					@index += 1
+				end
 			end
 			
 			def read
-				@buffer ||= @chunks.join
+				if chunk = @chunks[@index]
+					@index += 1
+				end
+				
+				return chunk
 			end
 			
-			alias join read
+			def join
+				buffer = Async::IO::BinaryString.new
+				
+				self.each do |chunk|
+					buffer << chunk
+				end
+				
+				return buffer
+			end
+			
+			def rewind
+				@index = 0
+			end
 			
-			def closed?
+			def finished?
 				true
 			end
 			
 			module Reader
 				def read
-					self.body ? self.body.read : nil
+					self.body ? self.body.join : nil
 				end
 				
-				def close
-					return if self.body.nil? or self.body.closed?
+				def finish
+					return if self.body.nil? or self.body.finished?
 					
 					unless self.body.is_a? BufferedBody
 						self.body = BufferedBody.new(self.body)
@@ -102,30 +132,84 @@ module Async
 			end
 		end
 		
-		class FixedBody
-			CHUNK_LENGTH = 1024*1024
+		class ChunkedBody
+			def initialize(protocol)
+				@protocol = protocol
+				@finished = false
+			end
+			
+			def finished?
+				@finished
+			end
 			
+			def read
+				return nil if @finished
+				
+				size = @protocol.read_line.to_i(16)
+				
+				if size == 0
+					@protocol.read_line
+					
+					@finished = true
+					
+					return nil
+				end
+				
+				chunk = @protocol.stream.read(size)
+				@protocol.read_line # Consume the trailing CRLF
+				
+				return chunk
+			end
+			
+			def each
+				while chunk = self.read
+					yield chunk
+				end
+			end
+			
+			def join
+				buffer = Async::IO::BinaryString.new
+				
+				self.each do |chunk|
+					buffer << chunk
+				end
+				
+				return buffer
+			end
+			
+			def finish
+				self.each {}
+			end
+		end
+		
+		class FixedBody
 			def initialize(length, stream)
 				@length = length
 				@remaining = length
 				@stream = stream
 			end
 			
-			def closed?
+			def finished?
 				@remaining == 0
 			end
 			
 			def each
-				while @remaining > 0
-					if chunk = @stream.read(CHUNK_LENGTH)
+				while chunk = self.read
+					yield chunk
+				end
+			end
+			
+			def read
+				if @remaining > 0
+					if chunk = @stream.read(@remaining)
 						@remaining -= chunk.bytesize
 						
-						yield chunk
+						return chunk
 					end
 				end
 			end
 			
-			def read
+			def join
 				buffer = @stream.read(@remaining)
 				
 				@remaining = 0
@@ -135,7 +219,7 @@ module Async
 			
 			alias join read
 			
-			def close
+			def finish
 				read
 			end
 		end

data/lib/async/http/client.rb

@@ -70,7 +70,7 @@ module Async
 						yield response if block_given?
 					ensure
 						# This forces the stream to complete reading.
-						response.close
+						response.finish
 					end
 					
 					return response

data/lib/async/http/protocol/http11.rb

@@ -72,7 +72,7 @@ module Async
 						
 						write_response(request.version, status, headers, body)
 						
-						request.close
+						request.finish
 						
 						unless keep_alive?(request.headers) and keep_alive?(headers)
 							@keep_alive = false
@@ -180,52 +180,6 @@ module Async
 					end
 				end
 				
-				class ChunkedBody
-					def initialize(protocol)
-						@protocol = protocol
-						@closed = false
-					end
-					
-					def closed?
-						@closed
-					end
-					
-					def each
-						return if @closed
-						
-						while true
-							size = @protocol.read_line.to_i(16)
-							
-							if size == 0
-								@protocol.read_line
-								
-								@closed = true
-								
-								return
-							end
-							
-							chunk = @protocol.stream.read(size)
-							@protocol.read_line # Consume the trailing CRLF
-							
-							yield chunk
-						end
-					end
-					
-					def read
-						buffer = Async::IO::BinaryString.new
-						
-						self.each do |chunk|
-							buffer << chunk
-						end
-						
-						return buffer
-					end
-					
-					def close
-						self.each {}
-					end
-				end
-				
 				def read_body(headers)
 					if headers['transfer-encoding'] == 'chunked'
 						return ChunkedBody.new(self)

data/lib/async/http/protocol/http2.rb

@@ -127,7 +127,7 @@ module Async
 						stream.on(:half_close) do
 							response = yield request
 							
-							request.body.close
+							request.body.finish
 							
 							# send response
 							headers = {STATUS => response[0].to_s}
@@ -202,8 +202,8 @@ module Async
 					
 					stream.on(:close) do
 						Async.logger.debug(self) {"Stream closed, sending signal."}
-						# TODO should we prefer response.close?
-						response.body.close
+						# TODO should we prefer `response.finish`?
+						response.body.finish
 					end
 					
 					@stream.flush

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.14.0"
+		VERSION = "0.15.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async