falcon 0.35.6 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d2d4155e79287bfe7dd04ae2c5cc534be8133858c69c1c053ce26b04f08d43
-  data.tar.gz: fa93053422138e450a6f2ba8f1fbb68c62c50286d1380e727a56f9c8529a575a
+  metadata.gz: 28aa82ead35cc63c3a409d97839eadfc328f9464dfbb5c78481dabe35822b637
+  data.tar.gz: dc2ea1d97d323132509a70d7b2a86910c57aa8f728faa73d8d4a624bfa69ee2b
 SHA512:
-  metadata.gz: eb2d35183a7dcb578cb0273a8d68b559837f9b02e5ed8202ff861a05d7af5c16b8c82a2fdf2238ca1a87a30954e515d788d53543b927038e3eb25978e802d806
-  data.tar.gz: 5cefb2f9b4211e7082b9ee26e869fbf160c8ff7955f2886649904d9842e1f194bb13c1fc97cf2b1773387f40dc3bf5970af4d16f91df47cd272260e0790d3361
+  metadata.gz: 48b9092e315016c36756cb1d5863fd7ee938873770fd2a61e8566900b7e0ad8a7c6e17c7853d56b372745535ba63dbf116ca5ca773ca73106c3ee92b99cacd99
+  data.tar.gz: e9c3f3541b89fe30b724e17f3fe953713252bfd945c69676c99e35e74a4ce2f52db8c1a098b2732db80e201f58225d647a935bb3ea996eaca7cc3dc7b666afef

data/.github/workflows/development.yml

@@ -0,0 +1,45 @@
+name: Development
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+        
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+        
+        include:
+          - os: 'ubuntu'
+            ruby: 2.7
+            env: BUNDLE_GEMFILE=gems/rack1.gemfile
+          - os: 'ubuntu'
+            ruby: 2.7
+            env: BUNDLE_GEMFILE=gems/rack3.gemfile
+          - os: 'ubuntu'
+            ruby: 2.6
+            env: COVERAGE=PartialSummary,Coveralls
+    
+    runs-on: ${{matrix.os}}-latest
+    
+    steps:
+    - uses: actions/checkout@v1
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+    
+    - name: Installing packages (ubuntu)
+      if: matrix.os == 'ubuntu'
+      run: sudo apt-get install apache2-utils
+    
+    - name: Install dependencies
+      run: ${{matrix.env}} bundle install
+    
+    - name: Run tests
+      run: ${{matrix.env}} bundle exec rspec

data/.travis.yml

@@ -11,12 +11,13 @@ addons:
     packages:
     - wrk
 
+script: bundle exec rspec
+
 after_script:
   - bundle exec rake benchmark:compare
 
 matrix:
   include:
-    - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
     - rvm: 2.6

data/Gemfile

@@ -5,12 +5,12 @@ source 'https://rubygems.org'
 gemspec
 
 # gem "async-container", path: "../async-container"
+# gem "async-websocket", path: "../async-websocket"
 
 group :development do
 	gem 'ruby-prof', platform: :mri
 end
 
 group :test do
-	gem 'pry'
 	gem 'puma'
 end

data/examples/server/standalone.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'async'
+require 'async/http/endpoint'
+require 'async/websocket/adapters/rack'
+
+require 'falcon'
+
+module WebSocketApp
+	def self.call(env)
+		Async::WebSocket::Adapters::Rack.open(env, protocols: %w[ws]) do |connection|
+			while (message = connection.read)
+				pp message
+			end
+		end or [200, [], ["Websocket only."]]
+	end
+end
+
+Async do
+	websocket_endpoint = Async::HTTP::Endpoint.parse('http://127.0.0.1:3000')
+	
+	app = Falcon::Server.middleware(WebSocketApp)
+	
+	server = Falcon::Server.new(app, websocket_endpoint)
+	
+	server.run.each(&:wait)
+end

data/falcon.gemspec

@@ -14,15 +14,15 @@ Gem::Specification.new do |spec|
 		f.match(%r{^(test|spec|features)/})
 	end
 	
-	spec.required_ruby_version = '>= 2.4.0'
+	spec.required_ruby_version = '~> 2.4'
 	
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 		
 	spec.add_dependency "async", "~> 1.13"
 	spec.add_dependency "async-io", "~> 1.22"
