em-websocket 0.3.2 → 0.3.5

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 0.3.5 / 2011-10-24
+
+- new features:
+  - Support WebSocket draft 13
+
 == 0.3.2 / 2011-10-09
 
 - bugfixes:

data/examples/flash_policy_file_server.rb

@@ -0,0 +1,21 @@
+# Super simple flash policy file server
+# See https://github.com/igrigorik/em-websocket/issues/61
+
+require 'eventmachine'
+
+module FlashPolicy
+  def post_init
+    cross_domain_xml =<<-EOF
+    <cross-domain-policy>
+       <allow-access-from domain="*" to-ports="*" />
+    </cross-domain-policy>  
+    EOF
+
+    send_data cross_domain_xml
+    close_connection_after_writing
+  end
+end
+
+EM.run {
+  EventMachine::start_server '0.0.0.0', 843, FlashPolicy
+}

data/examples/multicast.rb

@@ -1,4 +1,5 @@
-require 'lib/em-websocket'
+require 'em-websocket'
+# requires the twitter-stream gem
 require 'twitter/json_stream'
 require 'json'
 
@@ -15,7 +16,8 @@ EventMachine.run {
 
   @twitter = Twitter::JSONStream.connect(
     :path => '/1/statuses/filter.json?track=ruby',
-    :auth => "#{username}:#{password}"
+    :auth => "#{username}:#{password}",
+    :ssl => true
   )
 
   @twitter.each_item do |status|
@@ -37,8 +39,8 @@ EventMachine.run {
       ws.onclose {
         @channel.unsubscribe(sid)
       }
-
     }
+
   end
 
   puts "Server started"

data/lib/em-websocket.rb

@@ -9,7 +9,7 @@ require "eventmachine"
   close75 close03 close05 close06
   masking04
   message_processor_03 message_processor_06
-  handler_factory handler handler75 handler76 handler03 handler05 handler06 handler07 handler08
+  handler_factory handler handler75 handler76 handler03 handler05 handler06 handler07 handler08 handler13
 ].each do |file|
   require "em-websocket/#{file}"
 end

data/lib/em-websocket/handler13.rb

@@ -0,0 +1,10 @@
+module EventMachine
+  module WebSocket
+    class Handler13 < Handler
+      include Handshake04
+      include Framing07
+      include MessageProcessor06
+      include Close06
+    end
+  end
+end

data/lib/em-websocket/handler_factory.rb

@@ -90,7 +90,13 @@ module EventMachine
         when 7
           Handler07.new(connection, request, debug)
         when 8
+          # drafts 9, 10, 11 and 12 should never change the version
+          # number as they are all the same as version 08.
           Handler08.new(connection, request, debug)
+        when 13
+          # drafts 13 to 17 all identify as version 13 as they are
+          # only minor changes or text changes.
+          Handler13.new(connection, request, debug)
         else
           # According to spec should abort the connection
           raise WebSocketError, "Protocol version #{version} not supported"

data/lib/em-websocket/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Websocket
-    VERSION = "0.3.2"
+    VERSION = "0.3.5"
   end
 end

data/spec/helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rspec'
+require 'em-spec/rspec'
 require 'pp'
 require 'em-http'
 
@@ -68,6 +69,32 @@ class Draft03FakeWebSocketClient < FakeWebSocketClient
   end
 end
 
+class Draft07FakeWebSocketClient < FakeWebSocketClient
+  def send(application_data)
+    frame = ''
+    opcode = 1 # fake only supports text frames
+    byte1 = opcode | 0b10000000 # since more, rsv1-3 are 0
+    frame << byte1
+
+    length = application_data.size
+    if length <= 125
+      byte2 = length # since rsv4 is 0
+      frame << byte2
+    elsif length < 65536 # write 2 byte length
+      frame << 126
+      frame << [length].pack('n')
+    else # write 8 byte length
+      frame << 127
+      frame << [length >> 32, length & 0xFFFFFFFF].pack("NN")
+    end
+
+    frame << application_data
+
+    send_data(frame)
+  end
+end
+
+
 # Wrap EM:HttpRequest in a websocket like interface so that it can be used in the specs with the same interface as FakeWebSocketClient
 class Draft75WebSocketClient
   def onopen(&blk);     @onopen = blk;    end
