faye 0.8.8 → 0.8.9

data/lib/faye/transport/local.rb

@@ -1,14 +1,14 @@
 module Faye
-  
+
   class Transport::Local < Transport
     def self.usable?(client, endpoint, &callback)
       callback.call(endpoint.is_a?(Server))
     end
-    
+
     def batching?
       false
     end
-    
+
     def request(message, timeout)
       message = Faye.copy_object(message)
       @endpoint.process(message, true) do |responses|
@@ -16,7 +16,7 @@ module Faye
       end
     end
   end
-  
+
   Transport.register 'in-process', Transport::Local
-  
+
 end

data/lib/faye/transport/transport.rb

@@ -1,12 +1,12 @@
 module Faye
   class Transport
-    
+
     include Logging
     include Publisher
     include Timeouts
-    
+
     attr_accessor :cookies, :endpoint, :headers
-    
+
     def initialize(client, endpoint)
       @client   = client
       @endpoint = endpoint
@@ -16,14 +16,14 @@ module Faye
     def batching?
       true
     end
-    
+
     def close
     end
-    
+
     def connection_type
       self.class.connection_type
     end
-    
+
     def send(message, timeout)
       debug('Client ? sending message to ?: ?', @client.client_id, @endpoint, message)
 
@@ -55,62 +55,62 @@ module Faye
       @connection_message = nil
       @outbox = []
     end
-    
+
     def receive(responses)
       debug('Client ? received from ?: ?', @client.client_id, @endpoint, responses)
       responses.each { |response| @client.receive_message(response) }
     end
-    
+
     def retry_block(message, timeout)
       lambda do
         EventMachine.add_timer(@client.retry) { request(message, timeout) }
       end
     end
-    
+
     @transports = []
-    
+
     class << self
       attr_accessor :connection_type
-      
-      def get(client, connection_types = nil, &callback)
+
+      def get(client, allowed, disabled, &callback)
         endpoint = client.endpoint
-        connection_types ||= supported_connection_types
-        
+
         select = lambda do |(conn_type, klass), resume|
           conn_endpoint = client.endpoints[conn_type] || endpoint
-          unless connection_types.include?(conn_type)
+
+          if disabled.include?(conn_type)
+            next resume.call
+          end
+
+          unless allowed.include?(conn_type)
             klass.usable?(client, conn_endpoint) { |u| }
             next resume.call
           end
-          
+
           klass.usable?(client, conn_endpoint) do |is_usable|
             next resume.call unless is_usable
             transport = klass.respond_to?(:create) ? klass.create(client, conn_endpoint) : klass.new(client, conn_endpoint)
             callback.call(transport)
           end
         end
-        
+
         error = lambda do
           raise "Could not find a usable connection type for #{ endpoint }"
         end
-        
+
         Faye.async_each(@transports, select, error)
       end
-      
+
       def register(type, klass)
         @transports << [type, klass]
         klass.connection_type = type
       end
-      
-      def supported_connection_types
-        @transports.map { |t| t.first }
-      end
     end
-    
+
     %w[local web_socket http].each do |type|
       require File.join(ROOT, 'faye', 'transport', type)
     end
-    
+
   end
 end
 

data/lib/faye/transport/web_socket.rb

@@ -1,31 +1,31 @@
 module Faye
-  
+
   class Transport::WebSocket < Transport
-    UNCONNECTED       = 1
-    CONNECTING        = 2
-    CONNECTED         = 3
-    
+    UNCONNECTED = 1
+    CONNECTING  = 2
+    CONNECTED   = 3
+
     include EventMachine::Deferrable
-    
+
     def self.usable?(client, endpoint, &callback)
       create(client, endpoint).usable?(&callback)
     end
-    
+
     def self.create(client, endpoint)
       sockets = client.transports[:websocket] ||= {}
       sockets[endpoint] ||= new(client, endpoint)
     end
-    
+
     def batching?
       false
     end
-    
+
     def usable?(&callback)
       self.callback { callback.call(true) }
       self.errback { callback.call(false) }
       connect
     end
