From 8b05f922a61ed00ebfb1c8b1d63ab3a18d629e0b Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 17 Apr 2015 07:49:48 -0400 Subject: [PATCH] rename socketackmap, code style changes for #55 --- .../{SocketAckMap.swift => SocketAckManager.swift} | 4 ++-- SocketIOClientSwift/SocketEngine.swift | 4 +++- SocketIOClientSwift/SocketIOClient.swift | 7 +++---- 3 files changed, 8 insertions(+), 7 deletions(-) rename SocketIOClientSwift/{SocketAckMap.swift => SocketAckManager.swift} (97%) mode change 100755 => 100644 SocketIOClientSwift/SocketEngine.swift mode change 100755 => 100644 SocketIOClientSwift/SocketIOClient.swift diff --git a/SocketIOClientSwift/SocketAckMap.swift b/SocketIOClientSwift/SocketAckManager.swift similarity index 97% rename from SocketIOClientSwift/SocketAckMap.swift rename to SocketIOClientSwift/SocketAckManager.swift index d2e434c..cc3638b 100644 --- a/SocketIOClientSwift/SocketAckMap.swift +++ b/SocketIOClientSwift/SocketAckManager.swift @@ -1,5 +1,5 @@ // -// SocketAckMap.swift +// SocketAckManager.swift // SocketIO-Swift // // Created by Erik Little on 4/3/15. @@ -49,7 +49,7 @@ private func ==(lhs:SocketAck, rhs:SocketAck) -> Bool { return lhs.ack == rhs.ack } -struct SocketAckMap { +struct SocketAckManager { private var acks = Set(minimumCapacity: 1) mutating func addAck(ack:Int, callback:AckCallback) { diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift old mode 100755 new mode 100644 index 3ac169f..b8e7419 --- a/SocketIOClientSwift/SocketEngine.swift +++ b/SocketIOClientSwift/SocketEngine.swift @@ -23,6 +23,7 @@ // THE SOFTWARE. import Foundation + extension String { private var length:Int { return count(self) @@ -92,7 +93,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient { } public init(client:SocketEngineClient, forcePolling:Bool, - forceWebsockets:Bool, withCookies cookies:[NSHTTPCookie]?, logging:Bool, withSessionDelegate sessionDelegate : NSURLSessionDelegate?) { + forceWebsockets:Bool, withCookies cookies:[NSHTTPCookie]?, logging:Bool, + withSessionDelegate sessionDelegate:NSURLSessionDelegate?) { self.client = client self.forcePolling = forcePolling self.forceWebsockets = forceWebsockets diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift old mode 100755 new mode 100644 index dc566c7..c081fa8 --- a/SocketIOClientSwift/SocketIOClient.swift +++ b/SocketIOClientSwift/SocketIOClient.swift @@ -43,12 +43,11 @@ public final class SocketIOClient: NSObject, NSURLSessionDelegate, SocketEngineC let reconnectAttempts:Int! let logType = "SocketClient" - var ackHandlers = SocketAckMap() + var ackHandlers = SocketAckManager() var currentAck = -1 var log = false var waitingData = ContiguousArray() - - var sessionDelegate : NSURLSessionDelegate? + var sessionDelegate:NSURLSessionDelegate? public let socketURL:String public let handleAckQueue = dispatch_queue_create("handleAckQueue", DISPATCH_QUEUE_SERIAL) @@ -153,7 +152,7 @@ public final class SocketIOClient: NSObject, NSURLSessionDelegate, SocketEngineC forceWebsockets: self.forceWebsockets, withCookies: self.cookies, logging: self.log, - withSessionDelegate : self.sessionDelegate) + withSessionDelegate: self.sessionDelegate) } /**