@@ -91,11 +118,6 @@ class Draft75WebSocketClient
   end
 end
 
-def failed
-  EventMachine.stop
-  fail
-end
-
 def format_request(r)
   data = "#{r[:method]} #{r[:path]} HTTP/1.1\r\n"
   header_lines = r[:headers].map { |k,v| "#{k}: #{v}" }

data/spec/integration/common_spec.rb

@@ -3,23 +3,26 @@ require 'helper'
 # These tests are not specifi to any particular draft of the specification
 # 
 describe "WebSocket server" do
+  include EM::SpecHelper
+  default_timeout 1
+
   it "should fail on non WebSocket requests" do
-    EM.run do
+    em {
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('http://127.0.0.1:12345/').get :timeout => 0
-        http.errback { EM.stop }
-        http.callback { failed }
+        http.errback { done }
+        http.callback { fail }
       end
 
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) {}
-    end
+    }
   end
   
   it "should populate ws.request with appropriate headers" do
-    EM.run do
+    em {
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { failed }
+        http.errback { fail }
         http.callback {
           http.response_header.status.should == 101
           http.close_connection
@@ -41,14 +44,14 @@ describe "WebSocket server" do
           EventMachine.stop
         }
       end
-    end
+    }
   end
   
   it "should allow sending and retrieving query string args passed in on the connection request." do
-    EM.run do
+    em {
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get(:query => {'foo' => 'bar', 'baz' => 'qux'}, :timeout => 0)
-        http.errback { failed }
+        http.errback { fail }
         http.callback {
           http.response_header.status.should == 101
           http.close_connection
@@ -69,14 +72,14 @@ describe "WebSocket server" do
           EventMachine.stop
         }
       end
-    end
+    }
   end
   
   it "should ws.response['Query'] to empty hash when no query string params passed in connection URI" do
-    EM.run do
+    em {
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get(:timeout => 0)
-        http.errback { failed }
+        http.errback { fail }
         http.callback {
           http.response_header.status.should == 101
           http.close_connection
@@ -94,18 +97,18 @@ describe "WebSocket server" do
           EventMachine.stop
         }
       end
-    end
+    }
   end
   
   it "should raise an exception if frame sent before handshake complete" do
-    EM.run {
+    em {
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |c|
         # We're not using a real client so the handshake will not be sent
         EM.add_timer(0.1) {
           lambda {
             c.send('early message')
           }.should raise_error('Cannot send data before onopen callback')
-          EM.stop
+          done
         }
       }
 

data/spec/integration/draft03_spec.rb

@@ -2,6 +2,9 @@ require 'helper'
 require 'integration/shared_examples'
 
 describe "draft03" do
+  include EM::SpecHelper
+  default_timeout 1
+
   before :each do
     @request = {
       :port => 80,
@@ -50,11 +53,11 @@ describe "draft03" do
   # http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-03#section-4.6
   describe "examples from the spec" do
     it "should accept a single-frame text message" do
-      EM.run do
+      em {
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onmessage { |msg|
             msg.should == 'Hello'
-            EM.stop
+            done
           }
         }
 
@@ -66,15 +69,15 @@ describe "draft03" do
         connection.onopen {
           connection.send_data("\x04\x05Hello")
         }
-      end
+      }
     end
     
     it "should accept a fragmented text message" do
-      EM.run do
+      em {
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onmessage { |msg|
             msg.should == 'Hello'
-            EM.stop
+            done
           }
         }
 
@@ -87,11 +90,11 @@ describe "draft03" do
           connection.send_data("\x84\x03Hel")
           connection.send_data("\x00\x02lo")
         }
-      end
+      }
     end
     
     it "should accept a ping request and respond with the same body" do
-      EM.run do
+      em {
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws| }
 
         # Create a fake client which sends draft 76 handshake
@@ -106,19 +109,19 @@ describe "draft03" do
         connection.onmessage { |frame|
           next if frame.nil?
           frame.should == "\x03\x05Hello"
-          EM.stop
+          done
         }
-      end
+      }
     end
     
     it "should accept a 256 bytes binary message in a single frame" do
-      EM.run do
+      em {
         data = "a" * 256
         
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onmessage { |msg|
             msg.should == data
-            EM.stop
+            done
           }
         }
 
@@ -130,17 +133,17 @@ describe "draft03" do
         connection.onopen {
           connection.send_data("\x05\x7E\x01\x00" + data)
         }
