sinatra-websocket 0.2.1 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+ - [#6](https://github.com/simulacre/sinatra-websocket/pull/6): check for the existence of async.orig_callback - [@crazed](https://github.com/crazed)
+
 ## 0.2.1
  - [#3](https://github.com/simulacre/sinatra-websocket/pull/3): Lock em-websocket dependency due to latest API changes. - [@pedrocarrico](https://github.com/pedrocarrico)
 

data/lib/sinatra-websocket.rb

@@ -1,5 +1,6 @@
 require 'thin'
 require 'em-websocket'
+require 'sinatra-websocket/error'
 require 'sinatra-websocket/ext/thin/connection'
 require 'sinatra-websocket/ext/sinatra/request'
 
@@ -7,7 +8,14 @@ module SinatraWebsocket
   class Connection < ::EventMachine::WebSocket::Connection
     class << self
       def from_env(env, options = {})
-        socket      = env[Thin::Request::ASYNC_CALLBACK].receiver
+        if env.include?('async.orig_callback')
+          callback_key = 'async.orig_callback'
+        elsif env.include?(Thin::Request::ASYNC_CALLBACK)
+          callback_key = Thin::Request::ASYNC_CALLBACK
+        else
+          raise Error::ConfigurationError.new('Could not find an async callback in our environment!')
+        end
+        socket     = env[callback_key].receiver
         request    = request_from_env(env)
         connection = Connection.new(env, socket, :debug => options[:debug])
         yield(connection) if block_given?

data/lib/sinatra-websocket/error.rb

@@ -0,0 +1,9 @@
+module SinatraWebsocket
+  module Error
+    class StandardError < ::StandardError
+      include Error
+    end
+    class ConfigurationError < StandardError; end
+    class ConnectionError < StandardError; end
+  end
+end # module::SinatraWebsocket

data/lib/sinatra-websocket/ext/sinatra/request.rb

@@ -13,7 +13,7 @@ module SinatraWebsocket
         # Taken from skinny https://github.com/sj26/skinny
         def websocket(options={}, &blk)
           env['skinny.websocket'] ||= begin
-            raise RuntimeError, "Not a WebSocket request" unless websocket?
+            raise Error::ConnectionError.new("Not a WebSocket request") unless websocket?
             SinatraWebsocket::Connection.from_env(env, options, &blk)
           end
         end

data/lib/sinatra-websocket/version.rb

@@ -1,4 +1,4 @@
 module SinatraWebsocket
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-websocket
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -65,6 +65,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/sinatra-websocket/error.rb
 - lib/sinatra-websocket/ext/sinatra/request.rb
 - lib/sinatra-websocket/ext/thin/connection.rb
 - lib/sinatra-websocket/version.rb