-    
+
     def request(messages, timeout = nil)
       return if messages.empty?
       @messages ||= {}
@@ -33,56 +33,60 @@ module Faye
       callback { |socket| socket.send(Faye.to_json(messages)) }
       connect
     end
-    
+
     def close
-      return if @closed
-      @closed = true
-      @socket.close if @socket
+      return unless @socket
+      @socket.onclose = @socket.onerror = nil
+      @socket.close
+      @socket = nil
+      set_deferred_status(:deferred)
+      @state = UNCONNECTED
     end
-    
+
     def connect
-      return if @closed
-      
       @state ||= UNCONNECTED
       return unless @state == UNCONNECTED
-      
+
       @state = CONNECTING
-      
+
       @socket = Faye::WebSocket::Client.new(@endpoint.gsub(/^http(s?):/, 'ws\1:'))
-      
+
       @socket.onopen = lambda do |*args|
         @state = CONNECTED
         @ever_connected = true
         set_deferred_status(:succeeded, @socket)
         trigger(:up)
       end
-      
+
       @socket.onmessage = lambda do |event|
-        messages = [Yajl::Parser.parse(event.data)].flatten
+        messages = Yajl::Parser.parse(event.data)
+        next if messages.nil?
+        messages = [messages].flatten
         messages.each { |message| @messages.delete(message['id']) }
         receive(messages)
       end
-      
-      @socket.onclose = lambda do |*args|
+
+      @socket.onclose = @socket.onerror = lambda do |*args|
         was_connected = (@state == CONNECTED)
         set_deferred_status(:deferred)
         @state = UNCONNECTED
-        @socket = nil
-        
+
+        close
+
         next resend if was_connected
         next set_deferred_status(:failed) unless @ever_connected
-        
+
         EventMachine.add_timer(@client.retry) { connect }
         trigger(:down)
       end
     end
-    
+
     def resend
       return unless @messages
       request(@messages.values)
     end
   end
-  
+
   Transport.register 'websocket', Transport::WebSocket
-  
+
 end

data/lib/faye/util/namespace.rb

@@ -1,20 +1,20 @@
 module Faye
   class Namespace
-    
+
     extend Forwardable
     def_delegator :@used, :delete, :release
     def_delegator :@used, :has_key?, :exists?
-    
+
     def initialize
       @used = {}
     end
-    
+
     def generate
       name = Engine.random
       name = Engine.random while @used.has_key?(name)
       @used[name] = name
     end
-    
+
   end
 end
 

data/spec/browser.html

@@ -7,7 +7,7 @@
   </head>
   <body>
     <script type="text/javascript">
-      
+
       if (typeof TestSwarm === 'undefined')
         TestSwarm = {
           submit: function(result) {
@@ -15,9 +15,9 @@
           },
           heartbeat: function() {}
         }
-      
+
       JS.cacheBust = true
-      
+
       JS.Packages(function() { with(this) {
         file('../build/browser/faye-browser-min.js').provides('Faye')
         autoload(/.*Spec/, {from: './javascript'})
@@ -30,7 +30,7 @@
             return function(actual) { testcase.assertEqual(expected, actual) }
           }
         })
-        
+
         JS.require( 'FayeSpec',
                     'GrammarSpec',
                     'ChannelSpec',
@@ -38,7 +38,7 @@
                     'TransportSpec',
                     JS.Test.method('autorun'))
       })
-      
+
     </script>
   </body>
 </html>

data/spec/javascript/channel_spec.js