-      end
+      }
     end
     
     it "should accept a 64KiB binary message in a single frame" do
-      EM.run do
+      em {
         data = "a" * 65536
         
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onmessage { |msg|
             msg.should == data
-            EM.stop
+            done
           }
         }
 
@@ -152,13 +155,13 @@ describe "draft03" do
         connection.onopen {
           connection.send_data("\x05\x7F\x00\x00\x00\x00\x00\x01\x00\x00" + data)
         }
-      end
+      }
     end
   end
 
   describe "close handling" do
     it "should respond to a new close frame with a close frame" do
-      EM.run do
+      em {
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws| }
 
         # Create a fake client which sends draft 76 handshake
@@ -173,13 +176,13 @@ describe "draft03" do
         # Check that close ack received
         connection.onmessage { |frame|
           frame.should == "\x01\x00"
-          EM.stop
+          done
         }
-      end
+      }
     end
 
     it "should close the connection on receiving a close acknowlegement" do
-      EM.run do
+      em {
         ack_received = false
 
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
@@ -205,13 +208,13 @@ describe "draft03" do
         # 4. Check that connection is closed _after_ the ack
         connection.onclose {
           ack_received.should == true
-          EM.stop
+          done
         }
-      end
+      }
     end
 
     it "should not allow data frame to be sent after close frame sent" do
-      EM.run {
+      em {
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onopen {
             # 2. Send a close frame
@@ -224,7 +227,7 @@ describe "draft03" do
               lambda {
                 ws.send('hello world')
               }.should raise_error(EM::WebSocket::WebSocketError, 'Cannot send data frame since connection is closing')
-              EM.stop
+              done
             }
           }
         }
@@ -236,7 +239,7 @@ describe "draft03" do
     end
 
     it "should still respond to control frames after close frame sent" do
