falcon 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a93b677671ad9a275d8d63ec8caeb6f86bed3bfdad56768e558a20afde5326ed
-  data.tar.gz: 60023f6c2a5ad478e7199ff9c33550fb6e51a8dba6ebe200f513039f40ab0be6
+  metadata.gz: f779301a15b9adf72ca83712fa1128a7ac7df69b4ec190fa5aee25e44ca23c57
+  data.tar.gz: 3a939860b31ae73aa9627e8d62eb1721d4d2621e4d851713788cd5b09fd5d433
 SHA512:
-  metadata.gz: bce2c09729a60ab971401426265b9d64652343a45f322d7990ce2c9d966046f71693ecf34044c857ef627856f94b078848072259a99fdc74fbbfea6eecfd2595
-  data.tar.gz: '0449e4726e6fc098aeb44228c32b21c371fd40a97181bc36a0532cba1833555a6f2475fa0e54ae349251b8a1effba209b3d1747f71bbc2837f2b23bd395257da'
+  metadata.gz: fa3b215cfe77d2f14fa6e6750954246daee7dc8551770a2dd1b726e5151b844f76e6c164c78e07f761191deced2ee7056723b389ce5fbc99d7b49f4878d84ee1
+  data.tar.gz: a4a381b1c2f959ca30d37f20b152654cb4c77c992f3395a579e22a6fe0c03a4b0a7c081ee803991e973b8bc5d98d6ab77afca7eb00f76b5a3262825d332179c3

data/.editorconfig

@@ -3,4 +3,3 @@ root = true
 [*]
 indent_style = tab
 indent_size = 2
-

data/.gitignore

@@ -12,3 +12,4 @@
 
 # rspec failure tracking
 .rspec_status
+.covered.db

data/README.md

@@ -116,7 +116,7 @@ This became the default in Rails 5 so no change is necessary unless you explicit
 
 ### WebSockets
 
-Falcon supports `rack.hijack` for HTTP/1.x connections. You can thus use [async-websocket] in any controller layer to serve WebSocket connections.
+Falcon supports (partial and full) `rack.hijack` for both for HTTP/1 and HTTP/2 connections. You can thus use [async-websocket] in any controller layer to serve WebSocket connections.
 
 [async-websocket]: https://github.com/socketry/async-websocket
 

data/examples/push/client.rb

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
 require 'async'
-require 'async/http/url_endpoint'
+require 'async/http/endpoint'
 require 'async/http/client'
 
 Async do
-	endpoint = Async::HTTP::URLEndpoint.parse("https://localhost:9292")
+	endpoint = Async::HTTP::Endpoint.parse("https://localhost:9292")
 	client = Async::HTTP::Client.new(endpoint, Async::HTTP::Protocol::HTTP2::WithPush)
 	
 	response = client.get("/index.html")

data/falcon.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 		
 	spec.add_dependency "async", "~> 1.13"
 	spec.add_dependency "async-io", "~> 1.22"
-	spec.add_dependency "async-http", "~> 0.40.0"
+	spec.add_dependency "async-http", "~> 0.41.0"
 	spec.add_dependency "async-container", "~> 0.10.0"
 	
 	spec.add_dependency "rack", ">= 1.0"
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_development_dependency "trenni"
 	spec.add_development_dependency "async-rspec", "~> 1.7"
-	spec.add_development_dependency "async-websocket", "~> 0.9.0"
+	spec.add_development_dependency "async-websocket", "~> 0.11.0"
 	spec.add_development_dependency "async-process", "~> 1.1"
 	
 	spec.add_development_dependency "covered", "~> 0.10"

data/lib/falcon/adapters/early_hints.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/http/middleware'
+require 'protocol/http/middleware'
 
 module Falcon
 	module Adapters

data/lib/falcon/adapters/input.rb

@@ -19,9 +19,7 @@
 # THE SOFTWARE.
 
 require 'async/io/buffer'
-
-require 'async/http/body'
-require 'async/http/body/rewindable'
+require 'protocol/http/body/rewindable'
 
 module Falcon
 	module Adapters

data/lib/falcon/adapters/output.rb

@@ -18,14 +18,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/http/body/readable'
-require 'async/http/body/file'
+require 'protocol/http/body/readable'
+require 'protocol/http/body/file'
 
 module Falcon
 	module Adapters
 		# Wraps the rack response body.
 		# The Body must respond to each and must only yield String values. The Body itself should not be an instance of String, as this will break in Ruby 1.9. If the Body responds to close, it will be called after iteration. If the body is replaced by a middleware after action, the original body must be closed first, if it responds to close. If the Body responds to to_path, it must return a String identifying the location of a file whose contents are identical to that produced by calling each; this may be used by the server as an alternative, possibly more efficient way to transport the response. The Body commonly is an Array of Strings, the application instance itself, or a File-like object.
-		class Output < Async::HTTP::Body::Readable
+		class Output < ::Protocol::HTTP::Body::Readable
 			CONTENT_LENGTH = 'content-length'.freeze
 			
 			# Wraps an array into a buffered body.
@@ -36,11 +36,11 @@ module Falcon
 					length = Integer(length)
 				end
 				