@@ -1,13 +1,13 @@
 JS.ENV.ChannelSpec = JS.Test.describe("Channel", function() { with(this) {
   describe("expand", function() { with(this) {
     it("returns all patterns that match a channel", function() { with(this) {
-      
+
       assertEqual( ["/**", "/foo", "/*"],
                    Faye.Channel.expand("/foo") )
-      
+
       assertEqual( ["/**", "/foo/bar", "/foo/*", "/foo/**"],
                    Faye.Channel.expand("/foo/bar") )
-      
+
       assertEqual( ["/**", "/foo/bar/qux", "/foo/bar/*", "/foo/**", "/foo/bar/**"],
                    Faye.Channel.expand("/foo/bar/qux") )
     }})

data/spec/javascript/client_spec.js

@@ -4,11 +4,11 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
     Faye.extend(transport, Faye.Publisher)
     stub(Faye.Transport, "get").yields([transport])
   }})
-  
+
   before(function() { with(this) {
     stub("setTimeout")
   }})
-  
+
   define("stubResponse", function(response) { with(this) {
     stub(transport, "send", function(message) {
       response.id = message.id
@@ -19,7 +19,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
   define("createClient", function() { with(this) {
     this.client = new Faye.Client("http://localhost/")
   }})
-  
+
   define("createConnectedClient", function() { with(this) {
     createClient()
     stubResponse({channel:    "/meta/handshake",
@@ -27,29 +27,22 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
                   version:    "1.0",
                   supportedConnectionTypes: ["websocket"],
                   clientId:   "fakeid" })
-    
+
     client.handshake()
   }})
-  
+
   define("subscribe", function(client, channel, callback) { with(this) {
     stubResponse({channel:      "/meta/subscribe",
                   successful:   true,
                   clientId:     "fakeid",
                   subscription: channel })
-    
+
     this.subsCalled = 0
     callback = callback || function() { subsCalled += 1 }
     client.subscribe(channel, callback)
   }})
 
   describe("initialize", function() { with(this) {
-    it("creates a transport the server must support", function() { with(this) {
-      expect(Faye.Transport, "get").given(instanceOf(Faye.Client),
-                                          ["long-polling", "callback-polling", "in-process"])
-                                   .yielding([transport])
-      new Faye.Client("http://localhost/")
-    }})
-
     it("puts the client in the UNCONNECTED state", function() { with(this) {
       stub(Faye.Transport, "get")
       var client = new Faye.Client("http://localhost/")
@@ -60,7 +53,15 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
   describe("handshake", function() { with(this) {
     before(function() { this.createClient() })
 
-    it("sends a handshake message to the server", function() { with(this) {
+   it("creates a transport the server must support", function() { with(this) {
+      expect(Faye.Transport, "get").given(instanceOf(Faye.Client),
+                                          ["long-polling", "callback-polling", "in-process"],
+                                          [])
+                                   .yielding([transport])
+      client.handshake()
+    }})
+
+   it("sends a handshake message to the server", function() { with(this) {
       expect(transport, "send").given({
         channel:  "/meta/handshake",
         version:  "1.0",
@@ -75,7 +76,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
       client.handshake()
       assertEqual( "CONNECTING", client.getState() )
     }})
-    
+
     describe("with an outgoing extension installed", function() { with(this) {
       before(function() { with(this) {
         var extension = {
@@ -86,7 +87,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         }
         client.addExtension(extension)
       }})
-      
+
       it("passes the handshake message through the extension", function() { with(this) {
         expect(transport, "send").given({
           channel:  "/meta/handshake",
@@ -117,23 +118,25 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         client.handshake()
         assertEqual( "CONNECTED", client.getState() )
       }})
-      
+
       it("registers any pre-existing subscriptions", function() { with(this) {
         expect(client, "subscribe").given([], true)
         client.handshake()
       }})
-      
+
       it("selects a new transport based on what the server supports", function() { with(this) {
-        expect(Faye.Transport, "get").given(instanceOf(Faye.Client), ["long-polling", "websocket"])
+        expect(Faye.Transport, "get").given(instanceOf(Faye.Client), ["long-polling", "websocket"], [])
                                      .yielding([transport])
         client.handshake()
       }})
-      
+
       describe("with websocket disabled", function() { with(this) {
         before(function() { this.client.disable('websocket') })
-        
+
         it("selects a new transport, excluding websocket", function() { with(this) {
-          expect(Faye.Transport, "get").given(instanceOf(Faye.Client), ["long-polling"])
+          expect(Faye.Transport, "get").given(instanceOf(Faye.Client),
+                                              ["long-polling", "websocket"],
+                                              ["websocket"])
                                        .yielding([transport])
           client.handshake()
         }})
@@ -159,16 +162,16 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         assertEqual( "UNCONNECTED", client.getState() )
       }})
     }})
-    
+
     describe("with existing subscriptions after a server restart", function() { with(this) {
       before(function() { with(this) {
         createConnectedClient()
-        
+
         this.message = null
         subscribe(client, "/messages/foo", function(m) { message = m })
-        
+
         client.receiveMessage({advice: {reconnect: "handshake"}})
-        
+
         stubResponse({channel:      "/meta/handshake",
                       successful:   true,
                       version:      "1.0",
@@ -176,7 +179,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
                       clientId:     "reconnectid",
                       subscription: "/messages/foo" })  // tacked on to trigger subscribe() callback
       }})
-      
+
       it("resends the subscriptions to the server", function() { with(this) {
         expect(transport, "send").given({
           channel:      "/meta/subscribe",
@@ -186,17 +189,17 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         }, 60)
         client.handshake()
       }})
-      
+
       it("retains the listeners for the subscriptions", function() { with(this) {
         client.handshake()
         client.receiveMessage({channel: "/messages/foo", "data": "ok"})
         assertEqual( "ok", message )
       }})
     }})
-    
+
     describe("with a connected client", function() { with(this) {
       before(function() { this.createConnectedClient() })
-      
+
       it("does not send a handshake message to the server", function() { with(this) {
         expect(transport, "send").given({
           channel:  "/meta/handshake",
@@ -205,12 +208,12 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           id:       instanceOf("string")
         }, 60)
         .exactly(0)
-        
+
         client.handshake()
       }})
     }})
   }})
-  
+
   describe("connect", function() { with(this) {
     describe("with an unconnected client", function() { with(this) {
       before(function() { with(this) {
@@ -219,10 +222,10 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
                       version:    "1.0",
                       supportedConnectionTypes: ["websocket"],
                       clientId:   "handshakeid" })
-        
+
         createClient()
       }})
-      
+
       it("handshakes before connecting", function() { with(this) {
         expect(transport, "send").given({
           channel:        "/meta/connect",
@@ -233,10 +236,10 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         client.connect()
       }})
     }})
-    
+
     describe("with a connected client", function() { with(this) {
       before(function() { this.createConnectedClient() })
-      
+
       it("sends a connect message to the server", function() { with(this) {
         expect(transport, "send").given({
           channel:        "/meta/connect",
@@ -246,7 +249,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         }, 60)
         client.connect()
       }})
-      
+
       it("only opens one connect request at a time", function() { with(this) {
         expect(transport, "send").given({
           channel:        "/meta/connect",
@@ -255,16 +258,16 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           id:             instanceOf("string")
         }, 60)
         .exactly(1)
-        
+
         client.connect()
         client.connect()
       }})
     }})
   }})
-  
+
   describe("disconnect", function() { with(this) {
     before(function() { this.createConnectedClient() })
-    
+
     it("sends a disconnect message to the server", function() { with(this) {
       expect(transport, "send").given({
         channel:  "/meta/disconnect",
@@ -273,27 +276,27 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
       }, 60)
       client.disconnect()
     }})
-    
+
     it("puts the client in the DISCONNECTED state", function() { with(this) {
       stub(transport, "close")
       client.disconnect()
       assertEqual( "DISCONNECTED", client.getState() )
     }})
-    
+
     describe("on successful response", function() { with(this) {
       before(function() { with(this) {
         stubResponse({channel:      "/meta/disconnect",
                       successful:   true,
                       clientId:     "fakeid" })
       }})
-      
+
       it("closes the transport", function() { with(this) {
         expect(transport, "close")
         client.disconnect()
       }})
     }})
   }})
-  
+
   describe("subscribe", function() { with(this) {
     before(function() { with(this) {
       createConnectedClient()
@@ -304,13 +307,13 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           id:           instanceOf("string")
         }
     }})
-    
+
     describe("with no prior subscriptions", function() { with(this) {
       it("sends a subscribe message to the server", function() { with(this) {
         expect(transport, "send").given(subscribeMessage, 60)
         client.subscribe("/foo")
       }})
-      
+
       // The Bayeux spec says the server should accept a list of subscriptions
       // in one message but the cometD server doesn't actually support this
       describe("with an array of subscriptions", function() { with(this) {
@@ -329,7 +332,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           }, 60)
           client.subscribe(["/foo", "/bar"])
         }})
-        
+
         it("returns an array of subscriptions", function() { with(this) {
           stub(transport, "send")
           var subs = client.subscribe(["/foo", "/bar"])
@@ -337,7 +340,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           assertKindOf( Faye.Subscription, subs[0] )
         }})
       }})
-      
+
       describe("on successful response", function() { with(this) {
         before(function() { with(this) {
           stubResponse({channel:      "/meta/subscribe",
@@ -345,27 +348,27 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
                         clientId:     "fakeid",
                         subscription: "/foo/*" })
         }})
-        
+
         it("sets up a listener for the subscribed channel", function() { with(this) {
           var message
           client.subscribe("/foo/*", function(m) { message = m })
           client.receiveMessage({channel: "/foo/bar", data: "hi"})
           assertEqual( "hi", message )
         }})
-        
+
         it("does not call the listener for non-matching channels", function() { with(this) {
           var message
           client.subscribe("/foo/*", function(m) { message = m })
           client.receiveMessage({channel: "/bar", data: "hi"})
           assertEqual( undefined, message )
         }})
-        
+
         it("activates the subscription", function() { with(this) {
           var active = false
           client.subscribe("/foo/*").callback(function() { active = true })
           assert( active )
         }})
-        
+
         describe("with an incoming extension installed", function() { with(this) {
           before(function() { with(this) {
             var extension = {
@@ -378,13 +381,13 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
             this.message = null
             client.subscribe("/foo/*", function(m) { message = m })
           }})
-          
+
           it("passes delivered messages through the extension", function() { with(this) {
             client.receiveMessage({channel: "/foo/bar", data: {hello: "there"}})
             assertEqual( {hello: "there", changed: true}, message )
           }})
         }})
-        
+
         describe("with an outgoing extension installed", function() { with(this) {
           before(function() { with(this) {
             var extension = {
@@ -397,13 +400,13 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
             this.message = null
             client.subscribe("/foo/*", function(m) { message = m })
           }})
-          
+
           it("leaves messages unchanged", function() { with(this) {
             client.receiveMessage({channel: "/foo/bar", data: {hello: "there"}})
             assertEqual( {hello: "there"}, message )
           }})
         }})
-        
+
         describe("with an incoming extension that invalidates the response", function() { with(this) {
           before(function() { with(this) {
             var extension = {
@@ -414,14 +417,14 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
             }
             client.addExtension(extension)
           }})
-          
+
           it("does not set up a listener for the subscribed channel", function() { with(this) {
             var message
             client.subscribe("/foo/*", function(m) { message = m })
             client.receiveMessage({channel: "/foo/bar", data: "hi"})
             assertEqual( undefined, message )
           }})
-          
+
           it("does not activate the subscription", function() { with(this) {
             var active = false
             client.subscribe("/foo/*").callback(function() { active = true })
@@ -429,7 +432,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           }})
         }})
       }})
-      
+
       describe("on unsuccessful response", function() { with(this) {
         before(function() { with(this) {
           stubResponse({channel:      "/meta/subscribe",
@@ -438,14 +441,14 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
                         clientId:     "fakeid",
                         subscription: "/meta/foo" })
         }})
-        
+
         it("does not set up a listener for the subscribed channel", function() { with(this) {
           var message
           client.subscribe("/meta/foo", function(m) { message = m })
           client.receiveMessage({channel: "/meta/foo", data: "hi"})
           assertEqual( undefined, message )
         }})
-        
+
         it("does not activate the subscription", function() { with(this) {
           var active = false
           client.subscribe("/meta/foo").callback(function() { active = true })
@@ -459,23 +462,23 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         }})
       }})
     }})
-    
+
     describe("with an existing subscription", function() { with(this) {
       before(function() { with(this) {
         subscribe(client, "/foo/*")
       }})
-      
+
       it("does not send another subscribe message to the server", function() { with(this) {
         expect(transport, "send").given(subscribeMessage, 60).exactly(0)
         client.subscribe("/foo/*")
       }})
-      
+
       it("sets up another listener on the channel", function() { with(this) {
         client.subscribe("/foo/*", function() { subsCalled += 1 })
         client.receiveMessage({channel: "/foo/bar", data: "hi"})
         assertEqual( 2, subsCalled )
       }})
-      
+
       it("activates the subscription", function() { with(this) {
         var active = false
         client.subscribe("/foo/*").callback(function() { active = true })
@@ -483,7 +486,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
       }})
     }})
   }})
-  
+
   describe("unsubscribe", function() { with(this) {
     before(function() { with(this) {
       createConnectedClient()
@@ -494,26 +497,26 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
           id:           instanceOf("string")
         }
     }})
-    
+
     describe("with no subscriptions", function() { with(this) {
       it("does not send an unsubscribe message to the server", function() { with(this) {
         expect(transport, "send").given(unsubscribeMessage, 60).exactly(0)
         client.unsubscribe("/foo/*")
       }})
     }})
-    
+
     describe("with a single subscription", function() { with(this) {
       before(function() { with(this) {
         this.message  = null
         this.listener = function(m) { message = m }
         subscribe(client, "/foo/*", listener)
       }})
-      
+
       it("sends an unsubscribe message to the server", function() { with(this) {
         expect(transport, "send").given(unsubscribeMessage, 60)
         client.unsubscribe("/foo/*")
       }})
-      
+
       it("removes the listener from the channel", function() { with(this) {
         client.receiveMessage({channel: "/foo/bar", data: "first"})
         client.unsubscribe("/foo/*", listener)
@@ -521,7 +524,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         assertEqual( "first", message )
       }})
     }})
-    
+
     describe("with multiple subscriptions to the same channel", function() { with(this) {
       before(function() { with(this) {
         this.messages = []
@@ -530,37 +533,37 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         subscribe(client, "/foo/*", hey)
         subscribe(client, "/foo/*", bye)
       }})
-      
+
       it("removes one of the listeners from the channel", function() { with(this) {
         client.receiveMessage({channel: "/foo/bar", data: {text: "you"}})
         client.unsubscribe("/foo/*", hey)
         client.receiveMessage({channel: "/foo/bar", data: {text: "you"}})
         assertEqual( ["hey you", "bye you", "bye you"], messages)
       }})
-      
+
       it("does not send an unsubscribe message if one listener is removed", function() { with(this) {
         expect(transport, "send").given(unsubscribeMessage, 60).exactly(0)
         client.unsubscribe("/foo/*", bye)
       }})
-      
+
       it("sends an unsubscribe message if each listener is removed", function() { with(this) {
         expect(transport, "send").given(unsubscribeMessage, 60)
         client.unsubscribe("/foo/*", bye)
         client.unsubscribe("/foo/*", hey)
       }})
-      
+
       it("sends an unsubscribe message if all listeners are removed", function() { with(this) {
         expect(transport, "send").given(unsubscribeMessage, 60)
         client.unsubscribe("/foo/*")
       }})
     }})
-    
+
     describe("with multiple subscriptions to different channels", function() { with(this) {
       before(function() { with(this) {
         subscribe(client, "/foo")
         subscribe(client, "/bar")
       }})
-      
+
       it("sends multiple unsubscribe messages if given an array", function() { with(this) {
         expect(transport, "send").given({
           channel:      "/meta/unsubscribe",
@@ -578,10 +581,10 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
       }})
     }})
   }})
-  
+
   describe("publish", function() { with(this) {
     before(function() { this.createConnectedClient() })
-    
+
     it("sends the message to the server with an ID", function() { with(this) {
       expect(transport, "send").given({
         channel:  "/messages/foo",
@@ -591,7 +594,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
       }, 60)
       client.publish("/messages/foo", {hello: "world"})
     }})
-    
+
     describe("on publish failure", function() { with(this) {
       before(function() { with(this) {
         stubResponse({channel:    "/messages/foo",
@@ -599,13 +602,13 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
                       successful: false,
                       clientId:   "fakeid" })
       }})
-      
+
       it("should not be published", function() { with(this) {
         var published = false
         client.publish("/messages/foo", {text: "hi"}).callback(function() { published = true })
         assert( !published )
       }})
-      
+
       it("reports the error through an errback", function() { with(this) {
         var error = null
         client.publish("/messages/foo", {text: "hi"}).errback(function(e) { error = e })
@@ -614,14 +617,14 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         assertEqual( "Failed to publish", error.message )
       }})
     }})
-    
+
     describe("on receipt of the published message", function() { with(this) {
       before(function() { with(this) {
         stubResponse({channel:    "/messages/foo",
                       data:       {text: "hi"},
                       clientId:   "fakeid" })
       }})
-      
+
       it("does not trigger the callbacks", function() { with(this) {
         var published = false
         var publication = client.publish("/messages/foo", {text: "hi"})
@@ -630,7 +633,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         assert( !published )
       }})
     }})
-    
+
     describe("with an outgoing extension installed", function() { with(this) {
       before(function() { with(this) {
         var extension = {
@@ -641,7 +644,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         }
         client.addExtension(extension)
       }})
-      
+
       it("passes messages through the extension", function() { with(this) {
         expect(transport, "send").given({
           channel:  "/messages/foo",
@@ -653,7 +656,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         client.publish("/messages/foo", {hello: "world"})
       }})
     }})
-    
+
     describe("with an incoming extension installed", function() { with(this) {
       before(function() { with(this) {
         var extension = {
@@ -664,7 +667,7 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
         }
         client.addExtension(extension)
       }})
-      
+
       it("leaves the message unchanged", function() { with(this) {
         expect(transport, "send").given({
           channel:  "/messages/foo",
@@ -676,44 +679,47 @@ JS.ENV.ClientSpec = JS.Test.describe("Client", function() { with(this) {
       }})
     }})
   }})
-  
+
   describe("network notifications", function() { with(this) {
-    before(function() { this.createClient() })
-    
+    before(function() { with(this) {
+      createClient()
+      client.handshake()
+    }})
+
     describe("in the default state", function() { with(this) {
       it("broadcasts a down notification", function() { with(this) {
         expect(client, "trigger").given("transport:down")
         transport.trigger("down")
       }})
-      
+
       it("broadcasts an up notification", function() { with(this) {
         expect(client, "trigger").given("transport:up")
         transport.trigger("up")
       }})
     }})
-    
+
     describe("when the transport is up", function() { with(this) {
       before(function() { this.transport.trigger("up") })
-      
+
       it("broadcasts a down notification", function() { with(this) {
         expect(client, "trigger").given("transport:down")
         transport.trigger("down")
       }})
-      
+
       it("does not broadcast an up notification", function() { with(this) {
         expect(client, "trigger").exactly(0)
         transport.trigger("up")
       }})
     }})
-    
+
     describe("when the transport is down", function() { with(this) {
       before(function() { this.transport.trigger("down") })
-      
+
       it("does not broadcast a down notification", function() { with(this) {
         expect(client, "trigger").exactly(0)
         transport.trigger("down")
       }})
-      
+
       it("broadcasts an up notification", function() { with(this) {
         expect(client, "trigger").given("transport:up")
         transport.trigger("up")