websocket-rack 0.3.2 → 0.3.3

data/.travis.yml

@@ -2,5 +2,7 @@ script: "bundle exec rake spec"
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
-  - rbx
+  - rbx-18mode
+  # - rbx-19mode

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.3 / 2012-02-16
+
+- postponse sending messages and closing connection to next tick(prevent locking rest of current request)
+- support for WebSocket drafts 09-13 (currently proposed as standard)
+- prevent blocking tests when invalid responsed is received
+
 ## 0.3.2 / 2011-12-13
 
 - fix bug that resulted in 'location mismatch' error on Safari and iOS

data/README.md

@@ -164,7 +164,8 @@ end
 
 ### Which WebSocket drafts are supported:
 
-Currently we support drafts -75 and -76 form old(hixie) numeration and all drafts from -00 to -08 from current(ietf-hybi) numeration.
+Currently we support drafts -75 and -76 form old(hixie) numeration and all drafts from -00 to -13 from current(ietf-hybi) numeration.
+Please note that ietf-hybi-13 is currently proposed as final standard.
 
 ### Which Rack servers are supported?
 
@@ -192,4 +193,4 @@ This is bug in EventMachine < 1.0.0. Please consider updating to newer version o
 
 Author: Bernard Potocki <<bernard.potocki@imanel.org>>
 
-Released under MIT license.
+Released under MIT license.

data/lib/rack/websocket/handler/base/connection.rb

@@ -22,13 +22,17 @@ module Rack
           # Overwrite send_data from EventMachine
           # delegate send_data to rack server
           def send_data(*args)
-            @socket.send_data(*args)
+            EM.next_tick do
+              @socket.send_data(*args)
+            end
           end
 
           # Overwrite close_connection from EventMachine
           # delegate close_connection to rack server
           def close_connection(*args)
-            @socket.close_connection(*args)
+            EM.next_tick do
+              @socket.close_connection(*args)
+            end
           end
 
           #########################

data/lib/rack/websocket/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module WebSocket
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
-end
+end

data/spec/support/all_drafts.rb

@@ -1,8 +1,9 @@
+require 'timeout'
 shared_examples_for 'all drafts' do
   it "should accept incoming connection" do
     conn = new_server_connection
     conn.write(handshake_request)
-    conn.read(handshake_response.length).should eql(handshake_response)
+    timeout(1) { conn.read(handshake_response.length).should eql(handshake_response) }
   end
   it "should call 'on_open' on new connection" do
     TestApp.any_instance.expects(:on_open)
@@ -30,14 +31,14 @@ shared_examples_for 'all drafts' do
     TestApp.any_instance.expects(:on_message)
     conn = new_server_connection
     conn.write(handshake_request)
-    conn.read(handshake_response.length)
+    timeout(1) { conn.read(handshake_response.length) }
     conn.write(message)
   end
   it "should call 'on_message' on connection sending data with proper env and message" do
     TestApp.any_instance.expects(:on_message).once.with { |env, message| env.class == Hash && !env.keys.empty? && message == 'Hello' }
     conn = new_server_connection
     conn.write(handshake_request)
-    conn.read(handshake_response.length)
+    timeout(1) { conn.read(handshake_response.length) }
     conn.write(message)
   end
-end
+end

data/spec/support/all_handlers.rb

@@ -4,66 +4,77 @@ shared_examples_for 'all handlers' do
     conn.write(flash_policy_request)
     conn.read(flash_policy_response.length).should eql(flash_policy_response)
   end
-  
+
   context 'for draft75' do
     let(:handshake_request)  { spec75_handshake_request }
     let(:handshake_response) { spec75_handshake_response }
     let(:message)            { spec75_message }
-    
+
     it_should_behave_like 'all drafts'
   end
-  
+
   # Also draft00
   context 'for draft76' do
     let(:handshake_request)  { spec76_handshake_request }
     let(:handshake_response) { spec76_handshake_response }
     let(:message)            { spec76_message }
-    
+
     it_should_behave_like 'all drafts'
   end
-  
+
   # Drafts 01, 02 and 03 are pretty the same so one test for all
   context 'for draft03' do
     let(:handshake_request)  { spec03_handshake_request }
     let(:handshake_response) { spec03_handshake_response }
     let(:message)            { spec03_message }
-    
+
     it_should_behave_like 'all drafts'
   end
