async-websocket 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ff856912dcea7dfba40abc7ec2c5fd9366aa31c32752c142b1cc692fa8e8237
-  data.tar.gz: 3d697fbb3fb107ba7cac79978a57fcae7864255f6b133b8fcb9b967d0a150b06
+  metadata.gz: c110468d58034b4bbdd08e4d39482bf24cf99207dba5f5fa478251c8751f3dbe
+  data.tar.gz: cd992b36fb505345834c51ae31523e35e9058d846bd1b4a85ddf43143eebc17a
 SHA512:
-  metadata.gz: 7c01550d7db048683e2f6e16b45b38ae4ac183b730fec333e5a212141d85eb5dcf1cdabf26d596c39d3a321f89acdb9d777a02e450a48c3925b2ffda49603fc2
-  data.tar.gz: 96b6a20b28600c256baf55ed3b9eeed37f318e8976150bdd29b38a5dc2dbf83371e7e445dd3bd233ce407c1600732e3a2d519cc0255d17f0dfd95dafec7e831d
+  metadata.gz: 36c2509873572672d504f0de96785840b52d3993b3cc7febca16d9f08ed85f7e3e73c4995380aea74de3a2d431f4db772ed4c1b4bc268c698fea7ecf7445cf01
+  data.tar.gz: d226a93fa0f972789b5e1f9d842fe0ec1dcffefff3b846b2e977555fc29cafa23ffe2c20782f28d39dbdea6d67bccce5fc00120e0829fe0876019f08963c39ba

data/.editorconfig

@@ -0,0 +1,4 @@
+
+[*]
+indent_style = tab
+indent_size = 2

data/.travis.yml

@@ -1,15 +1,15 @@
 language: ruby
-sudo: false
-dist: trusty
 cache: bundler
 
+before_script:
+  - gem update --system
+  - gem install bundler
+
 matrix:
   include:
-    - rvm: 2.0
-    - rvm: 2.1
-    - rvm: 2.2
     - rvm: 2.3
     - rvm: 2.4
+    - rvm: 2.5
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head

data/README.md