-      EM.run {
+      em {
         EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onopen {
             # 2. Send a close frame
@@ -258,7 +261,7 @@ describe "draft03" do
           else
             # 4. Check that the pong is received
             frame.should == "\x03\x05Hello"
-            EM.stop
+            done
           end
         }
       }

data/spec/integration/draft05_spec.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 describe "draft05" do
+  include EM::SpecHelper
+  default_timeout 1
+
   before :each do
     @request = {
       :port => 80,
@@ -31,11 +34,11 @@ describe "draft05" do
   end
   
   it "should open connection" do
-    EM.run {
+    em {
       start_server { |server|
         server.onopen {
           server.instance_variable_get(:@handler).class.should == EventMachine::WebSocket::Handler05
-          EM.stop
+          done
         }
       }
       

data/spec/integration/draft06_spec.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 describe "draft06" do
+  include EM::SpecHelper
+  default_timeout 1
+
   before :each do
     @request = {
       :port => 80,
@@ -40,7 +43,7 @@ describe "draft06" do
   end
   
   it "should open connection" do
-    EM.run {
+    em {
       start_server { |server|
         server.onopen {
           server.instance_variable_get(:@handler).class.should == EventMachine::WebSocket::Handler06
@@ -51,22 +54,24 @@ describe "draft06" do
         client.onopen {
           client.handshake_response.lines.sort.
             should == format_response(@response).lines.sort
-          EM.stop
+          done
         }
       }
     }
   end
   
   it "should accept a single-frame text message (masked)" do
-    EM.run do
+    em {
       start_server { |server|
         server.onmessage { |msg|
           msg.should == 'Hello'
-          msg.encoding.should == Encoding.find("UTF-8")
-          EM.stop
+          if msg.respond_to?(:encoding)
+            msg.encoding.should == Encoding.find("UTF-8")
+          end
+          done
         }
         server.onerror {
-          failed
+          fail
         }
       }
   
@@ -75,6 +80,6 @@ describe "draft06" do
           client.send_data("\x00\x00\x01\x00\x84\x05Ielln")
         }
       }
-    end
+    }
   end
 end

data/spec/integration/draft13_spec.rb

@@ -0,0 +1,65 @@
+require 'helper'
+require 'integration/shared_examples'
+
+describe "draft13" do
+  include EM::SpecHelper
+  default_timeout 1
+
+  before :each do
+    @request = {
+      :port => 80,
+      :method => "GET",
+      :path => "/demo",
+      :headers => {
+        'Host' => 'example.com',
+        'Upgrade' => 'websocket',
+        'Connection' => 'Upgrade',
+        'Sec-WebSocket-Key' => 'dGhlIHNhbXBsZSBub25jZQ==',
+        'Sec-WebSocket-Protocol' => 'sample',
+        'Sec-WebSocket-Origin' => 'http://example.com',
+        'Sec-WebSocket-Version' => '13'
+      }
+    }
+
+    @response = {
+      :protocol => "HTTP/1.1 101 Switching Protocols\r\n",
+      :headers => {
+        "Upgrade" => "websocket",
+        "Connection" => "Upgrade",
+        "Sec-WebSocket-Accept" => "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
+      }
+    }
+  end
+
+  it_behaves_like "a websocket server" do
+    def start_server
+      EM::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
+        yield ws
+      }
+    end
+
+    def start_client
+      client = EM.connect('0.0.0.0', 12345, Draft07FakeWebSocketClient)
+      client.send_data(format_request(@request))
+      yield client if block_given?
+    end
+  end
+
+  it "should send back the correct handshake response" do
+    em {
+      EM.add_timer(0.1) do
+        EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { }
+        
+        # Create a fake client which sends draft 07 handshake
+        connection = EM.connect('0.0.0.0', 12345, Draft07FakeWebSocketClient)
+        connection.send_data(format_request(@request))
+        
+        connection.onopen {
+          connection.handshake_response.lines.sort.
+            should == format_response(@response).lines.sort
+          done
+        }
+      end
+    }
+  end
+end

data/spec/integration/draft75_spec.rb

@@ -6,6 +6,8 @@ require 'integration/shared_examples'
 # to currently estabish a websocket connection using the draft75 protocol.
 # 
 describe "WebSocket server draft75" do
+  include EM::SpecHelper
+  default_timeout 1
 
   it_behaves_like "a websocket server" do
     def start_server
@@ -21,11 +23,11 @@ describe "WebSocket server draft75" do
   end
 
   it "should automatically complete WebSocket handshake" do
-    EM.run do
+    em {
       MSG = "Hello World!"
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { failed }
+        http.errback { fail }
         http.callback { http.response_header.status.should == 101 }
 
         http.stream { |msg|
@@ -39,17 +41,17 @@ describe "WebSocket server draft75" do
           ws.send MSG
         }
       end
-    end
+    }
   end
 
   it "should split multiple messages into separate callbacks" do
-    EM.run do
+    em {
       messages = %w[1 2]
       received = []
 
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { failed }
+        http.errback { fail }
         http.stream {|msg|}
         http.callback {
           http.response_header.status.should == 101
@@ -68,14 +70,14 @@ describe "WebSocket server draft75" do
           EventMachine.stop if received.size == messages.size
         }
       end
-    end
+    }
   end
 
   it "should call onclose callback when client closes connection" do
-    EM.run do
+    em {
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('ws://127.0.0.1:12345/').get :timeout => 0
-        http.errback { failed }
+        http.errback { fail }
         http.callback {
           http.response_header.status.should == 101
           http.close_connection
@@ -90,19 +92,19 @@ describe "WebSocket server draft75" do
           EventMachine.stop
         }
       end
-    end
+    }
   end
 
   it "should call onerror callback with raised exception and close connection on bad handshake" do
-    EM.run do
+    em {
       EventMachine.add_timer(0.1) do
         http = EventMachine::HttpRequest.new('http://127.0.0.1:12345/').get :timeout => 0
         http.errback { http.response_header.status.should == 0 }
-        http.callback { failed }
+        http.callback { fail }
       end
 
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) do |ws|
-        ws.onopen { failed }
+        ws.onopen { fail }
         ws.onclose { EventMachine.stop }
         ws.onerror {|e|
           e.should be_an_instance_of EventMachine::WebSocket::HandshakeError
@@ -110,6 +112,6 @@ describe "WebSocket server draft75" do
           EventMachine.stop
         }
       end
-    end
+    }
   end
 end

data/spec/integration/draft76_spec.rb

@@ -2,6 +2,9 @@ require 'helper'
 require 'integration/shared_examples'
 
 describe "WebSocket server draft76" do
+  include EM::SpecHelper
+  default_timeout 1
+
   before :each do
     @request = {
       :port => 80,
@@ -46,7 +49,7 @@ describe "WebSocket server draft76" do
   end
 
   it "should send back the correct handshake response" do
-    EM.run do
+    em {
       EM.add_timer(0.1) do
         EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { }
         
@@ -57,14 +60,14 @@ describe "WebSocket server draft76" do
         connection.onopen {
           connection.handshake_response.lines.sort.
             should == format_response(@response).lines.sort
-          EM.stop
+          done
         }
       end
-    end
+    }
   end
   
   it "should send closing frame back and close the connection after recieving closing frame" do
-    EM.run do
+    em {
       EM.add_timer(0.1) do
         EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { }
   
@@ -82,19 +85,19 @@ describe "WebSocket server draft76" do
         connection.onclose {
           connection.packets[0].should == 
             EM::WebSocket::Handler76::TERMINATE_STRING
-          EM.stop
+          done
         }
       end
-    end
+    }
   end
   
   it "should ignore any data received after the closing frame" do
-    EM.run do
+    em {
       EM.add_timer(0.1) do
         EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           # Fail if foobar message is received
           ws.onmessage { |msg|
-            failed
+            fail
           }
         }
         
@@ -109,14 +112,14 @@ describe "WebSocket server draft76" do
         }
   
         connection.onclose {
-          EM.stop
+          done
         }
       end
-    end
+    }
   end
 
   it "should accept null bytes within the frame after a line return" do
-    EM.run do
+    em {
       EM.add_timer(0.1) do
         EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |ws|
           ws.onmessage { |msg|
@@ -135,19 +138,19 @@ describe "WebSocket server draft76" do
         }
   
         connection.onclose {
-          EM.stop
+          done
         }
       end
-    end
+    }
   end
 
   it "should handle unreasonable frame lengths by calling onerror callback" do
-    EM.run do
+    em {
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |server|
         server.onerror { |error|
           error.should be_an_instance_of EM::WebSocket::DataError
           error.message.should == "Frame length too long (1180591620717411303296 bytes)"
-          EM.stop
+          done
         }
       }
 
@@ -162,16 +165,16 @@ describe "WebSocket server draft76" do
       client.onopen {
         client.send_data("\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00")
       }
-    end
+    }
   end
   
   it "should handle impossible frames by calling onerror callback" do
-    EM.run do
+    em {
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |server|
         server.onerror { |error|
           error.should be_an_instance_of EM::WebSocket::DataError
           error.message.should == "Invalid frame received"
-          EM.stop
+          done
         }
       }
 
@@ -182,16 +185,16 @@ describe "WebSocket server draft76" do
       client.onopen {
         client.send_data("foobar") # Does not start with \x00 or \xff
       }
-    end
+    }
   end
 
   it "should handle invalid http requests by raising HandshakeError passed to onerror callback" do