-				if body.is_a?(Async::HTTP::Body::Readable)
+				if body.is_a?(::Protocol::HTTP::Body::Readable)
 					return body
 				elsif status == 200 and body.respond_to?(:to_path)
 					# Don't mangle partial responsese (206)
-					return Async::HTTP::Body::File.open(body.to_path)
+					return ::Protocol::HTTP::Body::File.open(body.to_path)
 				elsif body.is_a? Array
 					# TODO after dropping 2.3, change to #sum
 					length ||= body.inject(0){|sum, chunk| sum + chunk.bytesize}

data/lib/falcon/adapters/rack.rb

@@ -29,7 +29,7 @@ require 'async/logger'
 module Falcon
 	module Adapters
 		class Rack
-			# CGI constants
+			# CGI keys (https://tools.ietf.org/html/rfc3875#section-4.1)
 			HTTP_HOST = 'HTTP_HOST'.freeze
 			PATH_INFO = 'PATH_INFO'.freeze
 			REQUEST_METHOD = 'REQUEST_METHOD'.freeze
@@ -193,7 +193,7 @@ module Falcon
 			end
 			
 			def failure_response(exception)
-				Async::HTTP::Response.for_exception(exception)
+				Protocol::HTTP::Response.for_exception(exception)
 			end
 		end
 	end

data/lib/falcon/adapters/response.rb

@@ -27,7 +27,7 @@ require 'time'
 
 module Falcon
 	module Adapters
-		class Response < Async::HTTP::Response
+		class Response < ::Protocol::HTTP::Response
 			IGNORE_HEADERS = Proxy::HOP_HEADERS
 			
 			# Append a list of newline encoded headers.
@@ -65,17 +65,19 @@ module Falcon
 					body = Output.wrap(status, headers, body)
 				end
 				
+				protocol = meta['rack.protocol']
+				
 				# https://tools.ietf.org/html/rfc7231#section-7.4.2
 				# headers.add('server', "falcon/#{Falcon::VERSION}")
 				
 				# https://tools.ietf.org/html/rfc7231#section-7.1.1.2
 				# headers.add('date', Time.now.httpdate)
 				
-				return self.new(status, headers, body)
+				return self.new(status, headers, body, protocol)
 			end
 			
-			def initialize(status, headers, body)
-				super(nil, status, nil, headers, body)
+			def initialize(status, headers, body, protocol = nil)
+				super(nil, status, nil, headers, body, protocol)
 			end
 		end
 	end

data/lib/falcon/adapters/rewindable.rb

@@ -18,12 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/http/body/rewindable'
+require 'protocol/http/body/rewindable'
 
 module Falcon
 	module Adapters
 		# Content type driven input buffering.
