falcon 0.39.1 → 0.40.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dca89c2661bf0bacad2565bb1f086594cd0a316c8ab24d7418b6a7e1e264d59
-  data.tar.gz: 9fa11ef82665f645bfc18d2f8ec443aea638ad858e40f935a073a0dabb6e2747
+  metadata.gz: 94f85c9e2ed95f6a43fda46cc07a986436ec7d874294b28288bcb004d269ea3c
+  data.tar.gz: f56850aab821d12cd73cdc1545ad2691bce81d1121ae543feb3d29f6e8ae28da
 SHA512:
-  metadata.gz: db9784ff74606b045ac17780ea57adeca95f540bc513a2a39274618638433403927a601189c941f5b400e0b822ee386ef9133f8e376a173859d62a72ea834e05
-  data.tar.gz: 51272baa0cbbe7e4293c24b80a5121b941b8203d2cce1ab811811480a101b3a81c6312772794769bc54ba842cf381c0d1e25636489b803b5ac0cb4ac988dd257
+  metadata.gz: 047ac6d846d54362c8cc220f0264c60f9c951c557a61ca9c34636a93198acf04ab1b6e0b7ff10a684a8700f4b6a158dd57abf453cfa71bd5e9dee949eeedccdf
+  data.tar.gz: 425b8131c9cbbe18684492213351e480a42d8037fc198c234ce7cd19e5f3f61b5bf59145b8335e8508928ee766ddcbff8992925084c2f5dbd5cfe1f0207de03b

data/lib/falcon/adapters/output.rb

@@ -78,7 +78,7 @@ module Falcon
 			
 			# Whether the body can be read immediately.
 			def ready?
-				true
+				body.is_a?(Array) or body.respond_to?(:to_ary)
 			end
 			
 			# Close the response body.

data/lib/falcon/extensions/openssl.rb

@@ -22,13 +22,15 @@
 
 require 'openssl/x509'
 
-module OpenSSL::X509
-	CERTIFICATE_PATTERN = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
-	
-	# An extension to load an array of certificates from a file at the given path.
-	def self.load_certificates(path)
-		File.read(path).scan(CERTIFICATE_PATTERN).collect do |text|
-			Certificate.new(text)
+module OpenSSL
+	module X509
+		CERTIFICATE_PATTERN = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
+		
+		# An extension to load an array of certificates from a file at the given path.
+		def self.load_certificates(path)
+			File.read(path).scan(CERTIFICATE_PATTERN).collect do |text|
+				Certificate.new(text)
+			end
 		end
 	end
 end

data/lib/falcon/services.rb

@@ -87,9 +87,9 @@ module Falcon
 				
 				begin
 					service.stop
-				rescue
+				rescue => error
 					failed = true
-					Console.logger.error(self, $!)
+					Console.logger.error(self, error)
 				end
 			end
 			

data/lib/falcon/version.rb

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

data/lib/rack/handler/falcon.rb

@@ -4,16 +4,16 @@ require 'rack/handler'
 
 require_relative '../../falcon'
 
-require 'async/reactor'
+require 'kernel/sync'
 require 'async/io/host_endpoint'
+require 'async/io/notification'
 
 module Rack
 	module Handler
 		# The falcon adaptor for the `rackup` executable.
-		module Falcon
+		class Falcon
 			# The default scheme.
 			SCHEME = "http"
-			NAME = :falcon
 			
 			# Generate an endpoint for the given `rackup` options.
 			# @returns [Async::IO::Endpoint]
@@ -27,20 +27,55 @@ module Rack
 			# Run the specified app using the given options:
 			# @parameter app [Object] The rack middleware.
 			def self.run(app, **options)
-				endpoint = endpoint_for(**options)
-				
 				app = ::Falcon::Adapters::Rack.new(app)
 				app = ::Falcon::Adapters::Rewindable.new(app)
-				
-				server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
-				yield server if block_given?
-				
-				Async::Reactor.run do
-					server.run
+						
+				Sync do |task|
+					endpoint = endpoint_for(**options)
+					server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
+
+					server_task = task.async do
+						server.run.each(&:wait)
+					end
+
+					wrapper = self.new(server, task)
+					
+					yield wrapper if block_given?
+
+					server_task.wait
+				ensure
+					server_task.stop
+					wrapper.close
+				end
+			end
+
+			def initialize(server, task)
+				@server = server
+				@task = task
+
+				@notification = Async::IO::Notification.new
+
+				@waiter = @task.async(transient: true) do
+					@notification.wait
+
+					@task&.stop
+					@task = nil
 				end
 			end
