Merge pull request #65 from spreaker/fix-autoreconnect

Fix autoreconnect

Author: hamchapman

Source/PusherChannel.swift

@@ -84,14 +84,11 @@ public class PusherChannel {
     */
     public func handleEvent(eventName: String, eventData: String) {
         if let eventHandlerArray = self.eventHandlers[eventName] {
-            if let _ = connection.options.attemptToReturnJSONObject {
-                for eventHandler in eventHandlerArray {
-                    eventHandler.callback(connection.getEventDataJSONFromString(eventData))
-                }
-            } else {
-                for eventHandler in eventHandlerArray {
-                    eventHandler.callback(eventData)
-                }
+            
+            let jsonize = connection.options.attemptToReturnJSONObject ?? false
+            
+            for eventHandler in eventHandlerArray {
+                eventHandler.callback(jsonize ? connection.getEventDataJSONFromString(eventData) : eventData)
             }
         }
     }

Source/PusherWebsocketDelegate.swift

@@ -31,15 +31,20 @@ extension PusherConnection: WebSocketDelegate {
         - parameter error: The error, if one exists, when disconnected
     */
     public func websocketDidDisconnect(ws: WebSocket, error: NSError?) {
-        if let error = error {
-            print("Websocket is disconnected: \(error.localizedDescription)")
-        }
 
         updateConnectionState(.Disconnected)
         for (_, channel) in self.channels.channels {
             channel.subscribed = false
         }
-
+        
+        // Handle error (if any)
+        guard let error = error where error.code != Int(WebSocket.CloseCode.Normal.rawValue) else {
+            return
+        }
+        
+        print("Websocket is disconnected. Error: \(error.localizedDescription)")
+        
+        // Reconnect if possible
         if let reconnect = self.options.autoReconnect where reconnect {
             if let reachability = self.reachability where reachability.isReachable() {
                 let operation = NSBlockOperation {