async-websocket 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0158791283f1da9ef7fe755bd019899508f3d647fc9f18984e2b7ef77a3074db'
-  data.tar.gz: 22b4fcb061a87637d7c108e465e65ae3388379850a85f1f65e8661f7d1867b1c
+  metadata.gz: 7686aad6fd1477dbc9d869ff6da2b67177ea774d79d49851e19e96625331f9f8
+  data.tar.gz: 571d4a0ef3b98e7d69a4a5b77460861db96dc1b385579125fe998fd241d40993
 SHA512:
-  metadata.gz: b6ec6a61a6b1c63545739a2dec75455a1a9a68addde791deb339f4190246e5469875f13e8fa84f45505d579073668d45dd4bdc28c833fba3f5164a8f21a4afd7
-  data.tar.gz: f37bf0833c8c894fc5d0f71248abf4c1cac83bf4a4f6b70676d6f044217ba9ac2ccb6edc60ead20dfa53c6c8c47e872eb0db559e0c2229faf6e85f03c139c049
+  metadata.gz: 8efc539eae9d51793916583673e14b664b142a8caa513dee77d227989d82e71c9b091ff50976edbfecb285c47deb0d51a03e91a5b5b3cf90ab31e3fc946d93fb
+  data.tar.gz: 1a172ec98828d65179e6a4e7e36cc155b39e7e43709244d2f57c33f4e6b643f58ac2b082d3bcfc4ffe14835349cfca02bc54f5ab4dce5231544f964049342357

data/README.md

@@ -22,45 +22,31 @@ Or install it yourself as:
 
 ## Usage
 
-Here is how to use within `Utopia::Controller`:
+Here is how to use within `Rack`:
 
-	on 'list' do |request|
-		fail! unless Async::WebSocket?(request.env)
-		
-		Async::WebSocket.open(request.env) do |connection|
-			read, write = IO.pipe
+```ruby
+#!/usr/bin/env falcon serve --concurrency 1 -c
 
-			Process.spawn("ls -lah", :out => write)
-			write.close
+require 'async/websocket/server'
 
-			read.each_line do |line|
-				connection.text(line)
-			end
+$connections = []
 
-			connection.close
-		end
+run lambda {|env|
+	Async::WebSocket::Server.open(env) do |connection|
+		$connections << connection
 		
-		succeed!
-	end
-
-`connection` is an instance of [`WebSocket::Driver`][1].
-
-[1]: https://github.com/faye/websocket-driver-ruby
-
-If you want to handle incoming messages, you must listen for these and then handle them:
-
-	on 'echo' do |request|
-		fail! unless Async::WebSocket?(request.env)
-		
-		Async::WebSocket.open(request.env) do |connection|
-			connection.on(:message) do |event|
-				connection.text(event.data)
-				connection.close
+		while message = connection.next_message
+			$connections.each do |connection|
+				connection.send_message(message)
 			end
 		end
-		
-		succeed!
 	end
+	
+	[200, {}, ["Hello World"]]
+}
+```
+
+And [here is a client program](example/client.rb) which can read input from `stdin` and send messages to the server.
 
 ## Contributing
 

data/Rakefile

@@ -1,8 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
+RSpec::Core::RakeTask.new(:test)
 
-task :default => :spec
+task :default => :test

data/{chat → examples/chat}/client.rb

@@ -35,7 +35,7 @@ Async::Reactor.run do |task|
 		end
 		
 		while message = connection.next_message
-			puts "Message from server: #{message.inspect}"
+			puts "From server: #{message.inspect}"
 		end
 	end
 end

data/{chat → examples/chat}/config.ru

@@ -2,8 +2,6 @@
 
 require 'async/websocket/server'
 
-Message = Struct.new(:user, :contents, :created_at)
-
 $connections = []
 
 run lambda {|env|
@@ -17,5 +15,6 @@ run lambda {|env|
 		end
 	end
 	
+	Async::Task.current.sleep(0.1)
 	[200, {}, ["Hello World"]]
 }

data/lib/async/websocket/server.rb

@@ -37,9 +37,10 @@ module Async
 			
 			def self.open(env)
 				if ::WebSocket::Driver.websocket?(env)
-					env['rack.hijack'].call
+					# https://github.com/rack/rack/blob/master/SPEC#L89-L93
+					peer = env['rack.hijack'].call
 					
-					connection = self.new(env, env['rack.hijack_io'])
+					connection = self.new(env, peer)
 					
 					if block_given?
 						begin

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.3.0"
+		VERSION = "0.4.0"
 	end
 end

data/spec/async/websocket/connection_spec.rb

@@ -23,13 +23,14 @@ require 'async/websocket/client'
 
 require 'rack/test'
 require 'falcon/server'
+require 'falcon/adapters/rack'
 
 RSpec.describe Async::WebSocket::Connection do
 	include_context Async::RSpec::Reactor
 	
 	let(:server_address) {Async::IO::Endpoint.tcp('0.0.0.0', 9000)}
 	let(:app) {Rack::Builder.parse_file(File.expand_path('../connection_spec.ru', __FILE__)).first}
-	let(:server) {Falcon::Server.new(app, [server_address])}
+	let(:server) {Falcon::Server.new(Falcon::Adapters::Rack.new(app), server_address)}
 
 	it "should connect to the websocket server" do
 		server_task = reactor.async do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -122,8 +122,8 @@ files:
 - README.md
 - Rakefile
 - async-websocket.gemspec
-- chat/client.rb
-- chat/config.ru
+- examples/chat/client.rb
+- examples/chat/config.ru
 - lib/async/websocket.rb
 - lib/async/websocket/client.rb
 - lib/async/websocket/connection.rb