websocket-rack 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
+## 0.1.2 / 2011-03-08
+
+- change Rack::WebSocket::Application @connection variable name to @conn - first one is to often used to block it
+- allow debugging of WebSocket connection
+
 ## 0.1.1 / 2011-03-07
 
 - add missing gem dependencies
-- clear connection inactivity timeout for websocket connections
+- clear connection inactivity timeout for WebSocket connections
 - inform about bug in EM < 1.0.0
 - add thin-websocket wrapper around thin binary
 

data/README.md

@@ -105,6 +105,10 @@ Currently only Thin. I plan to support also Rainbows! in future, but not yet.
 
 This is bug in EventMachine < 1.0.0. Please consider updating to newer version or use thin-websocket wrapper around thin binary.
 
+### How to enable debugging?
+
+Just use :websocket\_debug => true option when initializing your app.
+
 ### How to enable wss/SSL support?
 
 Thin v1.2.8 have --ssl option - just use that! :)

data/example/example.ru

@@ -25,7 +25,7 @@ end
 # use Rack::CommonLogger
 
 map '/' do
-  use MyApp
+  use MyApp #, :websocket_debug => true
 
   run Rack::File.new(File.expand_path(File.dirname(__FILE__)) + '/html')
 end

data/lib/rack/websocket/application.rb

@@ -21,26 +21,26 @@ module Rack
         if(env['HTTP_CONNECTION'].to_s.downcase == 'upgrade' && env['HTTP_UPGRADE'].to_s.downcase == 'websocket')
           @env = env
           socket = env['async.connection']
-          @connection = Connection.new(self, socket)
-          @connection.dispatch(env) ? async_response : failure_response
+          @conn = Connection.new(self, socket, :debug => !!@options[:websocket_debug])
+          @conn.dispatch(env) ? async_response : failure_response
         elsif @app
           @app.call(env)
         else
-          not_fount_response
+          not_found_response
         end
       end
 
       def close_websocket
-        if @connection
-          @connection.close_websocket
+        if @conn
+          @conn.close_websocket
         else
           raise WebSocketError, "WebSocket not opened"
         end
       end
 
       def send_data(data)
-        if @connection
-          @connection.send data
+        if @conn
+          @conn.send data
         else
           raise WebSocketError, "WebSocket not opened"
         end
@@ -56,7 +56,7 @@ module Rack
         [ 400, { "Content-Type" => "text/plain" }, [ 'invalid data' ] ]
       end
 
-      def not_fount_response
+      def not_found_response
         [ 404, { "Content-Type" => "text/plain" }, [ 'not found' ] ]
       end
 

data/lib/rack/websocket/connection.rb

@@ -65,7 +65,7 @@ module Rack
       end
 
       def dispatch(data)
-        debug [:inbound_headers, data]
+        debug [:inbound_headers, data.inspect]
         @handler = HandlerFactory.build(self, data, @debug)
         unless @handler
           # The whole header has not been received yet.

data/lib/rack/websocket.rb

@@ -2,7 +2,7 @@ require 'rack'
 
 module Rack
   module WebSocket
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
     ROOT_PATH = ::File.expand_path(::File.dirname(__FILE__))
 
     class WebSocketError < RuntimeError; end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: websocket-rack
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency