falcon 0.17.1 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2e7b8b6b71da71a61d98c6a832b98baa2d3e4748089f33f0eab99eca235052
-  data.tar.gz: 3e3da30dd2860e50be089be4e439e77fcb8d9e0e6c124e03ecee4876d3f72043
+  metadata.gz: bffdd8ea496ec7bdcac74b8c2c540f4d6da008d35d3d8f598764a2d17974b842
+  data.tar.gz: 4f993d6d77cebb76ca53141f2e92febba54d3db3eeddaeda130d5bce04d9f48c
 SHA512:
-  metadata.gz: 1ba139f77f0885560d055e364e35e443c3677f253fa49baf21450e9dedced20d237efdabf4da67e96311bfdac14097804e1d72ae67fe9c86a5cbb8f28aafce5a
-  data.tar.gz: 126664e2cbf082fac77f4eaf465710eb31c6c88a0a9b62abfea73aa13f469d24b7e1e839ab219ec97036720d657c7fd8b6521cd4647e8a0b02eb1ec3f74ecd65
+  metadata.gz: 8c44c95675ce2e672a97048ca99070b83d773b7a840699f474b72744fe80f17fd8ba8a8d2061a0ab2659dc7622188b5238395b34871db2f17b424580ce0aa7e1
+  data.tar.gz: 752f925c54ff738d48cbc2cd81104bd2291d931a5cfe5f1b3893c18e98a599d4bf32f5b0f8e9a5b6db5f9a456357cd1ad88053d5169acc470fff7a1313381607

data/falcon.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency('samovar', "~> 1.3")
 	
-	spec.add_development_dependency "async-rspec", "~> 1.2"
-	spec.add_development_dependency "async-websocket"
+	spec.add_development_dependency "async-rspec", "~> 1.7"
+	spec.add_development_dependency "async-websocket", "~> 0.6.0"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.6"

data/lib/falcon/adapters/input.rb

@@ -28,8 +28,8 @@ module Falcon
 			def initialize(body)
 				@body = body
 				
-				# The current buffer, which is extended by calling `#fill_buffer`.
-				@buffer = Async::IO::BinaryString.new
+				# Will hold remaining data in `#read`.
+				@buffer = nil
 				@finished = @body.nil?
 			end
 			
@@ -49,7 +49,7 @@ module Falcon
 				if @body
 					# If the body is not rewindable, this will fail.
 					@body.rewind
-					@buffer.clear
+					@buffer = nil
 					@finished = false
 				end
 			end
@@ -67,49 +67,41 @@ module Falcon
 			# @param buffer [String] the buffer which will receive the data
 			# @return a buffer containing the data
 			def read(length = nil, buffer = nil)
-				if length
-					fill_buffer(length) if @buffer.bytesize <= length
-					
-					chunk = @buffer.slice!(0, length)
+				buffer ||= Async::IO::BinaryString.new
+				buffer.clear
+				
+				until buffer.bytesize == length
+					@buffer = read_next if @buffer.nil?
+					break if @buffer.nil?
 					
-					if buffer
-						# TODO https://bugs.ruby-lang.org/issues/14745
-						buffer.replace(chunk)
-					else
-						buffer = chunk
-					end
+					remaining_length = length - buffer.bytesize if length
 					
-					if buffer.empty? and length > 0
-						return nil
+					if remaining_length && remaining_length < @buffer.bytesize
+						buffer << @buffer.byteslice(0, remaining_length)
+						@buffer = @buffer.byteslice(remaining_length..-1)
 					else
-						return buffer
-					end
-				else
-					buffer ||= Async::IO::BinaryString.new
-					
-					buffer.replace(@buffer)
-					@buffer.clear
-					
-					while chunk = read_next
-						buffer << chunk
+						buffer << @buffer
+						@buffer = nil
 					end
-					
-					return buffer
 				end
+				
+				return nil if buffer.empty? && length && length > 0
+				
+				return buffer
 			end
 			
 			def eof?
-				@finished and @buffer.empty?
+				@finished and @buffer.nil?
 			end
 			
 			# gets must be called without arguments and return a string, or nil on EOF.
 			# @return [String, nil] The next chunk from the body.
 			def gets
-				if @buffer.empty?
+				if @buffer.nil?
 					return read_next
 				else
-					buffer = @buffer.dup
-					@buffer.clear
+					buffer = @buffer
+					@buffer = nil
 					return buffer
 				end
 			end
@@ -131,12 +123,6 @@ module Falcon
 					return nil
 				end
 			end
-			
-			def fill_buffer(length)
-				while @buffer.bytesize < length and chunk = read_next
-					@buffer << chunk
-				end
-			end
 		end
 	end
 end

data/lib/falcon/adapters/rack.rb

@@ -87,8 +87,13 @@ module Falcon
 					env['rack.hijack?'] = true
 					
 					env['rack.hijack'] = lambda do
-						@logger.debug(request) {"Hijacking request..."}
-						env['rack.hijack_io'] = request.hijack
+						wrapper = request.hijack
+						
+						# We dup this as it might be taken out of the normal control flow, and the io will be closed shortly after returning from this method.
+						io = wrapper.io.dup
+						wrapper.close
+						
+						env['rack.hijack_io'] = io
 					end
 				else
 					env['rack.hijack?'] = false
@@ -105,9 +110,9 @@ module Falcon
 				# 	return nil
 				# end
 				
-				if env['rack.hijack_io']
-					return nil
-				end
+				# if env['rack.hijack_io']
+				# 	return nil
+				# end
 				
 				@logger.debug(request) {"Rack response: #{status} #{headers.inspect} #{body.class}"}
 				return Response.new(status, headers, body)

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement