From b35004ef601111a1f41d78e1c0ec670f4c74c45d Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Mon, 9 Nov 2015 11:41:06 -0500
Subject: [PATCH] clean up some internal apis

---
 SocketIOClientSwift/SocketEventHandler.swift | 15 ++++-----------
 SocketIOClientSwift/SocketIOClient.swift     | 10 +++-------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/SocketIOClientSwift/SocketEventHandler.swift b/SocketIOClientSwift/SocketEventHandler.swift
index e518e4c..9f2ee68 100644
--- a/SocketIOClientSwift/SocketEventHandler.swift
+++ b/SocketIOClientSwift/SocketEventHandler.swift
@@ -24,23 +24,16 @@
 
 import Foundation
 
-private func emitAckCallback(socket: SocketIOClient, num: Int?) -> SocketAckEmitter? {
-    return num != nil ? SocketAckEmitter(socket: socket, ackNum: num!) : nil
+private func emitAckCallback(socket: SocketIOClient, num: Int) -> SocketAckEmitter? {
+    return num != -1 ? SocketAckEmitter(socket: socket, ackNum: num) : nil
 }
 
 struct SocketEventHandler {
     let event: String
-    let callback: NormalCallback
     let id: NSUUID
+    let callback: NormalCallback
     
-    init(event: String, id: NSUUID = NSUUID(), callback: NormalCallback) {
-        self.event = event
-        self.id = id
-        self.callback = callback
-    }
-    
-    func executeCallback(items: [AnyObject], withAck ack: Int? = nil, withAckType type: Int? = nil,
-        withSocket socket: SocketIOClient) {
+    func executeCallback(items: [AnyObject], withAck ack: Int = -1, withSocket socket: SocketIOClient) {
                 self.callback(items, emitAckCallback(socket, num: ack))
     }
 }
diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift
index 7a8e748..9a95445 100644
--- a/SocketIOClientSwift/SocketIOClient.swift
+++ b/SocketIOClientSwift/SocketIOClient.swift
@@ -341,7 +341,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
      Causes an event to be handled. Only use if you know what you're doing.
      */
     public func handleEvent(event: String, data: [AnyObject], isInternalMessage: Bool,
-        withAck ack: Int? = nil) {
+        withAck ack: Int = -1) {
             guard status == .Connected || isInternalMessage else {
                 return
             }
@@ -352,11 +352,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
                 self.anyHandler?(SocketAnyEvent(event: event, items: data))
                 
                 for handler in self.handlers where handler.event == event {
-                    if let ack = ack {
-                        handler.executeCallback(data, withAck: ack, withSocket: self)
-                    } else {
-                        handler.executeCallback(data, withAck: ack, withSocket: self)
-                    }
+                    handler.executeCallback(data, withAck: ack, withSocket: self)
                 }
             }
             
@@ -406,7 +402,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
     public func on(event: String, callback: NormalCallback) {
         DefaultSocketLogger.Logger.log("Adding handler for event: %@", type: logType, args: event)
         
-        let handler = SocketEventHandler(event: event, callback: callback)
+        let handler = SocketEventHandler(event: event, id: NSUUID(), callback: callback)
         handlers.append(handler)
     }