falcon 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2de4bddd24124f6859b6fe9abf37624537b3d9175cab2d3925a897cab1ca30
-  data.tar.gz: ca3ca0154ec2abf520c3b2a6c0f231bc66833689236a9144ce7832e390b9a894
+  metadata.gz: 94bed6aa04bd0bb1f431f516e6d79e86598ab611afc62ebedaafe56eea99df09
+  data.tar.gz: c1043b1e89f86f8acd4f3731f23ccd2685866bc36eaf80b38debd1a763f9cf42
 SHA512:
-  metadata.gz: aee2014818ce576facb26f073df66c15cfc866f4aa9993185d98f0ebc774547fcb043a9de72f36cbaa8c977a3cdcd6af998b4860a9ad63d3cd41676ed8a5e5aa
-  data.tar.gz: 15a9f6d3e42d5333f533b3e005d0bf6c6fcbe533814221f8ee02b47e2152b58e91da948d607ad63d45225acc76736824baf743029b44435fe315dd872c882e07
+  metadata.gz: '02499bd4364da608ed79a7405b527566a68c3337e8c5df94fcd8852f32a07d2478333bd276308fb2efe62203152474800ef4d809ae45d943628537d09b5acda3'
+  data.tar.gz: 6e65a21e8bf20a5b3c0b3dfbe58335259ea6bf9754b7fb1643fd79650df149b848dea4c2727f0c3a32001bfcfe955b1f7b6dbfab610a9f12895a718d1381e610

data/falcon.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency("http-protocol", "~> 0.10.0")
+	spec.add_dependency("http-protocol", "~> 0.11.0")
 	
 	spec.add_dependency("async", "~> 1.13")
 	spec.add_dependency("async-io", "~> 1.18")

data/lib/falcon/adapters/output.rb

@@ -31,9 +31,9 @@ module Falcon
 			# Wraps an array into a buffered body.
 			def self.wrap(status, headers, body)
 				# In no circumstance do we want this header propagating out:
-				if content_length = headers.delete(CONTENT_LENGTH)
+				if length = headers.delete(CONTENT_LENGTH)
 					# We don't really trust the user to provide the right length to the transport.
-					content_length = Integer(content_length)
+					length = Integer(length)
 				end
 				
 				if body.is_a?(Async::HTTP::Body::Readable)
@@ -41,8 +41,11 @@ module Falcon
 				elsif status == 200 and body.respond_to?(:to_path)
 					# Don't mangle partial responsese (206)
 					return Async::HTTP::Body::File.open(body.to_path)
+				elsif body.is_a? Array
+					length ||= body.sum{|chunk| chunk.bytesize}
+					return self.new(headers, body, length)
 				else
-					return self.new(headers, body, content_length)
+					return self.new(headers, body, length)
 				end
 			end
 			
@@ -50,8 +53,7 @@ module Falcon
 				@length = length
 				@body = body
 				
-				# An enumerator over the rack response body:
-				@chunks = body.to_enum(:each)
+				@chunks = nil
 			end
 			
 			# The rack response body.
@@ -67,20 +69,26 @@ module Falcon
 			def close(error = nil)
 				if @body and @body.respond_to?(:close)
 					@body.close
-					@body = nil
 				end
 				
+				@body = nil
 				@chunks = nil
 				
 				super
 			end
 			
+			def each(&block)
+				@body.each(&block)
+			ensure
+				self.close($!)
+			end
+			
 			def read
-				if @chunks
-					return @chunks.next
-				end
+				@chunks ||= @body.to_enum(:each)
+				
+				return @chunks.next
 			rescue StopIteration
-				nil
+				return nil
 			end
 			
 			def inspect

data/lib/falcon/version.rb

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

data/tasks/benchmark.rake

@@ -14,12 +14,17 @@ namespace :benchmark do
 		
 		threads = Etc.nprocessors
 		
+		perf = ["perf", "record", "-F", "max", "-a", "--"]
+		
 		servers = [
-			["puma", "--bind", host.gsub("http", "tcp")],
+			# ["puma", "--bind", host.gsub("http", "tcp")],
 			["puma", "--workers", threads.to_s, "--bind", host.gsub("http", "tcp")],
+			# ["rbspy", "record", "--", "falcon", "serve", "--threaded", "--bind", host, "--config"]
 			["falcon", "serve", "--bind", host, "--config"]
 		]
 		
+		Async.logger.info!
+		
 		endpoint = Async::HTTP::URLEndpoint.parse(host)
 		
 		servers.each do |command|
@@ -42,12 +47,14 @@ namespace :benchmark do
 						
 						socket = endpoint.connect
 						
-						request = Async::HTTP::Request.new("http", "localhost", "GET", "/small")
+						request = Async::HTTP::Request.new("http", "localhost", "GET", "/big")
 						stream = Async::IO::Stream.new(socket)
 						protocol = Async::HTTP::Protocol::HTTP1.client(stream)
 						
 						response = protocol.call(request)
 						
+						Async.logger.info(response, "Headers:", response.headers.to_h) {"Response body size: #{response.read.bytesize}"}
+						
 						response.close
 						
 						socket.close
@@ -59,13 +66,17 @@ namespace :benchmark do
 					
 					end_time = Async::Clock.now
 					
-					$stderr.puts "** Took #{end_time - start_time}s to start #{command.first}."
+					Async.logger.info(command) {"** Took #{end_time - start_time}s to first response."}
 					
 					threads.times do |n|
 						c = (2**n).to_s
 						puts "Running #{command.first} with #{c} concurrent connections..."
 						
-						status = Async::Process.spawn("wrk", "-c", c.to_s, "-t", (n+1).to_s, "-d", "1", "#{host}/big")
+						# Async::Process.spawn("curl", "-v", "#{host}/small")
+						
+						# Async::Process.spawn("ab", "-n", "2000", "#{host}/small")
+						
+						Async::Process.spawn("wrk", "-c", c.to_s, "-t", (n+1).to_s, "-d", "2", "#{host}/big")
 					end
 				ensure
 					server_task.stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-protocol
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.