falcon 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1002d7af3d9b4c9cd36aabc15cfa55efaca63543c2422513b87f89dc4283edd
-  data.tar.gz: 5180cb2d1cb93058cd8c0cdfbcc0fe986372df61ce25061ff2531631172a4855
+  metadata.gz: a93b677671ad9a275d8d63ec8caeb6f86bed3bfdad56768e558a20afde5326ed
+  data.tar.gz: 60023f6c2a5ad478e7199ff9c33550fb6e51a8dba6ebe200f513039f40ab0be6
 SHA512:
-  metadata.gz: dc747f7df864008cc156bd54afa992166ca598337a15cf8eca18e290a6223ef90e0b7e0f2e80b6d18adcdbb32d1447e3912a8284f4aaa6905f197096ec85754a
-  data.tar.gz: 8f9de5fb3a53972649b4caa1c25e1937d5e6a429d9a932d62b8f5b40e7b933ba55e41077da81b6c5305e43e3774c7b7c4f9ca7f3e5d53105c7fa6b9cb723c7dc
+  metadata.gz: bce2c09729a60ab971401426265b9d64652343a45f322d7990ce2c9d966046f71693ecf34044c857ef627856f94b078848072259a99fdc74fbbfea6eecfd2595
+  data.tar.gz: '0449e4726e6fc098aeb44228c32b21c371fd40a97181bc36a0532cba1833555a6f2475fa0e54ae349251b8a1effba209b3d1747f71bbc2837f2b23bd395257da'

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.39.0"
+	spec.add_dependency "async-http", "~> 0.40.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.6.0"
+	spec.add_development_dependency "async-websocket", "~> 0.9.0"
 	spec.add_development_dependency "async-process", "~> 1.1"
 	
 	spec.add_development_dependency "covered", "~> 0.10"

data/lib/falcon/adapters/rack.rb

@@ -23,7 +23,6 @@ require 'rack'
 require_relative 'input'
 require_relative 'response'
 require_relative 'early_hints'
-require_relative 'hijack'
 
 require 'async/logger'
 
@@ -185,7 +184,7 @@ module Falcon
 				if full_hijack
 					return nil
 				else
-					return Response.wrap(status, headers, body, request, env)
+					return Response.wrap(status, headers, body, request)
 				end
 			rescue => exception
 				@logger.error(self) {exception}

data/lib/falcon/adapters/response.rb

@@ -19,10 +19,10 @@
 # THE SOFTWARE.
 
 require_relative 'output'
-require_relative 'hijack'
 require_relative '../version'
 require_relative '../proxy'
 
+require 'async/http/body/hijack'
 require 'time'
 
 module Falcon
@@ -50,16 +50,16 @@ module Falcon
 				return headers, meta
 			end
 			
-			def self.wrap(status, headers, body, request = nil, env = nil)
+			def self.wrap(status, headers, body, request = nil)
 				headers, meta = wrap_headers(headers)
 				
-				if block = meta['rack.hijack'] and request and env
-					body = Hijack.for(env, block, request.hijack? ? request.hijack! : nil)
+				if block = meta['rack.hijack']
+					body = Async::HTTP::Body::Hijack.wrap(request, &block)
 				else
-					sliced = headers.slice!(IGNORE_HEADERS)
+					ignored = headers.extract(IGNORE_HEADERS)
 					
-					unless sliced.empty?
-						Async.logger.warn("Ignoring protocol-level headers: #{sliced.inspect}")
+					unless ignored.empty?
+						Async.logger.warn("Ignoring protocol-level headers: #{ignored.inspect}")
 					end
 					
 					body = Output.wrap(status, headers, body)

data/lib/falcon/proxy.rb

@@ -80,10 +80,10 @@ module Falcon
 		
 		def prepare_headers(headers)
 			if connection = headers[CONNECTION]
-				headers.slice!(connection)
+				headers.extract(connection)
 			end
 			
-			headers.slice!(HOP_HEADERS)
+			headers.extract(HOP_HEADERS)
 		end
 		
 		def prepare_request(request, host)

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.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.6.0
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: async-process
   requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,6 @@ files:
 - gems/rack3.gemfile
 - lib/falcon.rb
 - lib/falcon/adapters/early_hints.rb
-- lib/falcon/adapters/hijack.rb
 - lib/falcon/adapters/input.rb
 - lib/falcon/adapters/output.rb
 - lib/falcon/adapters/rack.rb

data/lib/falcon/adapters/hijack.rb

@@ -1,84 +0,0 @@
-# Copyright, 2019, 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/http/middleware'
-require 'async/io/buffer'
-
-module Falcon
-	module Adapters
-		# This is used for implementing partial hijack.
-		class Hijack
-			def self.for(env, block, socket = nil, task: Async::Task.current)
-				input = socket || env[Rack::RACK_INPUT]
-				output = Async::HTTP::Body::Writable.new
-				
-				stream = Hijack.new(input, output)
-				
-				task.async do
-					begin
-						block.call(stream)
-					ensure
-						output.close
-					end
-				end
-				
-				return output
-			end
-			
-			def initialize(input, output)
-				@input = input
-				@output = output
-			end
-			
-			def read(length = nil, buffer = nil)
-				@input.read(length, buffer)
-			end
-			
-			def read_nonblock(length, buffer = nil)
-				@input.read(length, buffer)
-			end
-			
-			def write(buffer)
-				@output.write(buffer)
-			end
-			
-			alias write_nonblock write
-			
-			def flush
-			end
-			
-			def close
-				@output.close
-			end
-			
-			def close_read
-				if @input.respond_to?(:close_read)
-					@input.close_read
-				else
-					@input.close
-				end
-			end
-			
-			def close_write
-				@output.close
-			end
-		end
-	end
-end