falcon 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3429e33911513a17a66a9dad747942f377f57dd4f2351ec59cb3e17047407ca
-  data.tar.gz: 7b6339640be53ec16971524684e12e1e1a77a9bd2f1ebacfbc1abeb5eb3754be
+  metadata.gz: bfbbbd80fcbe0e419ff2d26f22004bba0fb8bb6674b508b253ebdc44729abebe
+  data.tar.gz: 0dc2c1e25e1e1a5bf19d843ef3b803ebacc855417cdd460bd3e971d8e3ed6e0a
 SHA512:
-  metadata.gz: 1c1780fd09c7840daafb3b4f4472c622a87f077182bc334ca09406a38bd3d7616bcd1bc78be85debb5fdc48d368460d8d79fd893b99e3e45659f5cce975277f2
-  data.tar.gz: 80fa7d8d306a2c4cb4e967051e1e8353d5ac4e41ab41a1cf3ba43fb842713f74a32e8d64e2b201d30350c7f5b5bd30c77a5c60fad4c04e83321b12687806807b
+  metadata.gz: 4bc9ea031a37477c780688caa3ed0ad19625fd91c74f7bc148b7fd83511e4ee646edf4dc85a64521a347e93742b3dbb317781fa4abd26f4074148093d662d335
+  data.tar.gz: 9da626f01d30cfaa3a30174b8fc73eeba209d632cafe708c2d56b6cec7840ea818a6cb1883c3435508ba7a6f5256a1d977c0b255a855081dc9d67c618ef1b12d

data/falcon.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 
 	spec.add_dependency("async-io", "~> 1.6")
-	spec.add_dependency("async-http", "~> 0.11")
+	spec.add_dependency("async-http", "~> 0.15")
 	spec.add_dependency("async-container", "~> 0.3")
 	
 	spec.add_dependency("rack", ">= 1.0")

data/lib/falcon/input.rb

@@ -26,19 +26,15 @@ module Falcon
 			@body = body
 			@chunks = []
 			
-			@buffer = nil
-			@closed = false
+			@index = 0
+			@buffer = Async::IO::BinaryString.new
+			@finished = false
 		end
 		
 		def each(&block)
-			while @index < @chunks.count
-				chunk = @chunks[@index]
-				@index += 1
-				yield chunk
-			end
+			return to_enum unless block_given?
 			
-			@body.each do |chunk|
-				@chunks << chunk
+			while chunk = read_next
 				yield chunk
 			end
 			
@@ -47,30 +43,31 @@ module Falcon
 		
 		def rewind
 			@index = 0
-			@closed = false
+			@finished = false
+			@buffer.clear
 		end
 		
 		def read(length = nil, buffer = nil)
-			unless @buffer
-				self.each do |chunk|
-					@buffer = chunk
-					break
-				end
-			end
-			
-			if @buffer
-				if length and @buffer.bytesize < length
-					return @buffer.slice!(0, length)
-				else
-					buffer = @buffer
-					@buffer = nil
-					return buffer
+			if length
+				fill_buffer(length) if @buffer.bytesize <= length
+				
+				return @buffer.slice!(0, length)
+			else
+				buffer ||= Async::IO::BinaryString.new
+				
+				buffer << @buffer
+				@buffer.clear
+				
+				while chunk = read_next
+					buffer << chunk
 				end
+				
+				return buffer
 			end
 		end
 		
 		def eof?
-			@closed and @buffer.nil?
+			@finished and @buffer.empty?
 		end
 		
 		def gets
@@ -78,7 +75,35 @@ module Falcon
 		end
 		
 		def close
-			@body.close
+			@body.finish
+		end
+		
+		private
+		
+		def read_next
+			return nil if @finished
+			
+			chunk = nil
+			
+			if @index < @chunks.count
+				chunk = @chunks[@index]
+				@index += 1
+			else
+				if chunk = @body.read
+					@chunks << chunk
+					@index += 1
+				end
+			end
+			
+			@finished = true if chunk.nil?
+			
+			return chunk
+		end
+		
+		def fill_buffer(length)
+			while @buffer.bytesize < length and chunk = read_next
+				@buffer << chunk
+			end
 		end
 	end
 end

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.10.0"
+	VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.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-io
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement