falcon 0.20.3 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58aa5dfb614f0aac02f49c8b8cee05705c4444e7c04914460cb97329af90aba9
-  data.tar.gz: 25913f7fb8abdc8a910429adeb62138203fb8d19a38e8fe81abcd4c60bd63d3e
+  metadata.gz: 91279ed58645ed1cda598fabfa2c4bfbf8b46b48d85592d1931029f8349c5fd5
+  data.tar.gz: 5b6e8eee3ab6feabb39b48fbb0b1ab2935df438f0337b8a99bc5b4cde636657b
 SHA512:
-  metadata.gz: 3b0ccf9d296dea171f3a1368ce96ff293924a8e43d07587cbc7600f557c3cf48b0e3613f10c4c16907c8d810d5343474776e3aed16d4f95affe93670bbd08ecc
-  data.tar.gz: 854d16a9dd87bf29445c84827481d0234b24d57fd0df400e51535bc57e369330c624fd6305a27044949c3fd296f515c3b64df180a705a92933c6455c759f6df1
+  metadata.gz: 7d4083ce4077d31ed120561e49a21511633593975c3c6c620c6a674144a7a4affe2cafaf9715b95b5425b4bd2b023f9cee47e8a0b317d9f84f858d8d8c1d3ad0
+  data.tar.gz: aa100da91cb010f6ce2f4af7ea6ee3dbe1987ba325815793975e24cee142cb3c5f8fbe8aecb9c22fff68ae617c97eb49e0aceec6a1630361329ffbc5dbfcb984

data/.travis.yml

@@ -17,6 +17,10 @@ matrix:
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
+    - rvm: 2.6
+      gemfile: gems/rack1.gemfile
+    - rvm: 2.6
+      gemfile: gems/rack3.gemfile
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
@@ -28,3 +32,4 @@ matrix:
     - rvm: jruby-head
     - rvm: truffleruby
     - rvm: rbx-3
+    - gemfile: gems/rack3.gemfile

data/Gemfile

@@ -10,7 +10,5 @@ group :test do
 	gem 'pry'
 	gem 'covered', require: 'covered/rspec' if RUBY_VERSION >= "2.6.0"
 	
-	gem 'async-process', '~> 1.1'
-	
 	gem 'puma'
 end

data/falcon.gemspec

@@ -31,6 +31,8 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "async-rspec", "~> 1.7"
 	spec.add_development_dependency "async-websocket", "~> 0.6.0"
 	
+	spec.add_development_dependency "async-process", "~> 1.1"
+	
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"

data/gems/rack1.gemfile

@@ -0,0 +1,4 @@
+
+eval_gemfile("../Gemfile")
+
+gem 'rack', '~> 1.0'

data/gems/rack3.gemfile

@@ -0,0 +1,4 @@
+
+eval_gemfile("../Gemfile")
+
+gem 'rack', github: 'rack/rack'

data/lib/falcon/adapters/rack.rb

@@ -28,12 +28,36 @@ require 'async/logger'
 module Falcon
 	module Adapters
 		class Rack
-			HTTP_X_FORWARDED_PROTO = 'HTTP_X_FORWARDED_PROTO'.freeze
+			# CGI constants
+			HTTP_HOST = 'HTTP_HOST'.freeze
+			PATH_INFO = 'PATH_INFO'.freeze
+			REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+			REQUEST_PATH = 'REQUEST_PATH'.freeze
+			SCRIPT_NAME = 'SCRIPT_NAME'.freeze
+			QUERY_STRING = 'QUERY_STRING'.freeze
+			SERVER_PROTOCOL = 'SERVER_PROTOCOL'.freeze
+			SERVER_NAME = 'SERVER_NAME'.freeze
+			SERVER_PORT = 'SERVER_PORT'.freeze
 			REMOTE_ADDR = 'REMOTE_ADDR'.freeze
-			
 			CONTENT_TYPE = 'CONTENT_TYPE'.freeze
 			CONTENT_LENGTH = 'CONTENT_LENGTH'.freeze
 			
