From 0dd3def2e49d9d4cd9c9f102cdcf3f55653e575c Mon Sep 17 00:00:00 2001
From: Erik <nuclear.ace@gmail.com>
Date: Wed, 21 Oct 2015 11:16:27 -0400
Subject: [PATCH] don't need extra inits in enums

---
 SocketIO-iOSTests/SocketParserTest.swift         | 2 +-
 SocketIOClientSwift/SocketEngine.swift           | 2 +-
 SocketIOClientSwift/SocketEnginePacketType.swift | 8 --------
 SocketIOClientSwift/SocketIOClient.swift         | 1 -
 SocketIOClientSwift/SocketIOClientStatus.swift   | 4 ++--
 SocketIOClientSwift/SocketPacket.swift           | 8 --------
 SocketIOClientSwift/SocketParser.swift           | 2 +-
 7 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/SocketIO-iOSTests/SocketParserTest.swift b/SocketIO-iOSTests/SocketParserTest.swift
index 5865418..91a9a3d 100644
--- a/SocketIO-iOSTests/SocketParserTest.swift
+++ b/SocketIO-iOSTests/SocketParserTest.swift
@@ -113,7 +113,7 @@ class SocketParserTest: XCTestCase {
         let packet = SocketParser.parseString(message)
         let type = message.substringWithRange(Range<String.Index>(start: message.startIndex, end: message.startIndex.advancedBy(1)))
         if case let .Right(packet) = packet {
-            XCTAssertEqual(packet.type, SocketPacket.PacketType(str:type)!)
+            XCTAssertEqual(packet.type, SocketPacket.PacketType(rawValue: Int(type) ?? -1)!)
             XCTAssertEqual(packet.nsp, validValues.0)
             XCTAssertTrue((packet.data as NSArray).isEqualToArray(validValues.1))
             XCTAssertTrue((packet.binary as NSArray).isEqualToArray(validValues.2))
diff --git a/SocketIOClientSwift/SocketEngine.swift b/SocketIOClientSwift/SocketEngine.swift
index f2d6922..4109adb 100644
--- a/SocketIOClientSwift/SocketEngine.swift
+++ b/SocketIOClientSwift/SocketEngine.swift
@@ -354,7 +354,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
     private func parseEngineMessage(var message: String, fromPolling: Bool) {
         Logger.log("Got message: %@", type: logType, args: message)
 
-        let type = SocketEnginePacketType(str: (message["^(\\d)"].groups()?[1]) ?? "") ?? {
+        let type = SocketEnginePacketType(rawValue: Int((message["^(\\d)"].groups()?[1]) ?? "") ?? -1) ?? {
             self.checkIfMessageIsBase64Binary(message)
             return .Noop
             }()
diff --git a/SocketIOClientSwift/SocketEnginePacketType.swift b/SocketIOClientSwift/SocketEnginePacketType.swift
index 5bbd690..f899721 100644
--- a/SocketIOClientSwift/SocketEnginePacketType.swift
+++ b/SocketIOClientSwift/SocketEnginePacketType.swift
@@ -27,12 +27,4 @@ import Foundation
 
 @objc public enum SocketEnginePacketType: Int {
     case Open, Close, Ping, Pong, Message, Upgrade, Noop
-    
-    init?(str: String) {
-        if let value = Int(str), raw = SocketEnginePacketType(rawValue: value) {
-            self = raw
-        } else {
-            return nil
-        }
-    }
 }
\ No newline at end of file
diff --git a/SocketIOClientSwift/SocketIOClient.swift b/SocketIOClientSwift/SocketIOClient.swift
index fe48ca3..8f69e2c 100644
--- a/SocketIOClientSwift/SocketIOClient.swift
+++ b/SocketIOClientSwift/SocketIOClient.swift
@@ -487,7 +487,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
             return
         }
         
-        
         if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects {
             clearReconnectTimer()
             didDisconnect("Reconnect Failed")
diff --git a/SocketIOClientSwift/SocketIOClientStatus.swift b/SocketIOClientSwift/SocketIOClientStatus.swift
index db9f959..e8720c6 100644
--- a/SocketIOClientSwift/SocketIOClientStatus.swift
+++ b/SocketIOClientSwift/SocketIOClientStatus.swift
@@ -25,6 +25,8 @@
 import Foundation
 
 @objc public enum SocketIOClientStatus: Int, CustomStringConvertible {
+    case NotConnected, Closed, Connecting, Connected, Reconnecting
+
     public var description: String {
         switch self {
         case NotConnected:
@@ -39,6 +41,4 @@ import Foundation
             return "Reconnecting"
         }
     }
-    
-    case NotConnected, Closed, Connecting, Connected, Reconnecting
 }
\ No newline at end of file
diff --git a/SocketIOClientSwift/SocketPacket.swift b/SocketIOClientSwift/SocketPacket.swift
index d059164..14fb1a8 100644
--- a/SocketIOClientSwift/SocketPacket.swift
+++ b/SocketIOClientSwift/SocketPacket.swift
@@ -37,14 +37,6 @@ struct SocketPacket {
     
     enum PacketType: Int {
         case Connect, Disconnect, Event, Ack, Error, BinaryEvent, BinaryAck
-        
-        init?(str: String) {
-            if let int = Int(str), raw = PacketType(rawValue: int) {
-                self = raw
-            } else {
-                return nil
-            }
-        }
     }
     
     var args: [AnyObject]? {
diff --git a/SocketIOClientSwift/SocketParser.swift b/SocketIOClientSwift/SocketParser.swift
index b25d8d0..5f19577 100644
--- a/SocketIOClientSwift/SocketParser.swift
+++ b/SocketIOClientSwift/SocketParser.swift
@@ -63,7 +63,7 @@ class SocketParser {
     static func parseString(message: String) -> Either<String, SocketPacket> {
         var parser = SocketStringReader(message: message)
         
-        guard let type = SocketPacket.PacketType(str: parser.read(1)) else {
+        guard let type = SocketPacket.PacketType(rawValue: Int(parser.read(1)) ?? -1) else {
             return .Left("Invalid packet type")
         }