-    EM.run {
+    em {
       EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { |server|
         server.onerror { |error|
           error.should be_an_instance_of EM::WebSocket::HandshakeError
           error.message.should == "Invalid HTTP header"
-          EM.stop
+          done
         }
       }
       
@@ -201,7 +204,7 @@ describe "WebSocket server draft76" do
   end
 
   it "should handle handshake request split into two TCP packets" do
-    EM.run do
+    em {
       EM.add_timer(0.1) do
         EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 12345) { }
 
@@ -214,7 +217,7 @@ describe "WebSocket server draft76" do
         connection.onopen {
           connection.handshake_response.lines.sort.
             should == format_response(@response).lines.sort
-          EM.stop
+          done
         }
 
         EM.add_timer(0.1) do
@@ -222,6 +225,6 @@ describe "WebSocket server draft76" do
           connection.send_data(data[(data.length / 2)..-1])
         end
       end
-    end
+    }
   end
 end

data/spec/integration/shared_examples.rb

@@ -2,7 +2,7 @@
 
 shared_examples_for "a websocket server" do
   it "should call onerror if an application error raised in onopen" do
-    EM.run {
+    em {
       start_server { |ws|
         ws.onopen {
           raise "application error"
@@ -10,7 +10,7 @@ shared_examples_for "a websocket server" do
 
         ws.onerror { |e|
           e.message.should == "application error"
-          EM.stop
+          done
         }
       }
 
@@ -19,7 +19,7 @@ shared_examples_for "a websocket server" do
   end
 
   it "should call onerror if an application error raised in onmessage" do
-    EM.run {
+    em {
       start_server { |server|
         server.onmessage {
           raise "application error"
@@ -27,7 +27,7 @@ shared_examples_for "a websocket server" do
 
         server.onerror { |e|
           e.message.should == "application error"
-          EM.stop
+          done
         }
       }
 
@@ -40,7 +40,7 @@ shared_examples_for "a websocket server" do
   end
 
   it "should call onerror in an application error raised in onclose" do
-    EM.run {
+    em {
       start_server { |server|
         server.onclose {
           raise "application error"
@@ -48,7 +48,7 @@ shared_examples_for "a websocket server" do
 
         server.onerror { |e|
           e.message.should == "application error"
-          EM.stop
+          done
         }
       }
 
@@ -65,7 +65,7 @@ shared_examples_for "a websocket server" do
   # Only run these tests on ruby 1.9
   if "a".respond_to?(:force_encoding)
     it "should raise error if you try to send non utf8 text data to ws" do
-      EM.run do
+      em {
         start_server { |server|
           server.onopen {
             # Create a string which claims to be UTF-8 but which is not
@@ -80,12 +80,12 @@ shared_examples_for "a websocket server" do
           server.onerror { |error|
             error.class.should == EventMachine::WebSocket::WebSocketError
             error.message.should == "Data sent to WebSocket must be valid UTF-8 but was UTF-8 (valid: false)"
-            EM.stop
+            done
           }
         }
 
         start_client { }
-      end
+      }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-websocket
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-10-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70120715076200 !ruby/object:Gem::Requirement
+  requirement: &70358050200200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.12.9
   type: :runtime
   prerelease: false
-  version_requirements: *70120715076200
+  version_requirements: *70358050200200
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70120715061040 !ruby/object:Gem::Requirement
+  requirement: &70358050199560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,32 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70120715061040
+  version_requirements: *70358050199560
+- !ruby/object:Gem::Dependency
+  name: em-spec
+  requirement: &70358050199080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :development
+  prerelease: false
+  version_requirements: *70358050199080
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70358050198540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.10
+  type: :development
+  prerelease: false
+  version_requirements: *70358050198540
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70120715060520 !ruby/object:Gem::Requirement
+  requirement: &70358050197960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,21 +66,21 @@ dependencies:
         version: 0.2.6
   type: :development
   prerelease: false
-  version_requirements: *70120715060520
+  version_requirements: *70358050197960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70120715059920 !ruby/object:Gem::Requirement
+  requirement: &70358050197280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70120715059920
+  version_requirements: *70358050197280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70120715059420 !ruby/object:Gem::Requirement
+  requirement: &70358050176420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120715059420
+  version_requirements: *70358050176420
 description: EventMachine based WebSocket server
 email:
 - ilya@igvita.com
@@ -82,6 +104,7 @@ files:
 - Rakefile
 - em-websocket.gemspec
 - examples/echo.rb
+- examples/flash_policy_file_server.rb
 - examples/js/FABridge.js
 - examples/js/WebSocketMain.swf
 - examples/js/swfobject.js
@@ -106,6 +129,7 @@ files:
 - lib/em-websocket/handler06.rb
 - lib/em-websocket/handler07.rb
 - lib/em-websocket/handler08.rb
+- lib/em-websocket/handler13.rb
 - lib/em-websocket/handler75.rb
 - lib/em-websocket/handler76.rb
 - lib/em-websocket/handler_factory.rb
@@ -122,6 +146,7 @@ files:
 - spec/integration/draft03_spec.rb
 - spec/integration/draft05_spec.rb
 - spec/integration/draft06_spec.rb
+- spec/integration/draft13_spec.rb
 - spec/integration/draft75_spec.rb
 - spec/integration/draft76_spec.rb
 - spec/integration/shared_examples.rb
@@ -148,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: em-websocket
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: EventMachine based WebSocket server
@@ -158,6 +183,7 @@ test_files:
 - spec/integration/draft03_spec.rb
 - spec/integration/draft05_spec.rb
 - spec/integration/draft06_spec.rb
+- spec/integration/draft13_spec.rb
 - spec/integration/draft75_spec.rb
 - spec/integration/draft76_spec.rb
 - spec/integration/shared_examples.rb