+
+			def stop
+				@notification&.signal
+			end
+
+			def close
+				@notification&.close
+				@notification = nil
+
+				@waiter&.stop
+				@waiter = nil
+			end
 		end
-		
-		register Falcon::NAME, Falcon
+
+		register :falcon, Falcon
 	end
 end

metadata

@@ -1,29 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.39.1
+  version: 0.40.1
 platform: ruby
 authors:
 - Samuel Williams
+- Janko Marohnić
+- dependabot[bot]
+- Bryan Powell
+- Sho Ito
+- claudiu
+- takkanm
+- tamkylet
+- Colby Swandale
+- Daniel Evans
+- Kent Gruber
+- Michael Adams
+- Mikel Kew
+- Olle Jonsson
+- Sh Lin
+- Tad Thorley
+- Tasos Latsas
+- deepj
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEhDCCAuygAwIBAgIBATANBgkqhkiG9w0BAQsFADA3MTUwMwYDVQQDDCxzYW11
+  ZWwud2lsbGlhbXMvREM9b3Jpb250cmFuc2Zlci9EQz1jby9EQz1uejAeFw0yMTA4
+  MTYwNjMzNDRaFw0yMjA4MTYwNjMzNDRaMDcxNTAzBgNVBAMMLHNhbXVlbC53aWxs
+  aWFtcy9EQz1vcmlvbnRyYW5zZmVyL0RDPWNvL0RDPW56MIIBojANBgkqhkiG9w0B
+  AQEFAAOCAY8AMIIBigKCAYEAyXLSS/cw+fXJ5e7hi+U/TeChPWeYdwJojDsFY1xr
+  xvtqbTTL8gbLHz5LW3QD2nfwCv3qTlw0qI3Ie7a9VMJMbSvgVEGEfQirqIgJXWMj
+  eNMDgKsMJtC7u/43abRKx7TCURW3iWyR19NRngsJJmaR51yGGGm2Kfsr+JtKKLtL
+  L188Wm3f13KAx7QJU8qyuBnj1/gWem076hzdA7xi1DbrZrch9GCRz62xymJlrJHn
+  9iZEZ7AxrS7vokhMlzSr/XMUihx/8aFKtk+tMLClqxZSmBWIErWdicCGTULXCBNb
+  E/mljo4zEVKhlTWpJklMIhr55ZRrSarKFuW7en0+tpJrfsYiAmXMJNi4XAYJH7uL
+  rgJuJwSaa/dMz+VmUoo7VKtSfCoOI+6v5/z0sK3oT6sG6ZwyI47DBq2XqNC6tnAj
+  w+XmCywiTQrFzMMAvcA7rPI4F0nU1rZId51rOvvfxaONp+wgTi4P8owZLw0/j0m4
+  8C20DYi6EYx4AHDXiLpElWh3AgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8E
+  BAMCBLAwHQYDVR0OBBYEFB6ZaeWKxQjGTI+pmz7cKRmMIywwMC4GA1UdEQQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWB
+  I3NhbXVlbC53aWxsaWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEB
+  CwUAA4IBgQBVoM+pu3dpdUhZM1w051iw5GfiqclAr1Psypf16Tiod/ho//4oAu6T
+  9fj3DPX/acWV9P/FScvqo4Qgv6g4VWO5ZU7z2JmPoTXZtYMunRAmQPFL/gSUc6aK
+  vszMHIyhtyzRc6DnfW2AiVOjMBjaYv8xXZc9bduniRVPrLR4J7ozmGLh4o4uJp7w
+  x9KCFaR8Lvn/r0oJWJOqb/DMAYI83YeN2Dlt3jpwrsmsONrtC5S3gOUle5afSGos
+  bYt5ocnEpKSomR9ZtnCGljds/aeO1Xgpn2r9HHcjwnH346iNrnHmMlC7BtHUFPDg
+  Ts92S47PTOXzwPBDsrFiq3VLbRjHSwf8rpqybQBH9MfzxGGxTaETQYOd6b4e4Ag6
+  y92abGna0bmIEb4+Tx9rQ10Uijh1POzvr/VTH4bbIPy9FbKrRsIQ24qDbNJRtOpE
+  RAOsIl+HOBTb252nx1kIRN5hqQx272AJCbCjKx8egcUQKffFVVCI0nye09v5CK+a
+  HiLJ8VOFx6w=
+  -----END CERTIFICATE-----
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.