-	spec.add_dependency "async-http", "~> 0.50.4"
-	spec.add_dependency "async-http-cache", "~> 0.1.0"
+	spec.add_dependency "async-http", "~> 0.51.0"
+	spec.add_dependency "async-http-cache", "~> 0.2.0"
 	spec.add_dependency "async-container", "~> 0.16.0"
 	
 	spec.add_dependency "rack", ">= 1.0"
@@ -34,12 +34,12 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'process-metrics', '~> 0.1.0'
 	
 	spec.add_development_dependency "async-rspec", "~> 1.7"
-	spec.add_development_dependency "async-websocket", "~> 0.12.0"
+	spec.add_development_dependency "async-websocket", "~> 0.14.0"
 	spec.add_development_dependency "async-process", "~> 1.1"
 	
 	spec.add_development_dependency "bake"
-	spec.add_development_dependency "covered", "~> 0.10"
+	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
-	spec.add_development_dependency "rake"
+	spec.add_development_dependency "bake-bundler"
 end

data/lib/falcon/adapters/output.rb

@@ -43,16 +43,15 @@ module Falcon
 				elsif status == 200 and body.respond_to?(:to_path)
 					# Don't mangle partial responsese (206)
 					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}
-					return self.new(headers, body, length)
+				elsif body.is_a?(Array)
+					length ||= body.sum(&:bytesize)
+					return self.new(body, length)
 				else
-					return self.new(headers, body, length)
+					return self.new(body, length)
 				end
 			end
 			
-			def initialize(headers, body, length)
+			def initialize(body, length)
 				@length = length
 				@body = body
 				

data/lib/falcon/adapters/response.rb

@@ -67,6 +67,11 @@ module Falcon
 					body = Output.wrap(status, headers, body)
 				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

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.35.6
+  version: 0.36.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.4
+        version: 0.51.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.4
+        version: 0.51.0
 - !ruby/object:Gem::Dependency
   name: async-http-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: async-process
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +210,16 @@ dependencies:
   name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -273,13 +273,12 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".github/FUNDING.yml"
+- ".github/workflows/development.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
-- Rakefile
-- VIRTUAL.md
 - bake/falcon/supervisor.rb
 - bin/falcon
 - bin/falcon-host
@@ -305,6 +304,7 @@ files:
 - examples/sequel/Gemfile
 - examples/sequel/config.ru
 - examples/sequel/data.sqlite3
+- examples/server/standalone.rb
 - examples/sinatra/Gemfile
 - examples/sinatra/Gemfile.lock
 - examples/sinatra/config.ru
@@ -371,9 +371,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/Rakefile

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:test)
-
-task :default => :test
-
-# Load all rake tasks:
-import(*Dir.glob('tasks/**/*.rake'))
-
-task :server do
-	require 'async/reactor'
-	require 'async/http/server'
-	
-	app = lambda do |env|
-		[200, {}, ["Hello World"]]
-	end
-
-	server = Async::HTTP::Server.new([
-		Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true)
-	], app)
-
-	Async::Reactor.run do
-		server.run
-	end
-end
-
-task :client do
-	require 'async/reactor'
-	require 'async/http/client'
-	
-	client = Async::HTTP::Client.new([
-		Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true)
-	])
-	
-	Async::Reactor.run do
-		response = client.get("/")
-		
-		puts response.inspect
-	end
-end
-
-task :wrk do
-	require 'async/reactor'
-	require 'async/http/server'
-	
-	app = lambda do |env|
-		[200, {}, ["Hello World"]]
-	end
-
-	server = Async::HTTP::Server.new([
-		Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true)
-	], app)
-
-	process_count = Etc.nprocessors
-
-	pids = process_count.times.collect do
-		fork do
-			Async::Reactor.run do
-				server.run
-			end
-		end
-	end
-
-	url = "http://127.0.0.1:9294/"
-	
-	connections = process_count
-	system("wrk", "-c", connections.to_s, "-d", "2", "-t", connections.to_s, url)
-
-	pids.each do |pid|
-		Process.kill(:KILL, pid)
-		Process.wait pid
-	end
-end
-

data/VIRTUAL.md

@@ -1,14 +0,0 @@
-For every `falcon.rb`:
-
-Spawn a child which loads falcon.rb:
-	- Bind to `server.ipc`
-
-Server loads falcon.rb:
-	- Figure out whether it is application or not.
-
-Server forks client:
-	- Client binds to `server.ipc`.
-	- Server connects to `server.ipc`.
-
-
-Server expects client to bind to `server.ipc`.