falcon 0.41.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea41a48b0da7b6ba65df7bd8f3c63c06a8deb498119079f8ca03367bc78cfa5
-  data.tar.gz: 79e5693fc78e56b829d88b6addffe4d255fa09629cf201356192eb70563e1036
+  metadata.gz: 41752345deec82e8434e7b59548a97dab31902b6038893db4a6fa65eda46479d
+  data.tar.gz: 7aaaca95cfdd733b9ae68ad49db16f9007266f9e42211c156376001f88cc3b1d
 SHA512:
-  metadata.gz: d97ae8f6aebe79fa10c410ca4ba038a731b6ace354b2bcc2bd8ec0d5a958fefed7c89d5bd47141fbb0e2f8fbbac869476e6bc1c552a8034ddc9b5835e9278d4c
-  data.tar.gz: '080b0ac4a57575b3177024248fa538d7019f3812eed267a3fd5ca9b7de7cc9388759d55c51a6b0de6b2aa71788b69f2bbc08e08488415f3cfc7e54d3707f8a14'
+  metadata.gz: 0f57c05d31769f54de00add9cdfaacbcd2471b49c64c846d552a4257e108cdd58480c3b90369d5412d5bc618ac3fb731df90d691c8f254521097f3402999d684
+  data.tar.gz: 7bd53d3c8a4a1619fbee1cd436e64f78065fd2de09c9f8fc2f00819a5c1fbf395151d1f893c4be730140d5105266aad963c89be3a543f10f0e66781e413f285f

data/lib/falcon/server.rb

@@ -28,9 +28,7 @@ require 'protocol/http/content_encoding'
 require 'async/http/cache'
 
 require_relative 'middleware/verbose'
-
-require_relative 'adapters/rewindable'
-require_relative 'adapters/rack'
+require 'protocol/rack'
 
 module Falcon
 	# A server listening on a specific endpoint, hosting a specific middleware.
@@ -50,8 +48,7 @@ module Falcon
 				end
 				
 				use ::Protocol::HTTP::ContentEncoding
-				use Adapters::Rewindable
-				use Adapters::Rack
+				use ::Protocol::Rack::Adapter
 				
 				run rack_app
 			end

data/lib/falcon/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.41.0"
+	VERSION = "0.42.0"
 end

data/lib/rack/handler/falcon.rb

@@ -27,8 +27,7 @@ module Rack
 			# Run the specified app using the given options:
 			# @parameter app [Object] The rack middleware.
 			def self.run(app, **options)
