async-websocket 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da0bf747ee0c56a69b828547451fc478169ee13b8cf181a15af6ba5b7ab73b03
-  data.tar.gz: 4bb105f0a98f8b4f39020aa0882745d8915b1bec7155a5fb410f3ae985d06503
+  metadata.gz: a501ecd90b68be17ff1a832c672ed917da9edd521d478cb0da3565f596c8f9d6
+  data.tar.gz: 7e3e8cb233c53198506f2ced5a2771f150248c4de916921741f0d60ea07c79e0
 SHA512:
-  metadata.gz: 8cb039babe87b956995754dbecf8ce5b93924359b86ff5b51676fa5b9bdc1a7f0f88a85b042e04cb52d8aac900991ed3ea49eb936c6ef66760f7a7179e4d077d
-  data.tar.gz: b6fe79b03396ff4b748436cbdaad3e5430b1890ec602c3cb1373e7a1ba04f84d4afdd625007991532aea1fa184275554e97fb4a27d1c6e70ae46c598560257c9
+  metadata.gz: 0b83359dd959354e0d31463065782e7b0b86a63b900930ca44252ca228366e99ac1fb69251aa605c72ae3e8ab281add7eb522f9ee01949d2c497b5500a300e77
+  data.tar.gz: 40912574da9db4d7bde1e8d6854ac33a35c193c0a662eed6b0426a1a5152127e7275e22279ee72f97b7fea2613acd90389b7af449a1fa4d417d2c727dfcd7d54

data/.travis.yml

@@ -10,11 +10,14 @@ matrix:
     - rvm: 2.3
     - rvm: 2.4
     - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.6
+      env: COVERAGE=BriefSummary,Coveralls
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
+    - rvm: truffleruby
     - rvm: ruby-head
-    - rvm: rbx-3
   allow_failures:
-    - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-3
+    - rvm: truffleruby
+    - rvm: ruby-head

data/Gemfile

@@ -4,6 +4,5 @@ gemspec
 
 group :test do
 	gem 'rack-test'
-	gem 'simplecov'
-	gem 'coveralls', require: false
+	gem 'pry'
 end

data/Rakefile

@@ -1,6 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:test)
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec

data/async-websocket.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async-io"
 	
 	spec.add_development_dependency "async-rspec"
-	spec.add_development_dependency "falcon", "~> 0.17.0"
+	spec.add_development_dependency "falcon", "~> 0.17"
 	
+	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"

data/lib/async/websocket/client.rb

@@ -24,15 +24,15 @@ module Async
 	module WebSocket
 		# This is a basic synchronous websocket client:
 		class Client < Connection
-			def initialize(socket, url = "ws://.", headers = {})
+			def initialize(socket, url = "ws://.", **options)
 				@url = url
 
-				super socket, build_client(headers)
+				super socket, build_client(**options)
 			end
 
-			def build_client(headers)
-				::WebSocket::Driver.client(self).tap do |client|
-					headers.each do |key, value|
+			def build_client(headers: nil, **options)
+				::WebSocket::Driver.client(self, options).tap do |client|
+					headers&.each do |key, value|
 						client.set_header(key, value)
 					end
 				end

data/lib/async/websocket/server.rb

@@ -23,13 +23,13 @@ require_relative 'connection'
 module Async
 	module WebSocket
 		class Server < Connection
-			def initialize(env, socket)
+			def initialize(env, socket, **options)
 				scheme = env['rack.url_scheme'] == 'https' ? 'wss' : 'ws'
-				@url = "#{scheme}://#{env['HTTP_HOST']}#{env['REQUEST_URI']}"
 				
+				@url = "#{scheme}://#{env['HTTP_HOST']}#{env['REQUEST_URI']}"
 				@env = env
 				
-				super socket, ::WebSocket::Driver.rack(self)
+				super(socket, ::WebSocket::Driver.rack(self, options))
 			end
 			
 			attr :env
@@ -37,7 +37,7 @@ module Async
 			
 			HIJACK_RESPONSE = [-1, {}, []].freeze
 			
-			def self.open(env)
+			def self.open(env, **options)
 				if ::WebSocket::Driver.websocket?(env)
 					return nil unless env['rack.hijack?']
 					
@@ -46,7 +46,7 @@ module Async
 						env['rack.hijack'].call
 					)
 					
-					connection = self.new(env, peer)
+					connection = self.new(env, peer, options)
 					
 					return connection unless block_given?
 					

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.7.0"
+		VERSION = "0.8.0"
 	end
 end

data/spec/async/websocket/client_spec.rb

