From 12f9207d8ac373958beeb546505e17b4d99853d3 Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 16 Feb 2016 17:03:00 -0500 Subject: [PATCH] rename waitingData to waitingPackets --- Source/SocketClientSpec.swift | 2 +- Source/SocketIOClient.swift | 4 ++-- Source/SocketParsable.swift | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/SocketClientSpec.swift b/Source/SocketClientSpec.swift index 6408f39..c0f8c9e 100644 --- a/Source/SocketClientSpec.swift +++ b/Source/SocketClientSpec.swift @@ -24,7 +24,7 @@ protocol SocketClientSpec: class { var nsp: String { get set } - var waitingData: [SocketPacket] { get set } + var waitingPackets: [SocketPacket] { get set } func didConnect() func didDisconnect(reason: String) diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index 643ab7d..25a8719 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -53,7 +53,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable private(set) var handleQueue = dispatch_get_main_queue() private(set) var reconnectAttempts = -1 - var waitingData = [SocketPacket]() + var waitingPackets = [SocketPacket]() /** Type safe way to create a new SocketIOClient. opts can be omitted @@ -302,7 +302,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable } public func engineDidClose(reason: String) { - waitingData.removeAll() + waitingPackets.removeAll() if status == .Closed || !reconnects { didDisconnect(reason) diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index 8423ca3..4125351 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -50,9 +50,9 @@ extension SocketParsable { case .Ack where isCorrectNamespace(pack.nsp): handleAck(pack.id, data: pack.data) case .BinaryEvent where isCorrectNamespace(pack.nsp): - waitingData.append(pack) + waitingPackets.append(pack) case .BinaryAck where isCorrectNamespace(pack.nsp): - waitingData.append(pack) + waitingPackets.append(pack) case .Connect: handleConnect(pack) case .Disconnect: @@ -160,17 +160,17 @@ extension SocketParsable { } func parseBinaryData(data: NSData) { - guard !waitingData.isEmpty else { + guard !waitingPackets.isEmpty else { DefaultSocketLogger.Logger.error("Got data when not remaking packet", type: "SocketParser") return } // Should execute event? - guard waitingData[waitingData.count - 1].addData(data) else { + guard waitingPackets[waitingPackets.count - 1].addData(data) else { return } - let packet = waitingData.removeLast() + let packet = waitingPackets.removeLast() if packet.type != .BinaryAck { handleEvent(packet.event, data: packet.args ?? [],