Skip to content

Commit 8b05f92

Browse files
committed
rename socketackmap, code style changes for #55
1 parent f38cf9e commit 8b05f92

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

SocketIOClientSwift/SocketAckMap.swift renamed to SocketIOClientSwift/SocketAckManager.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// SocketAckMap.swift
2+
// SocketAckManager.swift
33
// SocketIO-Swift
44
//
55
// Created by Erik Little on 4/3/15.
@@ -49,7 +49,7 @@ private func ==(lhs:SocketAck, rhs:SocketAck) -> Bool {
4949
return lhs.ack == rhs.ack
5050
}
5151

52-
struct SocketAckMap {
52+
struct SocketAckManager {
5353
private var acks = Set<SocketAck>(minimumCapacity: 1)
5454

5555
mutating func addAck(ack:Int, callback:AckCallback) {

SocketIOClientSwift/SocketEngine.swift

100755100644
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
// THE SOFTWARE.
2424

2525
import Foundation
26+
2627
extension String {
2728
private var length:Int {
2829
return count(self)
@@ -92,7 +93,8 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
9293
}
9394

9495
public init(client:SocketEngineClient, forcePolling:Bool,
95-
forceWebsockets:Bool, withCookies cookies:[NSHTTPCookie]?, logging:Bool, withSessionDelegate sessionDelegate : NSURLSessionDelegate?) {
96+
forceWebsockets:Bool, withCookies cookies:[NSHTTPCookie]?, logging:Bool,
97+
withSessionDelegate sessionDelegate:NSURLSessionDelegate?) {
9698
self.client = client
9799
self.forcePolling = forcePolling
98100
self.forceWebsockets = forceWebsockets

SocketIOClientSwift/SocketIOClient.swift

100755100644
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ public final class SocketIOClient: NSObject, NSURLSessionDelegate, SocketEngineC
4343

4444
let reconnectAttempts:Int!
4545
let logType = "SocketClient"
46-
var ackHandlers = SocketAckMap()
46+
var ackHandlers = SocketAckManager()
4747
var currentAck = -1
4848
var log = false
4949
var waitingData = ContiguousArray<SocketPacket>()
50-
51-
var sessionDelegate : NSURLSessionDelegate?
50+
var sessionDelegate:NSURLSessionDelegate?
5251

5352
public let socketURL:String
5453
public let handleAckQueue = dispatch_queue_create("handleAckQueue", DISPATCH_QUEUE_SERIAL)
@@ -153,7 +152,7 @@ public final class SocketIOClient: NSObject, NSURLSessionDelegate, SocketEngineC
153152
forceWebsockets: self.forceWebsockets,
154153
withCookies: self.cookies,
155154
logging: self.log,
156-
withSessionDelegate : self.sessionDelegate)
155+
withSessionDelegate: self.sessionDelegate)
157156
}
158157

159158
/**

0 commit comments

Comments
 (0)