@@ -46,7 +46,7 @@ run lambda {|env|
 }
 ```
 
-And [here is a client program](example/client.rb) which can read input from `stdin` and send messages to the server.
+And [here is a client program](examples/chat/client.rb) which can read input from `stdin` and send messages to the server.
 
 ## Contributing
 

data/async-websocket.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async-io"
 	
 	spec.add_development_dependency "async-rspec"
-
+	spec.add_development_dependency "falcon", "~> 0.15.0"
+	
 	spec.add_development_dependency "bundler", "~> 1.6"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
-	spec.add_development_dependency "falcon"
 end

data/examples/chat/client.rb

@@ -5,10 +5,14 @@ require 'async/io/stream'
 require 'async/http/url_endpoint'
 require 'async/websocket/client'
 
-URL = ARGV.pop
-USER = ARGV.pop
+USER = ARGV.pop || "anonymous"
+URL = ARGV.pop || "ws://localhost:9292"
 
 Async::Reactor.run do |task|
+	stdin = Async::IO::Stream.new(
+		Async::IO::Generic.new($stdin)
+	)
+	
 	endpoint = Async::HTTP::URLEndpoint.parse(URL)
 	
 	endpoint.connect do |socket|
@@ -20,10 +24,6 @@ Async::Reactor.run do |task|
 		})
 		
 		task.async do
-			stdin = Async::IO::Stream.new(
-				Async::IO::Generic.new($stdin)
-			)
-			
 			puts "Waiting for input..."
 			while line = stdin.read_until("\n")
 				puts "Sending text: #{line}"

data/examples/middleware/client.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require 'async/reactor'
+require 'async/io/stream'
+require 'async/http/url_endpoint'
+require 'async/websocket/client'
+
+USER = ARGV.pop || "anonymous"
+URL = ARGV.pop || "ws://localhost:9292"
+
+Async::Reactor.run do |task|
+	stdin = Async::IO::Stream.new(
+		Async::IO::Generic.new($stdin)
+	)
+	
+	endpoint = Async::HTTP::URLEndpoint.parse(URL)
+	
+	endpoint.connect do |socket|
+		connection = Async::WebSocket::Client.new(socket, URL)
+		
+		connection.send_message({
+			user: USER,
+			status: "connected",
+		})
+		
+		task.async do
+			puts "Waiting for input..."
+			begin
+				while line = stdin.read_until("\n")
+					puts "Sending text: #{line}"
+					connection.send_message({
+						user: USER,
+						text: line,
+					})
+				end
+			rescue
+				puts "Client error: #{$!}"
+			end
+		end
+		
+		while message = connection.next_message
+			puts "From server: #{message.inspect}"
+		end
+	end
+end

data/examples/middleware/config.ru

@@ -0,0 +1,77 @@
+#!/usr/bin/env falcon --verbose serve --concurrency 1 -c
+
+require 'async/websocket/server'
+
+Async.logger.level = Logger::DEBUG
+
+class RackUpgrade
+	def initialize(app)
+		@app = app
+	end
+	
+	def call(env)
+		if ::WebSocket::Driver.websocket?(env)
+			env['rack.upgrade?'] = :websocket
+			
+			response = @app.call(env)
+			
+			if handler = env['rack.upgrade']
+				Async::WebSocket::Server.open(env) do |connection|
+					begin
+						while event = connection.next_event
+							if event.is_a? ::WebSocket::Driver::OpenEvent
+								handler.on_open(connection) if handler.respond_to? :on_open
+							elsif event.is_a? ::WebSocket::Driver::MessageEvent
+								handler.on_message(connection, JSON.parse(event.data))
+							elsif event.is_a? ::WebSocket::Driver::CloseEvent
+								handler.on_close(connection) if handler.respond_to? :on_close
+							end
+						end
+					ensure
+						handler.on_shutdown(connection) if handler.respond_to? :on_shutdown
+					end
+				end
+			end
+		else
+			return @app.call(env)
+		end
+	end
+end
+
+class Chatty
+	def initialize
+		@connections = Set.new
+	end
+	
+	def on_open(connection)
+		Async.logger.info(self) {"on_open: #{connection}"}
+		@connections << connection
+	end
+	
+	def on_message(connection, message)
+		Async.logger.info(self) {"on_message: #{connection} -> #{message}"}
+		
+		@connections.each do |connection|
+			connection.send_message(message)
+		end
+	end
+	
+	def on_shutdown(connection)
+		Async.logger.info(self) {"on_shutdown: #{connection}"}
+		@connections.delete(connection)
+		
+		@connections.each do |connection|
+			connection.send_message(message)
+		end
+	end
+end
+
+use RackUpgrade
+
+CHATTY = Chatty.new
+
+run lambda {|env|
+	env['rack.upgrade'] = CHATTY
+	
+	return [200, {}, []]
+}

data/examples/utopia/.bowerrc

@@ -0,0 +1,4 @@
+{
+  "directory": "lib/components",
+  "public": "public/_components"
+}

data/examples/utopia/.gitignore

@@ -0,0 +1,9 @@
+# Development specific:
+.rspec_status
+.tags*
+
+# Temporary data should not be added to the repository:
+tmp/
+
+# This file should only ever exist on production, and may contain sensitive information:
+config/environment.yaml

data/examples/utopia/.rspec

@@ -0,0 +1,4 @@
+--format documentation
+--backtrace
+--warnings
+--require spec_helper

data/examples/utopia/Gemfile

@@ -0,0 +1,35 @@
+
+source "https://rubygems.org"
+
+gem "utopia", "~> 2.3.0"
+# gem "utopia-gallery"
+# gem "utopia-analytics"
+
+gem "rake"
+gem "bundler"
+
+gem 'async-websocket'
+
+gem "rack-freeze", "~> 1.2"
+
+group :development do
+	# For `rake server`:
+	gem "guard-falcon", require: false
+	gem 'guard-rspec', require: false
+	
+	# For `rake console`:
+	gem "pry"
+	gem "rack-test"
+	
+	# For `rspec` testing:
+	gem "rspec"
+	gem "simplecov"
+	
+	# For testing:
+	gem 'async-rspec'
+end
+
+group :production do
+	# Used for passenger-config to restart server after deployment:
+	gem "passenger"
+end

data/examples/utopia/Guardfile

@@ -0,0 +1,29 @@
+
+group :development do
+	guard :falcon, port: 9292 do
+		watch('Gemfile.lock')
+		watch('config.ru')
+		watch(%r{^config|lib|pages/.*})
+		
+		notification :off
+	end
+end
+
+group :test do
+	guard :rspec, cmd: 'rspec' do
+		# Notifications can get a bit tedious:
+		# notification :off
+		
+		# Re-run specs if they are changed:
+		watch(%r{^spec/.+_spec\.rb$})
+		watch('spec/spec_helper.rb') {'spec'}
+		
+		# Run relevent specs if files in `lib/` or `pages/` are changed:
+		watch(%r{^lib/(.+)\.rb$}) {|match| "spec/lib/#{match[1]}_spec.rb" }
+		watch(%r{^pages/(.+)\.(rb|xnode)$}) {|match| "spec/pages/#{match[1]}_spec.rb"}
+		watch(%r{^pages/(.+)controller\.rb$}) {|match| Dir.glob("spec/pages/#{match[1]}*_spec.rb")}
+		
+		# If any files in pages changes, ensure the website still works:
+		watch(%r{^pages/.*}) {'spec/website_spec.rb'}
+	end
+end

data/examples/utopia/README.md

@@ -0,0 +1,16 @@
+# Example WebSocket Chat Server
+
+This is a simple chat client/server implementation with specs.
+
+## Starting Development Server
+
+To start the development server, simply execute
+
+	> rake
+	Generating transient session key for development...
+	20:57:36 - INFO - Starting Falcon HTTP server on localhost:9292
+	20:57:36 - INFO - Guard::RSpec is running
+	20:57:36 - INFO - Guard is now watching at '...'
+	[1] guard(main)>
+
+Then browse http://localhost:9292 (or as specified) to see your new site.

data/examples/utopia/Rakefile

@@ -0,0 +1,8 @@
+
+require 'pathname'
+SITE_ROOT = Pathname.new(__dir__).realpath
+
+# Load all rake tasks:
+import(*Dir.glob('tasks/**/*.rake'))
+
+task :default => :development

data/examples/utopia/config.ru

@@ -0,0 +1,47 @@
+#!/usr/bin/env rackup
+
+require_relative 'config/environment'
+
+require 'rack/freeze'
+
+if RACK_ENV == :production
+	# Handle exceptions in production with a error page and send an email notification:
+	use Utopia::Exceptions::Handler
+	use Utopia::Exceptions::Mailer
+else
+	# We want to propate exceptions up when running tests:
+	use Rack::ShowExceptions unless RACK_ENV == :test
+	
+	# Serve the public directory in a similar way to the web server:
+	use Utopia::Static, root: 'public'
+end
+
+use Rack::Sendfile
+
+use Utopia::ContentLength
+
+use Utopia::Redirection::Rewrite,
+	'/' => '/client/index'
+
+use Utopia::Redirection::DirectoryIndex
+
+use Utopia::Redirection::Errors,
+	404 => '/errors/file-not-found'
+
+use Utopia::Localization,
+	:default_locale => 'en',
+	:locales => ['en', 'de', 'ja', 'zh']
+
+require 'utopia/session'
+use Utopia::Session,
+	:expires_after => 3600 * 24,
+	:secret => ENV['UTOPIA_SESSION_SECRET']
+
+use Utopia::Controller
+
+use Utopia::Static
+
+# Serve dynamic content
+use Utopia::Content
+
+run lambda { |env| [404, {}, []] }

data/examples/utopia/config/README.md

@@ -0,0 +1,7 @@
+# Utopia Config
+
+This directory contains `environment.rb` which is used to initialize the running environment for tasks and servers.
+
+## Setting Environment Variables
+
+If you wish to set environment variables on a per-deployment basis, you can do so by creating an `config/environment.yaml` and populating it with key-value pairs.

data/examples/utopia/config/environment.rb

@@ -0,0 +1,8 @@
+
+require 'bundler/setup'
+Bundler.setup
+
+require 'utopia/setup'
+Utopia.setup
+
+RACK_ENV = ENV.fetch('RACK_ENV', :development).to_sym unless defined? RACK_ENV

data/examples/utopia/lib/readme.txt

@@ -0,0 +1 @@
+You can add additional code for your application in this directory, and require it directly from the config.ru.

data/examples/utopia/pages/_heading.xnode

@@ -0,0 +1,2 @@
+<?r document.attributes[:title] ||= content ?>
+<h1><utopia:content/></h1>

data/examples/utopia/pages/_page.xnode

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<?r response.cache! ?>
+		
+		<?r if title = self[:title] ?>
+			<title>#{title.gsub(/<.*?>/, "")} - Utopia</title>
+		<?r else ?>
+			<title>Utopia</title>
+		<?r end ?>
+		
+		<base href="#{first.node.uri_path}"/>
+		<meta name="viewport" content="width=device-width, initial-scale=1"/>
+		
+		<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
+		
+		<link rel="icon" type="image/png" href="/_static/icon.png" />
+		<link rel="stylesheet" href="/_static/site.css" type="text/css" media="screen" />
+	</head>
+
+	<body class="#{attributes[:class]}">
+		<header>
+			<img src="/_static/utopia.svg" />
+		</header>
+
+		<div id="page">
+			<utopia:content/>
+		</div>
+	</body>
+</html>

data/examples/utopia/pages/client/client.js

@@ -0,0 +1,28 @@
+
+var url = new URL('/server/connect', window.location.href);
+url.protocol = url.protocol.replace('http', 'ws');
+
+console.log("Connecting to server", url);
+var server = new WebSocket(url.href);
+console.log("Connected to", server);
+
+server.onopen = function(event) {
+	chat.onkeypress = function(event) {
+		if (event.keyCode == 13) {
+			server.send(JSON.stringify({text: chat.value}));
+			
+			chat.value = "";
+		}
+	}
+};
+
+server.onmessage = function(event) {
+	console.log("Got message", event);
+	
+	var message = JSON.parse(event.data);
+	
+	var pre = document.createElement('pre');
+	pre.innerText = message.text;
+	
+	response.appendChild(pre);
+};

data/examples/utopia/pages/client/index.xnode

@@ -0,0 +1,8 @@
+<content:page>
+	<content:heading>Client</content:heading>
+	
+	<script src="client.js?#{rand}"></script>
+	<section id="response" style="border: 1px;"></section>
+	
+	<input id="chat" />
+</content:page>

data/examples/utopia/pages/errors/exception.xnode

@@ -0,0 +1,5 @@
+<content:page>
+	<content:heading>Exception</content:heading>
+	
+	<p>It seems like something didn't quite work out as expected!</p>
+</content:page>

data/examples/utopia/pages/errors/file-not-found.xnode

@@ -0,0 +1,5 @@
+<content:page>
+	<content:heading>File Not Found</content:heading>
+	
+	<p>The file you requested is unfortunately not available at this time!</p>
+</content:page>

data/examples/utopia/pages/links.yaml

@@ -0,0 +1,2 @@
+errors:
+    display: false

data/examples/utopia/pages/server/controller.rb

@@ -0,0 +1,21 @@
+
+prepend Actions
+
+require 'async/websocket/server'
+
+$connections = []
+
+on 'connect' do |request|
+	Async::WebSocket::Server.open(request.env) do |connection|
+		$connections << connection
+		
+		while message = connection.next_message
+			$connections.each do |connection|
+				puts "Server sending message: #{message.inspect}"
+				connection.send_message(message)
+			end
+		end
+	end
+	
+	succeed!
+end

data/examples/utopia/public/_static/site.css

@@ -0,0 +1,205 @@
+
+html {
+	font-family: "PT Sans", Verdana, Helvetica, Arial, sans-serif;
+	font-size: 16px;
+}
+
+pre {
+	tab-size: 2;
+}
+
+@media (min-width: 40em) {
+	html {
+		font-size: 18px;
+	}
+	
+	pre {
+		tab-size: 4;
+	}
+}
+
+@media (min-width: 80em) {
+	html {
+		font-size: 20px;
+	}
+	
+	pre {
+		tab-size: 4;
+	}
+}
+
+body {
+	padding: 0;
+	margin: 0;
+	
+	background-color: #fafafa;
+}
+
+body > header {
+	margin: 1rem 0 1rem 0;
+	
+	background-color: white;
+	
+	background-image: url(utopia-background.svg);
+	
+	box-shadow: 0 0 20px rgba(0, 0, 0, 0.1);
+}
+
+body > header img {
+	display: block;
+	margin: auto;
+	height: 4rem;
+}
+
+p, ul, ol {
+	color: #555;
+}
+
+p strong {
+	color: #222;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	margin: 2rem 1rem 1rem 1rem;
+	color: #4E8DD9;
+}
+
+h1 {
+	margin-bottom: 4rem;
+}
+
+h2 {
+	margin-top: 6rem;
+}
+
+img {
+	border: none;
+}
+
+a {
+	color: #33a;
+}
+
+a:hover {
+	color: #55c;
+}
+
+p, ul, ol, dl, h3 {
+	margin: 2rem;
+}
+
+li {
+	margin: 0.2rem;
+}
+
+li > ul, li > ol {
+	margin: 0;
+}
+
+pre {
+	overflow: auto;
+	
+	padding: 1rem 2rem;
+	font-size: 0.8rem;
+	
+	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	
+	background-color: #eee;
+}
+
+h3 {
+	border-bottom: 1px solid #ccf;
+}
+
+ul {
+	margin-bottom: 1rem;
+}
+
+h2, h3, h4, h5, h6 {
+	font-weight: normal;
+}
+
+body.front h1 {
+	font-weight: normal;
+	font-size: 300%;
+	color: #F89432;
+
+	text-align: center;
+}
+
+footer {
+	text-align: right;
+	margin: 2rem;
+	font-size: 0.65rem;
+	color: #aaa;
+}
+
+nav {
+	position: absolute;
+	margin: 2.5rem;
+	font-size: 0.8rem;
+	color: #aaa;
+}
+
+section.features {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-around;
+	
+	margin: 1rem;
+}
+
+section.features > div {
+	box-sizing: border-box;
+	
+	flex-basis: 20rem;
+	flex-grow: 1;
+	
+	color: #171e42;
+	margin: 1rem;
+	padding: 1rem;
+	
+	padding-left: 3rem;
+	
+	position: relative;
+}
+
+section.features > div i {
+	position: absolute;
+	left: 0rem;
+	
+	font-size: 1.5rem;
+	text-align: center;
+	
+	width: 3rem;
+	color: #fafafa;
+	text-shadow: 0px 0px 1px #000;
+}
+
+section.features p {
+	margin: 0;
+	maring-bottom: 1rem;
+	font-size: 80%;
+}
+
+section.features h2 {
+	margin: 0;
+	font-size: 1.1rem;
+	padding: 0;
+}
+
+form fieldset {
+	border: 0;
+}
+
+form fieldset textarea {
+	box-sizing: border-box;
+	
+	width: 100%;
+	height: 10rem;
+}
+
+form fieldset.footer {
+	text-align: right;
+}

data/examples/utopia/public/_static/utopia-background.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 10 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><rect x="0" y="0" width="10" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="10" height="24" style="fill:#4e8dd8;"/></svg>

data/examples/utopia/public/_static/utopia.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 420 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><rect x="0" y="0" width="420" height="56" style="fill:#f79433;"/><rect x="0" y="56" width="420" height="24" style="fill:#4e8dd8;"/><g><path d="M75.145,70.819c2.37,-3.097 4.173,-6.921 5.111,-11.365c0.91,-4.318 1.498,-9.261 1.498,-14.692l0,-44.762l-62.754,0l0,44.762c0,2.628 0.244,5.333 0.407,8.035c0.168,2.782 0.674,5.515 1.345,8.118c0.68,2.644 1.739,5.173 3.067,7.517c1.363,2.405 3.263,4.526 5.609,6.303c2.319,1.755 5.245,3.163 8.677,4.172c1.617,0.478 3.416,1.093 5.354,1.093l13.856,0c3.071,0 5.797,-1.058 8.131,-2.001c4.042,-1.631 7.305,-4.049 9.699,-7.18Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M151.481,18.701l0,-18.701l-62.754,-0.022l0,18.723l22.246,0l0.02,61.299l17.93,0l-0.02,-61.299l22.578,0Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M229.926,39.999c0,-22.051 -16.979,-39.992 -37.852,-39.992c-20.872,0 -37.851,17.942 -37.851,39.992c0,22.054 16.979,39.994 37.851,39.994c20.873,0 37.852,-17.94 37.852,-39.994Z" style="fill:#fff;fill-rule:nonzero;"/><path d="M269.238,50.909c9.717,0 17.181,-2.066 22.183,-6.395c5.087,-4.399 7.667,-10.942 7.667,-19.575c0,-3.257 -0.393,-5.962 -1.167,-8.476c-0.778,-2.528 -1.883,-4.934 -3.281,-6.814c-1.401,-1.882 -3.098,-3.458 -5.045,-4.703c-1.895,-1.21 -4.003,-2.198 -6.264,-2.943c-2.239,-0.737 -4.64,-1.263 -7.139,-1.56c-2.464,-0.292 -5.016,-0.443 -7.587,-0.443l-29.468,0l0,80l17.93,0l0,-29.091l12.171,0Z" style="fill:#fff;fill-rule:nonzero;"/><rect x="304.879" y="0" width="17.93" height="80" style="fill:#fff;"/><path d="M362.589,0l-29.477,80l75.888,0l-31.247,-80l-15.164,0Z" style="fill:#fff;fill-rule:nonzero;"/></g></g></svg>

data/examples/utopia/public/readme.txt

@@ -0,0 +1 @@
+This directory is required by Apache/Phusion Passenger and contains static assets that are typically served using sendfile.

data/examples/utopia/spec/spec_helper.rb

@@ -0,0 +1,31 @@
+
+if ENV['COVERAGE']
+	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 'utopia'
+
+require 'async/rspec'
+
+RSpec.configure do |config|
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = '.rspec_status'
+
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
+end

data/examples/utopia/spec/website_context.rb

@@ -0,0 +1,11 @@
+
+require 'rack/test'
+
+RSpec.shared_context "website" do
+	include Rack::Test::Methods
+	
+	let(:rackup_path) {File.expand_path('../config.ru', __dir__)}
+	let(:rackup_directory) {File.dirname(rackup_path)}
+	
+	let(:app) {Rack::Builder.parse_file(rackup_path).first}
+end

data/examples/utopia/spec/website_spec.rb

@@ -0,0 +1,56 @@
+
+require_relative 'website_context'
+
+require 'falcon/server'
+require 'falcon/adapters/rack'
+
+require 'async/http/url_endpoint'
+require 'async/websocket/client'
+
+# Learn about best practice specs from http://betterspecs.org
+RSpec.describe "my website" do
+	include_context "website"
+	
+	it "should have an accessible front page" do
+		get "/"
+		
+		follow_redirect!
+		
+		expect(last_response.status).to be == 200
+	end
+	
+	context "websockets" do
+		include_context Async::RSpec::Reactor
+		
+		let(:endpoint) {Async::HTTP::URLEndpoint.parse("http://localhost:9282")}
+		let(:server) {Falcon::Server.new(Falcon::Adapters::Rack.new(app), endpoint)}
+		
+		let(:hello_message) do
+			{
+				"user" => "test",
+				"text" => "Hello World",
+			}
+		end
+		
+		let!(:server_task) do
+			server_task = reactor.async do
+				server.run
+			end
+		end
+		
+		after(:each) do
+			server_task.stop
+		end
+		
+		it "can connect to server" do
+			endpoint.connect do |socket|
+				connection = Async::WebSocket::Client.new(socket, "ws://localhost/server/connect")
+				
+				connection.send_message(hello_message)
+				
+				message = connection.next_message
+				expect(message).to be == hello_message
+			end
+		end
+	end
+end

data/examples/utopia/tasks/bower.rake

@@ -0,0 +1,45 @@
+
+namespace :bower do
+	desc 'Load the .bowerrc file and setup the environment for other tasks.'
+	task :bowerrc do
+		require 'json'
+		
+		bowerrc_path = SITE_ROOT + ".bowerrc"
+		bowerrc = JSON.load(File.read(bowerrc_path))
+		
+		@bower_package_root = SITE_ROOT + bowerrc['directory']
+		@bower_install_root = SITE_ROOT + bowerrc['public']
+		@bower_install_method = (bowerrc['install'] || :copy).to_sym
+	end
+	
+	desc 'Update the bower packages and link into the public directory.'
+	task :update => :bowerrc do
+		require 'fileutils'
+		require 'utopia/path'
+		
+		#sh %W{bower update}
+		
+		@bower_package_root.children.select(&:directory?).collect(&:basename).each do |package_directory|
+			install_path = @bower_install_root + package_directory
+			package_path = @bower_package_root + package_directory
+			dist_path = package_path + 'dist'
+			
+			FileUtils::Verbose.rm_rf install_path
+			FileUtils::Verbose.mkpath(install_path.dirname)
+			
+			# If a package has a dist directory, we only symlink that... otherwise we have to do the entire package, and hope that bower's ignore was setup correctly:
+			if File.exist? dist_path
+				link_path = Utopia::Path.shortest_path(dist_path, install_path)
+			else
+				link_path = Utopia::Path.shortest_path(package_path, install_path)
+			end
+			
+			if @bower_install_method == :symlink
+				# This is useful for some
+				FileUtils::Verbose.ln_s link_path, install_path
+			else
+				FileUtils::Verbose.cp_r File.expand_path(link_path, install_path), install_path
+			end
+		end
+	end
+end

data/examples/utopia/tasks/deploy.rake

@@ -0,0 +1,13 @@
+
+desc 'Run by git post-update hook when deployed to a web server'
+task :deploy do
+	# This task is typiclly run after the site is updated but before the server is restarted.
+end
+
+desc 'Restart the application server'
+task :restart do
+	# This task is run after the deployment task above.
+	if passenger_config = `which passenger-config`.chomp!
+		sh(passenger_config, 'restart-app', '--ignore-passenger-not-running', SITE_ROOT.to_s)
+	end
+end

data/examples/utopia/tasks/development.rake

@@ -0,0 +1,34 @@
+
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:test) do |task|
+	task.rspec_opts = %w{--require simplecov} if ENV['COVERAGE']
+end
+
+task :coverage do
+	ENV['COVERAGE'] = 'y'
+end
+
+desc 'Start the development server.'
+task :server => :environment do
+	exec('guard', '-g', 'development')
+end
+
+desc 'Start the development environment which includes web server and tests.'
+task :development => :environment do
+	exec('guard', '-g', 'development,test')
+end
+
+desc 'Start an interactive console for your web application'
+task :console => :environment do
+	require 'pry'
+	require 'rack/test'
+	
+	include Rack::Test::Methods
+	
+	def app
+		@app ||= Rack::Builder.parse_file(SITE_ROOT + 'config.ru').first
+	end
+	
+	Pry.start
+end

data/examples/utopia/tasks/environment.rake

@@ -0,0 +1,17 @@
+
+desc 'Set up the environment for running your web application'
+task :environment do |task|
+	require SITE_ROOT + 'config/environment'
+	
+	# We ensure this is part of the shell environment so if other commands are invoked they will work correctly.
+	ENV['RACK_ENV'] = RACK_ENV.to_s if defined?(RACK_ENV)
+	ENV['DATABASE_ENV'] = DATABASE_ENV.to_s if defined?(DATABASE_ENV)
+	
+	# This generates a consistent session secret if one was not already provided:
+	if ENV['UTOPIA_SESSION_SECRET'].nil?
+		require 'securerandom'
+		
+		warn 'Generating transient session key for development...'
+		ENV['UTOPIA_SESSION_SECRET'] = SecureRandom.hex(32)
+	end
+end

data/examples/utopia/tasks/log.rake

@@ -0,0 +1,17 @@
+
+task :log do
+	require 'utopia/logger'
+	LOGGER = Utopia::Logger.new
+end
+
+namespace :log do
+	desc "Increase verbosity of logger to info."
+	task :info => :log do
+		LOGGER.level = Logger::INFO
+	end
+
+	desc "Increase verbosity of global debug."
+	task :debug => :log do
+		LOGGER.level = Logger::DEBUG
+	end
+end

data/examples/utopia/tasks/static.rake

@@ -0,0 +1,43 @@
+
+namespace :static do
+	task :static_environment do
+		RACK_ENV ||= :static
+		DATABASE_ENV ||= :production
+		SERVER_PORT ||= 9291
+	end
+
+	desc "Generate a static copy of the site."
+	task :generate => [:static_environment, :environment] do
+		require 'falcon/server'
+		require 'async/io'
+		require 'async/container'
+		
+		config_path = SITE_ROOT + 'config.ru'
+		container_class = Async::Container::Threaded
+		
+		app, options = Rack::Builder.parse_file(config_path.to_s)
+		
+		container = container_class.new(concurrency: 2) do
+			server = Falcon::Server.new(app, [
+				Async::IO::Endpoint.parse("tcp://localhost:#{SERVER_PORT}", reuse_port: true)
+			])
+			
+			server.run
+		end
+		
+		output_path = ENV.fetch('OUTPUT_PATH') {SITE_ROOT + 'static'}
+		
+		# Delete any existing stuff:
+		FileUtils.rm_rf(output_path)
+		
+		# Copy all public assets:
+		Dir.glob(SITE_ROOT + 'public/*').each do |path|
+			FileUtils.cp_r(path, output_path)
+		end
+		
+		# Generate HTML pages:
+		system("wget", "--mirror", "--recursive", "--continue", "--convert-links", "--adjust-extension", "--no-host-directories", "--directory-prefix", output_path.to_s, "http://localhost:#{SERVER_PORT}")
+		
+		container.stop
+	end
+end

data/lib/async/websocket.rb

@@ -21,3 +21,5 @@
 require_relative 'websocket/version'
 require_relative 'websocket/server'
 require_relative 'websocket/client'
+
+require 'async/io'

data/lib/async/websocket/connection.rb

@@ -21,10 +21,14 @@
 require 'websocket/driver'
 require 'json'
 
+require 'async/io/stream'
+
 module Async
 	module WebSocket
 		# This is a basic synchronous websocket client:
 		class Connection
+			BLOCK_SIZE = Async::IO::Stream::BLOCK_SIZE
+			
 			EVENTS = [:open, :message, :close]
 			
 			def initialize(socket, driver)
@@ -50,8 +54,10 @@ module Async
 			attr :url
 			
 			def next_event
+				@socket.flush
+				
 				while @queue.empty?
-					data = @socket.read(1024)
+					data = @socket.readpartial(BLOCK_SIZE)
 					
 					if data and !data.empty?
 						@driver.parse(data)
@@ -75,6 +81,10 @@ module Async
 				end
 			end
 			
+			def send_text(text)
+				@driver.text(text)
+			end
+			
 			def send_message(message)
 				@driver.text(JSON.dump(message))
 			end

data/lib/async/websocket/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module WebSocket
-		VERSION = "0.4.1"
+		VERSION = "0.5.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-websocket
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-driver
@@ -53,49 +53,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: falcon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
-  name: falcon
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -124,6 +125,42 @@ files:
 - async-websocket.gemspec
 - examples/chat/client.rb
 - examples/chat/config.ru
+- examples/middleware/client.rb
+- examples/middleware/config.ru
+- examples/utopia/.bowerrc
+- examples/utopia/.gitignore
+- examples/utopia/.rspec
+- examples/utopia/Gemfile
+- examples/utopia/Guardfile
+- examples/utopia/README.md
+- examples/utopia/Rakefile
+- examples/utopia/config.ru
+- examples/utopia/config/README.md
+- examples/utopia/config/environment.rb
+- examples/utopia/lib/readme.txt
+- examples/utopia/pages/_heading.xnode
+- examples/utopia/pages/_page.xnode
+- examples/utopia/pages/client/client.js
+- examples/utopia/pages/client/controller.rb
+- examples/utopia/pages/client/index.xnode
+- examples/utopia/pages/errors/exception.xnode
+- examples/utopia/pages/errors/file-not-found.xnode
+- examples/utopia/pages/links.yaml
+- examples/utopia/pages/server/controller.rb
+- examples/utopia/public/_static/icon.png
+- examples/utopia/public/_static/site.css
+- examples/utopia/public/_static/utopia-background.svg
+- examples/utopia/public/_static/utopia.svg
+- examples/utopia/public/readme.txt
+- examples/utopia/spec/spec_helper.rb
+- examples/utopia/spec/website_context.rb
+- examples/utopia/spec/website_spec.rb
+- examples/utopia/tasks/bower.rake
+- examples/utopia/tasks/deploy.rake
+- examples/utopia/tasks/development.rake
+- examples/utopia/tasks/environment.rake
+- examples/utopia/tasks/log.rake
+- examples/utopia/tasks/static.rake
 - lib/async/websocket.rb
 - lib/async/websocket/client.rb
 - lib/async/websocket/connection.rb