+			# Rack environment variables
+			RACK_VERSION = 'rack.version'.freeze
+			RACK_ERRORS = 'rack.errors'.freeze
+			RACK_LOGGER = 'rack.logger'.freeze
+			RACK_INPUT = 'rack.input'.freeze
+			RACK_MULTITHREAD = 'rack.multithread'.freeze
+			RACK_MULTIPROCESS = 'rack.multiprocess'.freeze
+			RACK_RUNONCE = 'rack.run_once'.freeze
+			RACK_URL_SCHEME = 'rack.url_scheme'.freeze
+			RACK_HIJACK = 'rack.hijack'.freeze
+			RACK_IS_HIJACK = 'rack.hijack?'.freeze
+			RACK_HIJACK_IO = 'rack.hijack_io'.freeze
+			
+			# Header constants
+			HTTP_X_FORWARDED_PROTO = 'HTTP_X_FORWARDED_PROTO'.freeze
+			
 			def initialize(app, logger = Async.logger)
 				@app = app
 				
@@ -69,7 +93,7 @@ module Falcon
 				self.unwrap_headers(request.headers, env)
 				
 				# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
-				env[::Rack::HTTP_HOST] ||= request.authority
+				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.
@@ -93,44 +117,46 @@ module Falcon
 				server_name, server_port = (request.authority || '').split(':', 2)
 				
 				env = {
-					::Rack::RACK_VERSION => [2, 0, 0],
+					RACK_VERSION => [2, 0, 0],
 					
-					::Rack::RACK_INPUT => Input.new(request.body),
-					::Rack::RACK_ERRORS => $stderr,
+					RACK_INPUT => Input.new(request.body),
+					RACK_ERRORS => $stderr,
+					RACK_LOGGER => Async.logger,
 					
-					::Rack::RACK_MULTITHREAD => true,
-					::Rack::RACK_MULTIPROCESS => true,
-					::Rack::RACK_RUNONCE => false,
+					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.
-					::Rack::REQUEST_METHOD => request.method,
+					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.
-					::Rack::SCRIPT_NAME => '',
+					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.
-					::Rack::PATH_INFO => request_path,
+					PATH_INFO => request_path,
+					REQUEST_PATH => request_path,
 					
 					# The portion of the request URL that follows the ?, if any. May be empty, but is always required!
-					::Rack::QUERY_STRING => query_string || '',
+					QUERY_STRING => query_string || '',
 					
 					# The server protocol (e.g. HTTP/1.1):
-					::Rack::SERVER_PROTOCOL => request.version,
+					SERVER_PROTOCOL => request.version,
 					
 					# The request scheme:
-					::Rack::RACK_URL_SCHEME => request.scheme,
+					RACK_URL_SCHEME => request.scheme,
 					
 					# I'm not sure what sane defaults should be here:
-					::Rack::SERVER_NAME => server_name || '',
-					::Rack::SERVER_PORT => server_port || '',
+					SERVER_NAME => server_name || '',
+					SERVER_PORT => server_port || '',
 				}
 				
 				self.unwrap_request(request, env)
 				
 				if request.hijack?
-					env[::Rack::RACK_IS_HIJACK] = true
+					env[RACK_IS_HIJACK] = true
 					
-					env[::Rack::RACK_HIJACK] = lambda do
+					env[RACK_HIJACK] = lambda do
 						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.
@@ -138,10 +164,10 @@ module Falcon
 						wrapper.close
 						
 						# This is implicitly returned:
-						env[::Rack::RACK_HIJACK_IO] = io
+						env[RACK_HIJACK_IO] = io
 					end
 				else
-					env[::Rack::RACK_IS_HIJACK] = false
+					env[RACK_IS_HIJACK] = false
 				end
 				
 				status, headers, body = @app.call(env)

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.21.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-protocol
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: async-process
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +231,8 @@ files:
 - examples/sinatra/Gemfile.lock
 - examples/sinatra/config.ru
 - falcon.gemspec
+- gems/rack1.gemfile
+- gems/rack3.gemfile
 - lib/falcon.rb
 - lib/falcon/adapters/input.rb
 - lib/falcon/adapters/output.rb
@@ -256,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.