From 91cc683b5b1ec0195264385c99c9dc316b2b2908 Mon Sep 17 00:00:00 2001
From: Lukas Schmidt <lukas.schmi@gmail.com>
Date: Mon, 7 Sep 2015 20:25:13 +0200
Subject: [PATCH] clean up code style

---
 GenericSocketParser.swift                    |  6 ++--
 SocketIO-iOSTests/SocketAckManagerTest.swift |  2 +-
 SocketIO-iOSTests/SocketParserTest.swift     |  2 +-
 SocketIOClientSwift/SocketParser.swift       | 30 +++++++++++---------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/GenericSocketParser.swift b/GenericSocketParser.swift
index a963988..04b25ae 100644
--- a/GenericSocketParser.swift
+++ b/GenericSocketParser.swift
@@ -8,10 +8,10 @@
 
 import Foundation
 
-struct GenericParser {
+struct GenericSocketParser {
     let message: String
-    var currentIndex:Int
-    var messageCharacters: Array<Character> {
+    var currentIndex: Int
+    var messageCharacters: [Character] {
         get {
             return Array(message.characters)
         }
diff --git a/SocketIO-iOSTests/SocketAckManagerTest.swift b/SocketIO-iOSTests/SocketAckManagerTest.swift
index 04df7a5..e2664d9 100644
--- a/SocketIO-iOSTests/SocketAckManagerTest.swift
+++ b/SocketIO-iOSTests/SocketAckManagerTest.swift
@@ -14,7 +14,7 @@ class SocketAckManagerTest: XCTestCase {
     func testAddAcks() {
         let callbackExpection = self.expectationWithDescription("callbackExpection")
         let itemsArray = ["Hi", "ho"]
-        func callback(items:NSArray?) {
+        func callback(items: NSArray?) {
             callbackExpection.fulfill()
             items?.isEqualToArray(itemsArray)
         }
diff --git a/SocketIO-iOSTests/SocketParserTest.swift b/SocketIO-iOSTests/SocketParserTest.swift
index 0e4e3ac..e4f7a1a 100644
--- a/SocketIO-iOSTests/SocketParserTest.swift
+++ b/SocketIO-iOSTests/SocketParserTest.swift
@@ -77,7 +77,7 @@ class SocketParserTest: XCTestCase {
     }
     
     func testGenericParser() {
-        var parser = GenericParser(message: "61-/swift,", currentIndex: 0)
+        var parser = GenericSocketParser(message: "61-/swift,", currentIndex: 0)
         XCTAssertEqual(parser.read(1), "6")
         XCTAssertEqual(parser.currentCharacter, "1")
         XCTAssertEqual(parser.readUntilStringOccurence("-"), "1")
diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index 225c3cd..59025e4 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/SocketIOClientSwift/SocketParser.swift
@@ -61,9 +61,10 @@ class SocketParser {
     }
     
     // Translation of socket.io-client#decodeString
-    static func parseString(str: String) throws -> SocketPacket {
-        var parser = GenericParser(message: str, currentIndex: 0)
-        guard let typeString = parser.read(1), let type = SocketPacket.PacketType(str: typeString) else {
+    static func parseString(message: String) throws -> SocketPacket {
+        var parser = GenericSocketParser(message: message, currentIndex: 0)
+        guard let typeString = parser.read(1),
+            let type = SocketPacket.PacketType(str: typeString) else {
             throw SocketParserError.InvalidMessageType
         }
         
@@ -71,24 +72,25 @@ class SocketParser {
             return SocketPacket(type: type, nsp: "/")
         }
         
-        var nsp:String?
+        var namespace: String?
         var placeholders = -1
         
         if type == .BinaryEvent || type == .BinaryAck {
-            if let buffer = parser.readUntilStringOccurence("-"), let holders = Int(buffer) where parser.read(1)! == "-" {
+            if let buffer = parser.readUntilStringOccurence("-"), let holders = Int(buffer)
+                where parser.read(1)! == "-" {
                 placeholders = holders
             } else {
                throw SocketParserError.InvalidBinaryPalceholder
             }
         }
         if parser.currentCharacter == "/" {
-            nsp = parser.readUntilStringOccurence(",") ?? parser.readUntilEnd()
+            namespace = parser.readUntilStringOccurence(",") ?? parser.readUntilEnd()
             parser.currentIndex++
         }
         
         if parser.currentIndex >= parser.messageCharacters.count {
             return SocketPacket(type: type, id: -1,
-                nsp: nsp ?? "/", placeholders: placeholders)
+                nsp: namespace ?? "/", placeholders: placeholders)
         }
         
         var idString = ""
@@ -101,12 +103,12 @@ class SocketParser {
             }
         }
         
-        let d = str[str.startIndex.advancedBy(parser.currentIndex + 1)...str.startIndex.advancedBy(str.characters.count - 1)]
+        let d = message[message.startIndex.advancedBy(parser.currentIndex + 1)...message.startIndex.advancedBy(message.characters.count - 1)]
         let noPlaceholders = d["(\\{\"_placeholder\":true,\"num\":(\\d*)\\})"] ~= "\"~~$2\""
-        let data = SocketParser.parseData(noPlaceholders) as? [AnyObject] ?? [noPlaceholders]
+        let data = parseData(noPlaceholders) as? [AnyObject] ?? [noPlaceholders]
         
         return SocketPacket(type: type, data: data, id: Int(idString) ?? -1,
-            nsp: nsp ?? "/", placeholders: placeholders)
+            nsp: namespace ?? "/", placeholders: placeholders)
     }
     
     // Parses data for events
@@ -122,13 +124,13 @@ class SocketParser {
     }
     
     // Parses messages recieved
-    static func parseSocketMessage(stringMessage: String, socket: SocketIOClient) {
-        guard !stringMessage.isEmpty else { return }
+    static func parseSocketMessage(message: String, socket: SocketIOClient) {
+        guard !message.isEmpty else { return }
         
-        Logger.log("Parsing %@", type: "SocketParser", args: stringMessage)
+        Logger.log("Parsing %@", type: "SocketParser", args: message)
         
         do {
-            let pack = try parseString(stringMessage)
+            let pack = try parseString(message)
             Logger.log("Decoded packet as: %@", type: "SocketParser", args: pack.description)
             
             switch pack.type {