-				app = ::Falcon::Adapters::Rack.new(app)
-				app = ::Falcon::Adapters::Rewindable.new(app)
+				app = ::Protocol::Rack::Adapter.new(app)
 						
 				Sync do |task|
 					endpoint = endpoint_for(**options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -54,7 +54,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -197,19 +197,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: protocol-rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: samovar
   requirement: !ruby/object:Gem::Requirement
@@ -319,12 +319,8 @@ files:
 - bake/falcon/supervisor.rb
 - bin/falcon
 - bin/falcon-host
+- lib/.DS_Store
 - lib/falcon.rb
-- lib/falcon/adapters/input.rb
-- lib/falcon/adapters/output.rb
-- lib/falcon/adapters/rack.rb
-- lib/falcon/adapters/response.rb
-- lib/falcon/adapters/rewindable.rb
 - lib/falcon/command.rb
 - lib/falcon/command/host.rb
 - lib/falcon/command/paths.rb

data/lib/falcon/adapters/input.rb

@@ -1,152 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'async/io/buffer'
-require 'protocol/http/body/rewindable'
-
-module Falcon
-	module Adapters
-		# Wraps a streaming input body into the interface required by `rack.input`.
-		#
-		# The input stream is an `IO`-like object which contains the raw HTTP POST data. When applicable, its external encoding must be `ASCII-8BIT` and it must be opened in binary mode, for Ruby 1.9 compatibility. The input stream must respond to `gets`, `each`, `read` and `rewind`.
-		#
-		# This implementation is not always rewindable, to avoid buffering the input when handling large uploads. See {Rewindable} for more details.
-		class Input
-			# Initialize the input wrapper.
-			# @parameter body [Protocol::HTTP::Body::Readable]
-			def initialize(body)
-				@body = body
-				
-				# Will hold remaining data in `#read`.
-				@buffer = nil
-				@finished = @body.nil?
-			end
-			
-			# The input body.
-			# @attribute [Protocol::HTTP::Body::Readable]
-			attr :body
-			
-			# Enumerate chunks of the request body.
-			# @yields {|chunk| ...}
-			# 	@parameter chunk [String]
-			def each(&block)
-				return to_enum unless block_given?
-				
-				while chunk = gets
-					yield chunk
-				end
-			end
-			
-			# Rewind the input stream back to the start.
-			#
-			# `rewind` must be called without arguments. It rewinds the input stream back to the beginning. It must not raise Errno::ESPIPE: that is, it may not be a pipe or a socket. Therefore, handler developers must buffer the input data into some rewindable object if the underlying input stream is not rewindable.
-			#
-			# @returns [Boolean] Whether the body could be rewound.
-			def rewind
-				if @body and @body.respond_to? :rewind
-					# If the body is not rewindable, this will fail.
-					@body.rewind
-					@buffer = nil
-					@finished = false
-					
-					return true
-				end
-				
-				return false
-			end
-			
-			# Read data from the input stream.
-			# 
-			# `read` behaves like `IO#read`. Its signature is `read(length = nil, buffer = nil)`. If given, length must be a non-negative `Integer` (>= 0) or `nil`, and buffer must be a `String` and may not be nil. If `length` is given and not `nil`, then this method reads at most `length` bytes from the input stream. If `length` is not given or `nil`, then this method reads all data. When the end is reached, this method returns `nil` if `length` is given and not `nil`, or an empty `String` if `length` is not given or is `nil`. If `buffer` is given, then the read data will be placed into the `buffer` instead of a newly created `String` object.
-			#
-			# @parameter length [Integer] the amount of data to read
-			# @parameter buffer [String] the buffer which will receive the data
-			# @returns a buffer containing the data
-			def read(length = nil, buffer = nil)
-				buffer ||= Async::IO::Buffer.new
-				buffer.clear
-				
-				until buffer.bytesize == length
-					@buffer = read_next if @buffer.nil?
-					break if @buffer.nil?
-					
-					remaining_length = length - buffer.bytesize if length
-					
-					if remaining_length && remaining_length < @buffer.bytesize
-						# We know that we are not going to reuse the original buffer.
-						# But byteslice will generate a hidden copy. So let's freeze it first:
-						@buffer.freeze
-						
-						buffer << @buffer.byteslice(0, remaining_length)
-						@buffer = @buffer.byteslice(remaining_length, @buffer.bytesize)
-					else
-						buffer << @buffer
-						@buffer = nil
-					end
-				end
-				
-				return nil if buffer.empty? && length && length > 0
-				
-				return buffer
-			end
-			
-			# Has the input stream been read completely?
-			# @returns [Boolean]
-			def eof?
-				@finished and @buffer.nil?
-			end
-			
-			# Read the next chunk of data from the input stream.
-			#
-			# `gets` must be called without arguments and return a `String`, or `nil` when the input stream has no more data.
-			#
-			# @returns [String | Nil] The next chunk from the body.
-			def gets
-				if @buffer.nil?
-					return read_next
-				else
-					buffer = @buffer
-					@buffer = nil
-					return buffer
-				end
-			end
-			
-			# Close and discard the remainder of the input stream.
-			def close
-				@body&.close
-			end
-			
-			private
-			
-			def read_next
-				return nil if @finished
-				
-				if chunk = @body.read
-					return chunk
-				else
-					@finished = true
-					return nil
-				end
-			end
-		end
-	end
-end

data/lib/falcon/adapters/output.rb

@@ -1,138 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'protocol/http/body/readable'
-require 'protocol/http/body/file'
-
-module Falcon
-	module Adapters
-		# Wraps the rack response body.
-		#
-		# The `rack` body must respond to `each` and must only yield `String` values. 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 < ::Protocol::HTTP::Body::Readable
-			CONTENT_LENGTH = 'content-length'.freeze
-			
-			# Wraps an array into a buffered body.
-			# @parameter status [Integer] The response status.
-			# @parameter headers [Protocol::HTTP::Headers] The response headers.
-			# @parameter body [Object] The `rack` response body.
-			def self.wrap(status, headers, body, request = nil)
-				# In no circumstance do we want this header propagating out:
-				if length = headers.delete(CONTENT_LENGTH)
-					# We don't really trust the user to provide the right length to the transport.
-					length = Integer(length)
-				end
-				
-				# If we have an Async::HTTP body, we return it directly:
-				if body.is_a?(::Protocol::HTTP::Body::Readable)
-					# warn "Returning #{body.class} as body is falcon-specific and may be removed in the future!"
-					return body
-				end
-				
-				# Otherwise, we have a more typical response body:
-				if status == 200 and body.respond_to?(:to_path)
-					begin
-						# Don't mangle partial responses (206)
-						return ::Protocol::HTTP::Body::File.open(body.to_path).tap do
-							body.close if body.respond_to?(:close) # Close the original body.
-						end
-					rescue Errno::ENOENT
-						# If the file is not available, ignore.
-					end
-				end
-				
-				# If we have a streaming body, we hijack the connection:
-				unless body.respond_to?(:each)
-					return Async::HTTP::Body::Hijack.new(body, request&.body)
-				end
-				
-				if body.is_a?(Array)
-					length ||= body.sum(&:bytesize)
-					return self.new(body, length)
-				else
-					return self.new(body, length)
-				end
-			end
-			
-			# Initialize the output wrapper.
-			# @parameter body [Object] The rack response body.
-			# @parameter length [Integer] The rack response length.
-			def initialize(body, length)
-				@length = length
-				@body = body
-				
-				@chunks = nil
-			end
-			
-			# The rack response body.
-			attr :body
-			
-			# The content length of the rack response body.
-			attr :length
-			
-			# Whether the body is empty.
-			def empty?
-				@length == 0 or (@body.respond_to?(:empty?) and @body.empty?)
-			end
-			
-			# Whether the body can be read immediately.
-			def ready?
-				body.is_a?(Array) or body.respond_to?(:to_ary)
-			end
-			
-			# Close the response body.
-			def close(error = nil)
-				if @body and @body.respond_to?(:close)
-					@body.close
-				end
-				
-				@body = nil
-				@chunks = nil
-				
-				super
-			end
-			
-			# Enumerate the response body.
-			# @yields {|chunk| ...}
-			# 	@parameter chunk [String]
-			def each(&block)
-				@body.each(&block)
-			ensure
-				self.close($!)
-			end
-			
-			# Read the next chunk from the response body.
-			# @returns [String | Nil]
-			def read
-				@chunks ||= @body.to_enum(:each)
-				
-				return @chunks.next
-			rescue StopIteration
-				return nil
-			end
-			
-			def inspect
-				"\#<#{self.class} length=#{@length.inspect} body=#{@body.class}>"
-			end
-		end
-	end
-end

data/lib/falcon/adapters/rack.rb

@@ -1,224 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'rack'
-
-require_relative 'input'
-require_relative 'response'
-
-require 'console'
-
-module Falcon
-	module Adapters
-		class Rack
-			# CGI keys <https://tools.ietf.org/html/rfc3875#section-4.1>:
-			
-			HTTP_HOST = 'HTTP_HOST'
-			PATH_INFO = 'PATH_INFO'
-			REQUEST_METHOD = 'REQUEST_METHOD'
-			REQUEST_PATH = 'REQUEST_PATH'
-			REQUEST_URI = 'REQUEST_URI'
-			SCRIPT_NAME = 'SCRIPT_NAME'
-			QUERY_STRING = 'QUERY_STRING'
-			SERVER_PROTOCOL = 'SERVER_PROTOCOL'
-			SERVER_NAME = 'SERVER_NAME'
-			SERVER_PORT = 'SERVER_PORT'
-			REMOTE_ADDR = 'REMOTE_ADDR'
-			CONTENT_TYPE = 'CONTENT_TYPE'
-			CONTENT_LENGTH = 'CONTENT_LENGTH'
-			
-			# Rack environment variables:
-			
-			RACK_VERSION = 'rack.version'
-			RACK_ERRORS = 'rack.errors'
-			RACK_LOGGER = 'rack.logger'
-			RACK_INPUT = 'rack.input'
-			RACK_MULTITHREAD = 'rack.multithread'
-			RACK_MULTIPROCESS = 'rack.multiprocess'
-			RACK_RUNONCE = 'rack.run_once'
-			RACK_URL_SCHEME = 'rack.url_scheme'
-			RACK_HIJACK = 'rack.hijack'
-			RACK_IS_HIJACK = 'rack.hijack?'
-			RACK_HIJACK_IO = 'rack.hijack_io'
-			
-			# Raised back up through the middleware when the underlying connection is hijacked.
-			class FullHijack < StandardError
-			end
-			
-			# Async::HTTP specific metadata:
-			
-			ASYNC_HTTP_REQUEST = "async.http.request"
-			
-			# Header constants:
-			
-			HTTP_X_FORWARDED_PROTO = 'HTTP_X_FORWARDED_PROTO'
-			
-			# Initialize the rack adaptor middleware.
-			# @parameter app [Object] The rack middleware.
-			def initialize(app)
-				@app = app
-				
-				raise ArgumentError, "App must be callable!" unless @app.respond_to?(:call)
-			end
-			
-			# Unwrap raw HTTP headers into the CGI-style expected by Rack middleware.
-			#
-			# Rack separates multiple headers with the same key, into a single field with multiple lines.
-			#
-			# @parameter headers [Protocol::HTTP::Headers] The raw HTTP request headers.
-			# @parameter env [Hash] The rack request `env`.
-			def unwrap_headers(headers, env)
-				headers.each do |key, value|
-					http_key = "HTTP_#{key.upcase.tr('-', '_')}"
-					
-					if current_value = env[http_key]
-						env[http_key] = "#{current_value};#{value}"
-					else
-						env[http_key] = value
-					end
-				end
-			end
-			
-			# Process the incoming request into a valid rack `env`.
-			#
-			# - Set the `env['CONTENT_TYPE']` and `env['CONTENT_LENGTH']` based on the incoming request body. 
-			# - Set the `env['HTTP_HOST']` header to the request authority.
-			# - Set the `env['HTTP_X_FORWARDED_PROTO']` header to the request scheme.
-			# - Set `env['REMOTE_ADDR']` to the request remote adress.
-			#
-			# @parameter request [Protocol::HTTP::Request] The incoming request.
-			# @parameter env [Hash] The rack `env`.
-			def unwrap_request(request, env)
-				if content_type = request.headers.delete('content-type')
-					env[CONTENT_TYPE] = content_type
-				end
-				
-				# In some situations we don't know the content length, e.g. when using chunked encoding, or when decompressing the body.
-				if body = request.body and length = body.length
-					env[CONTENT_LENGTH] = length.to_s
-				end
-				
-				self.unwrap_headers(request.headers, env)
-				
-				# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
-				env[HTTP_HOST] ||= request.authority
-				
-				# This is the HTTP/1 header for the scheme of the request and is used by Rack.
-				# Technically it should use the Forwarded header but this is not common yet.
-				# https://tools.ietf.org/html/rfc7239#section-5.4
-				# https://github.com/rack/rack/issues/1310
-				env[HTTP_X_FORWARDED_PROTO] ||= request.scheme
-				
-				if remote_address = request.remote_address
-					env[REMOTE_ADDR] = remote_address.ip_address if remote_address.ip?
-				end
-			end
-			
-			# Build a rack `env` from the incoming request and apply it to the rack middleware.
-			#
-			# @parameter request [Protocol::HTTP::Request] The incoming request.
-			def call(request)
-				request_path, query_string = request.path.split('?', 2)
-				server_name, server_port = (request.authority || '').split(':', 2)
-				
-				env = {
-					RACK_VERSION => [2, 0, 0],
-					
-					ASYNC_HTTP_REQUEST => request,
-					
-					RACK_INPUT => Input.new(request.body),
-					RACK_ERRORS => $stderr,
-					RACK_LOGGER => Console.logger,
-					
-					RACK_MULTITHREAD => true,
-					RACK_MULTIPROCESS => true,
-					RACK_RUNONCE => false,
-					
-					# The HTTP request method, such as “GET” or “POST”. This cannot ever be an empty string, and so is always required.
-					REQUEST_METHOD => request.method,
-					
-					# The initial portion of the request URL's “path” that corresponds to the application object, so that the application knows its virtual “location”. This may be an empty string, if the application corresponds to the “root” of the server.
-					SCRIPT_NAME => '',
-					
-					# The remainder of the request URL's “path”, designating the virtual “location” of the request's target within the application. This may be an empty string, if the request URL targets the application root and does not have a trailing slash. This value may be percent-encoded when originating from a URL.
-					PATH_INFO => request_path,
-					REQUEST_PATH => request_path,
-					REQUEST_URI => request.path,
-
-					# The portion of the request URL that follows the ?, if any. May be empty, but is always required!
-					QUERY_STRING => query_string || '',
-					
-					# The server protocol (e.g. HTTP/1.1):
-					SERVER_PROTOCOL => request.version,
-					
-					# The request scheme:
-					RACK_URL_SCHEME => request.scheme,
-					
-					# I'm not sure what sane defaults should be here:
-					SERVER_NAME => server_name,
-					SERVER_PORT => server_port,
-					
-					# We support both request and response hijack.
-					RACK_IS_HIJACK => true,
-				}
-				
-				self.unwrap_request(request, env)
-				
-				full_hijack = false
-				
-				if request.hijack?
-					env[RACK_HIJACK] = lambda do
-						wrapper = request.hijack!
-						full_hijack = true
-						
-						# 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
-						
-						# This is implicitly returned:
-						env[RACK_HIJACK_IO] = io
-					end
-				end
-				
-				status, headers, body = @app.call(env)
-				
-				# If there was a full hijack:
-				if full_hijack
-					raise FullHijack, "The connection was hijacked."
-				else
-					return Response.wrap(status, headers, body, request)
-				end
-			rescue => exception
-				Console.logger.error(self) {exception}
-				
-				return failure_response(exception)
-			end
-			
-			# Generate a suitable response for the given exception.
-			# @parameter exception [Exception]
-			# @returns [Protocol::HTTP::Response]
-			def failure_response(exception)
-				Protocol::HTTP::Response.for_exception(exception)
-			end
-		end
-	end
-end

data/lib/falcon/adapters/response.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require_relative 'output'
-require_relative '../version'
-require_relative '../middleware/proxy'
-
-require 'async/http/body/hijack'
-require 'time'
-
-module Falcon
-	module Adapters
-		# A wrapper for a `Rack` response.
-		#
-		# A Rack response consisting of `[status, headers, body]` includes various rack-specific elements, including:
-		#
-		# - A `headers['rack.hijack']` callback which bypasses normal response handling.
-		# - Potentially invalid content length.
-		# - Potentially invalid body when processing a `HEAD` request.
-		# - Newline-separated header values.
-		# - Other `rack.` specific header key/value pairs.
-		#
-		# This wrapper takes those issues into account and adapts the rack response tuple into a {Protocol::HTTP::Response}.
-		class Response < ::Protocol::HTTP::Response
-			IGNORE_HEADERS = Middleware::Proxy::HOP_HEADERS
-			
-			# Process the rack response headers into into a {Protocol::HTTP::Headers} instance, along with any extra `rack.` metadata.
-			# @returns [Tuple(Protocol::HTTP::Headers, Hash)]
-			def self.wrap_headers(fields)
-				headers = ::Protocol::HTTP::Headers.new
-				meta = {}
-				
-				fields.each do |key, value|
-					key = key.downcase
-					
-					if key.start_with?('rack.')
-						meta[key] = value
-					else
-						value.to_s.split("\n").each do |part|
-							headers.add(key, part)
-						end
-					end
-				end
-				
-				return headers, meta
-			end
-			
-			# Wrap a rack response.
-			# @parameter status [Integer] The rack response status.
-			# @parameter headers [Duck(:each)] The rack response headers.
-			# @parameter body [Duck(:each, :close) | Nil] The rack response body.
-			# @parameter request [Protocol::HTTP::Request] The original request.
-			def self.wrap(status, headers, body, request = nil)
-				headers, meta = wrap_headers(headers)
-				
-				if block = meta['rack.hijack']
-					body = Async::HTTP::Body::Hijack.wrap(request, &block)
-				else
-					ignored = headers.extract(IGNORE_HEADERS)
-					
-					unless ignored.empty?
-						Console.logger.warn("Ignoring protocol-level headers: #{ignored.inspect}")
-					end
-					
-					body = Output.wrap(status, headers, body, request)
-				end
-				
-				if request&.head?
-					# I thought about doing this in Output.wrap, but decided the semantics are too tricky. Specifically, the various ways a rack response body can be wrapped, and the need to invoke #close at the right point.
-					body = ::Protocol::HTTP::Body::Head.for(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, protocol)
-			end
-			
-			# Initialize the response wrapper.
-			# @parameter status [Integer] The response status.
-			# @parameter headers [Protocol::HTTP::Headers] The response headers.
-			# @parameter body [Protocol::HTTP::Body] The response body.
-			# @parameter protocol [String] The response protocol for upgraded requests.
-			def initialize(status, headers, body, protocol = nil)
-				super(nil, status, headers, body, protocol)
-			end
-		end
-	end
-end

data/lib/falcon/adapters/rewindable.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'protocol/http/body/rewindable'
-
-module Falcon
-	module Adapters
-		# Content-type driven input buffering, specific to the needs of `rack`.
-		class Rewindable < ::Protocol::HTTP::Middleware
-			# Media types that require buffering.
-			BUFFERED_MEDIA_TYPES = %r{
-				application/x-www-form-urlencoded|
-				multipart/form-data|
-				multipart/related|
-				multipart/mixed
-			}x
-			
-			POST = 'POST'.freeze
-			
-			# Initialize the rewindable middleware.
-			# @parameter app [Protocol::HTTP::Middleware] The middleware to wrap.
-			def initialize(app)
-				super(app)
-			end
-			
-			# Determine whether the request needs a rewindable body.
-			# @parameter request [Protocol::HTTP::Request]
-			# @returns [Boolean]
-			def needs_rewind?(request)
-				content_type = request.headers['content-type']
-				
-				if request.method == POST and content_type.nil?
-					return true
-				end
-				
-				if BUFFERED_MEDIA_TYPES =~ content_type
-					return true
-				end
-				
-				return false
-			end
-			
-			# Wrap the request body in a rewindable buffer if required.
-			# @parameter request [Protocol::HTTP::Request]
-			# @returns [Protocol::HTTP::Response] the response.
-			def call(request)
-				if body = request.body and needs_rewind?(request)
-					request.body = Async::HTTP::Body::Rewindable.new(body)
-				end
-				
-				return super
-			end
-		end
-	end
-end