-  
+
   context 'for draft05' do
     let(:handshake_request)  { spec05_handshake_request }
     let(:handshake_response) { spec05_handshake_response }
     let(:message)            { spec05_message }
-    
+
     it_should_behave_like 'all drafts'
   end
-  
+
   context 'for draft06' do
     let(:handshake_request)  { spec06_handshake_request }
     let(:handshake_response) { spec06_handshake_response }
     let(:message)            { spec06_message }
-    
+
     it_should_behave_like 'all drafts'
   end
-  
+
   context 'for draft07' do
     let(:handshake_request)  { spec07_handshake_request }
     let(:handshake_response) { spec07_handshake_response }
     let(:message)            { spec07_unmasked_message }
     let(:masked_message)     { spec07_masked_message }
-    
+
     it_should_behave_like 'all drafts'
     it_should_behave_like 'draft with masked messages'
   end
-  
+
   context 'for draft08' do
     let(:handshake_request)  { spec08_handshake_request }
     let(:handshake_response) { spec08_handshake_response }
     let(:message)            { spec08_unmasked_message }
     let(:masked_message)     { spec08_masked_message }
-    
+
     it_should_behave_like 'all drafts'
     it_should_behave_like 'draft with masked messages'
   end
-end
+
+  # Drafts 09, 10, 11, 12 and 13 are pretty the same so one test for all
+  context 'for draft13' do
+    let(:handshake_request)  { spec13_handshake_request }
+    let(:handshake_response) { spec13_handshake_response }
+    let(:message)            { spec13_unmasked_message }
+    let(:masked_message)     { spec13_masked_message }
+
+    it_should_behave_like 'all drafts'
+    it_should_behave_like 'draft with masked messages'
+  end
+end

data/spec/support/masked_messages.rb

@@ -3,7 +3,7 @@ shared_examples_for 'draft with masked messages' do
     TestApp.any_instance.expects(:on_message).once.with { |env, message| env.class == Hash && !env.keys.empty? && message == 'Hello' }
     conn = new_server_connection
     conn.write(handshake_request)
-    conn.read(handshake_response.length)
+    timeout(1) { conn.read(handshake_response.length) }
     conn.write(masked_message)
   end
-end
+end

data/spec/support/requests.rb

@@ -216,3 +216,34 @@ end
 def spec08_masked_message
   "\x81\x85\x37\xfa\x21\x3d\x7f\x9f\x4d\x51\x58"
 end
+
+def spec13_handshake_request
+  <<-EOF
+GET /chat HTTP/1.1\r
+Host: localhost:#{TEST_PORT}\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r
+Origin: http://localhost:#{TEST_PORT}\r
+Sec-WebSocket-Protocol: chat, superchat\r
+Sec-WebSocket-Version: 13\r
+\r
+EOF
+end
+
+def spec13_handshake_response
+  <<-EOF
+HTTP/1.1 101 Switching Protocols\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r
+EOF
+end
+
+def spec13_unmasked_message
+  "\x81\x05\x48\x65\x6c\x6c\x6f"
+end
+
+def spec13_masked_message
+  "\x81\x85\x37\xfa\x21\x3d\x7f\x9f\x4d\x51\x58"
+end

data/websocket-rack.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Rack-based WebSocket server}
 
   s.add_dependency 'rack'
-  s.add_dependency 'em-websocket', '~> 0.3.1'
+  s.add_dependency 'em-websocket', '~> 0.3.6'
   s.add_dependency 'thin' # Temporary until we support more servers
   s.add_development_dependency 'rspec', '~> 2.4.0'
   s.add_development_dependency 'mocha'
@@ -22,4 +22,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: websocket-rack
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70149318123920 !ruby/object:Gem::Requirement
+  requirement: &70187912377380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149318123920
+  version_requirements: *70187912377380
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &70149318117000 !ruby/object:Gem::Requirement
+  requirement: &70187912376880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70149318117000
+  version_requirements: *70187912376880
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70149318116520 !ruby/object:Gem::Requirement
+  requirement: &70187912376460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149318116520
+  version_requirements: *70187912376460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149318115880 !ruby/object:Gem::Requirement
+  requirement: &70187912375920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *70149318115880
+  version_requirements: *70187912375920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70149318115140 !ruby/object:Gem::Requirement
+  requirement: &70187912375500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149318115140
+  version_requirements: *70187912375500
 description: Rack-based WebSocket server
 email:
 - bernard.potocki@imanel.org