@@ -1,3 +1,23 @@
+# 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/websocket/client"
 
 RSpec.describe Async::WebSocket::Client do
@@ -19,7 +39,7 @@ RSpec.describe Async::WebSocket::Client do
 			expect(client_double).to receive(:set_header).with(key, value)
 		end
 
-		described_class.new(double(write: nil), "", headers)
+		described_class.new(double(write: nil), "", headers: headers)
 	end
 
 	context "without passing headers" do

data/spec/async/websocket/connection_spec.rb

@@ -24,11 +24,14 @@ require 'async/websocket/client'
 require 'rack/test'
 require 'falcon/server'
 require 'falcon/adapters/rack'
+require 'async/http/url_endpoint'
 
-RSpec.describe Async::WebSocket::Connection, timeout: 5 do
+require 'pry'
+
+RSpec.describe Async::WebSocket::Connection, timeout: nil do
 	include_context Async::RSpec::Reactor
 	
-	let(:server_address) {Async::IO::Endpoint.tcp('0.0.0.0', 9000)}
+	let(:server_address) {Async::HTTP::URLEndpoint.parse("http://localhost:9000")}
 	let(:app) {Rack::Builder.parse_file(File.expand_path('../connection_spec.ru', __FILE__)).first}
 	let(:server) {Falcon::Server.new(Falcon::Server.middleware(app, verbose: true), server_address)}
 
@@ -53,4 +56,23 @@ RSpec.describe Async::WebSocket::Connection, timeout: 5 do
 		
 		server_task.stop
 	end
+
+	it "should send back Sec-WebSocket-Protocol header" do
+		server_task = reactor.async do
+			server.run
+		end
+		
+		# Should send and receive Sec-WebSocket-Protocol header as
+		# `ws`
+		
+		server_address.connect do |socket|
+			client = Async::WebSocket::Client.new(socket, protocols: ['ws'])
+			
+			expect(client.next_event).to be_kind_of(WebSocket::Driver::OpenEvent)
+			
+			expect(client.driver.protocol).to be == 'ws'
+		end
+		
+		server_task.stop
+	end
 end

data/spec/async/websocket/connection_spec.ru

@@ -1,25 +1,24 @@
+# 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/websocket/server'
-
-class Upgrade
-	def initialize(app)
-		@app = app
-	end
-	
-	def call(env)
-		result = Async::WebSocket::Server.open(env) do |server|
-			read, write = IO.pipe
-			
-			Process.spawn("ls -lah", :out => write)
-			write.close
-			
-			read.each_line do |line|
-				server.send_text(line)
-			end
-			
-		end or @app.call(env)
-	end
-end
+require_relative 'upgrade'
 
 use Upgrade
 

data/spec/async/websocket/upgrade.rb

@@ -0,0 +1,41 @@
+# 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/websocket/server'
+
+class Upgrade
+	def initialize(app)
+		@app = app
+	end
+	
+	def call(env)
+		result = Async::WebSocket::Server.open(env, protocols: ['ws']) do |server|
+			read, write = IO.pipe
+			
+			Process.spawn("ls -lah", :out => write)
+			write.close
+			
+			read.each_line do |line|
+				server.send_text(line)
+			end
+			
+		end or @app.call(env)
+	end
+end

data/spec/spec_helper.rb

@@ -1,28 +1,12 @@
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
-	begin
-		require 'simplecov'
-		
-		SimpleCov.start do
-			add_filter "/spec/"
-		end
-		
-		if ENV['TRAVIS']
-			require 'coveralls'
-			Coveralls.wear!
-		end
-	rescue LoadError
-		warn "Could not load simplecov: #{$!}"
-	end
-end
-
-require "bundler/setup"
-require "async/websocket"
+require 'covered/rspec'
 
 # Shared rspec helpers:
 require "async/rspec"
 
 RSpec.configure do |config|
+	config.disable_monkey_patching!
+	
 	# Enable flags like --only-failures and --next-failure
 	config.example_status_persistence_file_path = ".rspec_status"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: covered
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +183,7 @@ files:
 - spec/async/websocket/client_spec.rb
 - spec/async/websocket/connection_spec.rb
 - spec/async/websocket/connection_spec.ru
+- spec/async/websocket/upgrade.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -197,4 +212,5 @@ test_files:
 - spec/async/websocket/client_spec.rb
 - spec/async/websocket/connection_spec.rb
 - spec/async/websocket/connection_spec.ru
+- spec/async/websocket/upgrade.rb
 - spec/spec_helper.rb