-		class Rewindable < Async::HTTP::Middleware
+		class Rewindable < ::Protocol::HTTP::Middleware
 			BUFFERED_MEDIA_TYPES = %r{
 				application/x-www-form-urlencoded|
 				multipart/form-data|
@@ -52,7 +52,7 @@ module Falcon
 			end
 			
 			# Wrap the request body in a rewindable buffer.
-			# @return [Async::HTTP::Response] the response.
+			# @return [Protocol::HTTP::Response] the response.
 			def call(request)
 				if body = request.body and needs_rewind?(request)
 					request.body = Async::HTTP::Body::Rewindable.new(body)

data/lib/falcon/command/serve.rb

@@ -95,7 +95,7 @@ module Falcon
 			end
 			
 			def client_endpoint
-				Async::HTTP::URLEndpoint.parse(@options[:bind], **endpoint_options)
+				Async::HTTP::Endpoint.parse(@options[:bind], **endpoint_options)
 			end
 			
 			def client

data/lib/falcon/configuration.rb

@@ -123,7 +123,7 @@ module Falcon
 			end
 			
 			add(:proxy, :host) do
-				endpoint {::Async::HTTP::URLEndpoint.parse(url)}
+				endpoint {::Async::HTTP::Endpoint.parse(url)}
 			end
 			
 			add(:rack, :host) do

data/lib/falcon/endpoint.rb

@@ -18,11 +18,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/http/url_endpoint'
+require 'async/http/endpoint'
 require 'localhost/authority'
 
 module Falcon
-	class Endpoint < Async::HTTP::URLEndpoint
+	class Endpoint < Async::HTTP::Endpoint
 		def ssl_context
 			@options[:ssl_context] || build_ssl_context
 		end

data/lib/falcon/hosts.rb

@@ -25,7 +25,7 @@ require_relative 'redirection'
 
 require 'async/container'
 require 'async/container/controller'
-require 'async/http/url_endpoint'
+require 'async/http/endpoint'
 
 module Falcon
 	class Host
@@ -111,7 +111,7 @@ module Falcon
 		end
 		
 		def endpoint
-			@server_endpoint ||= Async::HTTP::URLEndpoint.parse(
+			@server_endpoint ||= Async::HTTP::Endpoint.parse(
 				'https://[::]',
 				ssl_context: self.ssl_context,
 				reuse_address: true
@@ -163,8 +163,8 @@ module Falcon
 				host.run(container)
 			end
 			
-			secure_endpoint = Async::HTTP::URLEndpoint.parse(options[:bind_secure], ssl_context: self.ssl_context)
-			insecure_endpoint = Async::HTTP::URLEndpoint.parse(options[:bind_insecure])
+			secure_endpoint = Async::HTTP::Endpoint.parse(options[:bind_secure], ssl_context: self.ssl_context)
+			insecure_endpoint = Async::HTTP::Endpoint.parse(options[:bind_insecure])
 			
 			container.run(count: 1, name: "Falcon Proxy") do |task, instance|
 				proxy = self.proxy

data/lib/falcon/proxy.rb

@@ -20,18 +20,19 @@
 
 require 'async/http/client'
 require 'protocol/http/headers'
+require 'protocol/http/middleware'
 
 module Falcon
 	module BadRequest
 		def self.call(request)
-			return Async::HTTP::Response[400, {}, []]
+			return Protocol::HTTP::Response[400, {}, []]
 		end
 		
 		def self.close
 		end
 	end
 	
-	class Proxy < Async::HTTP::Middleware
+	class Proxy < Protocol::HTTP::Middleware
 		FORWARDED = 'forwarded'.freeze
 		X_FORWARDED_FOR = 'x-forwarded-for'.freeze
 		X_FORWARDED_PROTO = 'x-forwarded-proto'.freeze
@@ -133,7 +134,7 @@ module Falcon
 			end
 		rescue
 			Async.logger.error(self) {$!}
-			return Async::HTTP::Response[502, {'content-type' => 'text/plain'}, ["#{$!.inspect}: #{$!.backtrace.join("\n")}"]]
+			return Protocol::HTTP::Response[502, {'content-type' => 'text/plain'}, ["#{$!.inspect}: #{$!.backtrace.join("\n")}"]]
 		end
 	end
 end

data/lib/falcon/redirection.rb

@@ -23,14 +23,14 @@ require 'async/http/client'
 module Falcon
 	module NotFound
 		def self.call(request)
-			return Async::HTTP::Response[404, {}, []]
+			return Protocol::HTTP::Response[404, {}, []]
 		end
 		
 		def self.close
 		end
 	end
 	
-	class Redirection < Async::HTTP::Middleware
+	class Redirection < Protocol::HTTP::Middleware
 		def initialize(app, hosts, endpoint)
 			super(app)
 			
@@ -53,7 +53,7 @@ module Falcon
 					location = "#{@endpoint.scheme}://#{host.authority}:#{@endpoint.port}#{request.path}"
 				end
 				
-				return Async::HTTP::Response[301, [['location', location]], []]
+				return Protocol::HTTP::Response[301, [['location', location]], []]
 			else
 				super
 			end

data/lib/falcon/server.rb

@@ -19,9 +19,9 @@
 # THE SOFTWARE.
 
 require 'async/http/server'
-require 'async/http/middleware/builder'
 
-require 'async/http/content_encoding'
+require 'protocol/http/middleware/builder'
+require 'protocol/http/content_encoding'
 
 require_relative 'verbose'
 require_relative 'adapters/rewindable'
@@ -30,12 +30,12 @@ require_relative 'adapters/rack'
 module Falcon
 	class Server < Async::HTTP::Server
 		def self.middleware(rack_app, verbose: false)
-			Async::HTTP::Middleware.build do
+			::Protocol::HTTP::Middleware.build do
 				if verbose
 					use Verbose
 				end
 				
-				use Async::HTTP::ContentEncoding
+				use ::Protocol::HTTP::ContentEncoding
 				use Adapters::Rewindable
 				use Adapters::Rack
 				

data/lib/falcon/verbose.rb

@@ -22,7 +22,7 @@ require 'async/logger'
 require 'async/http/statistics'
 
 module Falcon
-	class Verbose < Async::HTTP::Middleware
+	class Verbose < Protocol::HTTP::Middleware
 		def initialize(app, logger = Async.logger)
 			super(app)
 			

data/lib/falcon/version.rb

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

data/tasks/benchmark.rake

@@ -22,7 +22,7 @@ namespace :benchmark do
 		require 'async/process'
 		require 'async/clock'
 		require 'async/io/stream'
-		require 'async/http/url_endpoint'
+		require 'async/http/endpoint'
 		
 		host = "http://127.0.0.1:9292"
 
@@ -40,7 +40,7 @@ namespace :benchmark do
 		
 		Async.logger.info!
 		
-		endpoint = Async::HTTP::URLEndpoint.parse(host)
+		endpoint = Async::HTTP::Endpoint.parse(host)
 		
 		servers.each do |command|
 			::Async::Reactor.run do |task|
@@ -62,7 +62,7 @@ namespace :benchmark do
 						
 						socket = endpoint.connect
 						
-						request = Async::HTTP::Request.new("http", "localhost", "GET", @request_path)
+						request = Protocol::HTTP::Request.new("http", "localhost", "GET", @request_path)
 						stream = Async::IO::Stream.new(socket)
 						protocol = Async::HTTP::Protocol::HTTP1.client(stream)
 						

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.41.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: async-process
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.