Cleaned up debugLogger code and added a test for it

Author: hamchapman

Source/PusherConnection.swift

@@ -104,9 +104,7 @@ public class PusherConnection {
             sendClientEvent(event, data: data, channelName: channelName)
         } else {
             let dataString = JSONStringify(["event": event, "data": data])
-            if let debugLogger = self.options.debugLogger {
-                debugLogger("[PUSHER DEBUG] sendEvent \(dataString)")
-            }
+            self.options.debugLogger?("[PUSHER DEBUG] sendEvent \(dataString)")
             self.socket.writeString(dataString)
         }
     }
@@ -122,9 +120,7 @@ public class PusherConnection {
         if let cName = channelName {
             if isPresenceChannel(cName) || isPrivateChannel(cName) {
                 let dataString = JSONStringify(["event": event, "data": data, "channel": cName])
-                if let debugLogger = self.options.debugLogger {
-                    debugLogger("[PUSHER DEBUG] sendClientEvent \(dataString)")
-                }
+                self.options.debugLogger?("[PUSHER DEBUG] sendClientEvent \(dataString)")
                 self.socket.writeString(dataString)
             } else {
                 print("You must be subscribed to a private or presence channel to send client events")
@@ -347,7 +343,7 @@ public class PusherConnection {
                 print("Unable to parse string from WebSocket: \(string)")
             }
         } catch let error as NSError {
-            print(error.localizedDescription)
+            print("Error: \(error.localizedDescription)")
         }
         return nil
     }
@@ -408,11 +404,14 @@ public class PusherConnection {
         - parameter jsonObject: The event-specific data related to the incoming event
     */
     private func callGlobalCallbacks(eventName: String, jsonObject: Dictionary<String,AnyObject>) {
-        if let channelName = jsonObject["channel"] as? String, eData =  jsonObject["data"] as? String {
-            if let globalChannel = self.globalChannel {
+        if let globalChannel = self.globalChannel {
+            if let eData =  jsonObject["data"] as? String {
+                let channelName = jsonObject["channel"] as! String?
                 globalChannel.handleEvent(channelName, eventName: eventName, eventData: eData)
+            } else if let eData =  jsonObject["data"] as? [String: AnyObject] {
+                globalChannel.handleErrorEvent(eventName, eventData: eData)
             }
-        }
+    }
     }
 
     /**

Source/PusherGlobalChannel.swift

@@ -23,13 +23,32 @@ public class GlobalChannel: PusherChannel {
     /**
         Calls the appropriate callbacks for the given eventName in the scope of the global channel
 
-        - parameter channelName: The name of the channel that the received message was triggered to
+        - parameter channelName: The name of the channel that the received message was triggered
+                                 to, if relevant
         - parameter eventName:   The name of the received event
         - parameter eventdata:   The data associated with the received message
     */
-    internal func handleEvent(channelName: String, eventName: String, eventData: String) {
+    internal func handleEvent(channelName: String?, eventName: String, eventData: String) {
         for (_, callback) in self.globalCallbacks {
-            callback(["channel": channelName, "event": eventName, "data": eventData])
+            if let channelName = channelName {
+                callback(["channel": channelName, "event": eventName, "data": eventData])
+            } else {
+                callback(["event": eventName, "data": eventData])
+            }
+        }
+    }
+
+    /**
+     Calls the appropriate callbacks for the given eventName in the scope of the global channel
+
+     - parameter channelName: The name of the channel that the received message was triggered
+     to, if relevant
+     - parameter eventName:   The name of the received event
+     - parameter eventdata:   The data associated with the received message
+     */
+    internal func handleErrorEvent(eventName: String, eventData: [String:AnyObject]) {
+        for (_, callback) in self.globalCallbacks {
+            callback(["event": eventName, "data": eventData])
         }
     }
 

Source/PusherWebsocketDelegate.swift

@@ -16,13 +16,11 @@ extension PusherConnection: WebSocketDelegate {
         - parameter text: The message received over the websocket
     */
     public func websocketDidReceiveMessage(ws: WebSocket, text: String) {
+        self.options.debugLogger?("[PUSHER DEBUG] websocketDidReceiveMessage \(text)")
         if let pusherPayloadObject = getPusherEventJSONFromString(text), eventName = pusherPayloadObject["event"] as? String {
-            if let debugLogger = self.options.debugLogger {
-                debugLogger("[PUSHER DEBUG] websocketDidReceiveMessage \(text)")
-            }
             self.handleEvent(eventName, jsonObject: pusherPayloadObject)
         } else {
-            print("Unable to handle incoming Websocket message")
+            print("Unable to handle incoming Websocket message \(text)")
         }
     }
 

Tests/PusherIncomingEventHandlingTests.swift

@@ -83,6 +83,25 @@ class HandlingIncomingEventsSpec: QuickSpec {
                 expect(socket.objectGivenToCallback as? String).to(equal("{\"test\":\"test string\",\"and\":\"another\"}"))
             }
 
+            it("should handle receiving an error where the data part of the message isn't double encoded") {
+                pusher = Pusher(key: key)
+                socket.delegate = pusher.connection
+                pusher.connection.socket = socket
+                pusher.bind({ (message: AnyObject?) in
+                    if let message = message as? [String: AnyObject], eventName = message["event"] as? String where eventName == "pusher:error" {
+                        if let data = message["data"] as? [String: AnyObject], errorMessage = data["message"] as? String {
+                            socket.appendToCallbackCheckString(errorMessage)
+                        }
+                    }
+                })
+
+                // pretend that we tried to subscribe to my-channel twice and got this error
+                // back from Pusher
+                pusher.connection.handleEvent("pusher:error", jsonObject: ["event": "pusher:error", "data": ["code": "<null>", "message": "Existing subscription to channel my-channel"]])
+
+                expect(socket.callbackCheckString).to(equal("Existing subscription to channel my-channel"))
+            }
+
             it("should pass incoming messages to the debugLogger if one is set") {
                 let debugLogger = { (text: String) in socket.appendToCallbackCheckString(text) }
                 pusher = Pusher(key: key, options: ["debugLogger": debugLogger])