don't need extra inits in enums
This commit is contained in:
parent
c5d70b4888
commit
0dd3def2e4
@ -113,7 +113,7 @@ class SocketParserTest: XCTestCase {
|
|||||||
let packet = SocketParser.parseString(message)
|
let packet = SocketParser.parseString(message)
|
||||||
let type = message.substringWithRange(Range<String.Index>(start: message.startIndex, end: message.startIndex.advancedBy(1)))
|
let type = message.substringWithRange(Range<String.Index>(start: message.startIndex, end: message.startIndex.advancedBy(1)))
|
||||||
if case let .Right(packet) = packet {
|
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)
|
XCTAssertEqual(packet.nsp, validValues.0)
|
||||||
XCTAssertTrue((packet.data as NSArray).isEqualToArray(validValues.1))
|
XCTAssertTrue((packet.data as NSArray).isEqualToArray(validValues.1))
|
||||||
XCTAssertTrue((packet.binary as NSArray).isEqualToArray(validValues.2))
|
XCTAssertTrue((packet.binary as NSArray).isEqualToArray(validValues.2))
|
||||||
|
|||||||
@ -354,7 +354,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
|
|||||||
private func parseEngineMessage(var message: String, fromPolling: Bool) {
|
private func parseEngineMessage(var message: String, fromPolling: Bool) {
|
||||||
Logger.log("Got message: %@", type: logType, args: message)
|
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)
|
self.checkIfMessageIsBase64Binary(message)
|
||||||
return .Noop
|
return .Noop
|
||||||
}()
|
}()
|
||||||
|
|||||||
@ -27,12 +27,4 @@ import Foundation
|
|||||||
|
|
||||||
@objc public enum SocketEnginePacketType: Int {
|
@objc public enum SocketEnginePacketType: Int {
|
||||||
case Open, Close, Ping, Pong, Message, Upgrade, Noop
|
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -487,7 +487,6 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects {
|
if reconnectAttempts != -1 && currentReconnectAttempt + 1 > reconnectAttempts || !reconnects {
|
||||||
clearReconnectTimer()
|
clearReconnectTimer()
|
||||||
didDisconnect("Reconnect Failed")
|
didDisconnect("Reconnect Failed")
|
||||||
|
|||||||
@ -25,6 +25,8 @@
|
|||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
@objc public enum SocketIOClientStatus: Int, CustomStringConvertible {
|
@objc public enum SocketIOClientStatus: Int, CustomStringConvertible {
|
||||||
|
case NotConnected, Closed, Connecting, Connected, Reconnecting
|
||||||
|
|
||||||
public var description: String {
|
public var description: String {
|
||||||
switch self {
|
switch self {
|
||||||
case NotConnected:
|
case NotConnected:
|
||||||
@ -39,6 +41,4 @@ import Foundation
|
|||||||
return "Reconnecting"
|
return "Reconnecting"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
case NotConnected, Closed, Connecting, Connected, Reconnecting
|
|
||||||
}
|
}
|
||||||
@ -37,14 +37,6 @@ struct SocketPacket {
|
|||||||
|
|
||||||
enum PacketType: Int {
|
enum PacketType: Int {
|
||||||
case Connect, Disconnect, Event, Ack, Error, BinaryEvent, BinaryAck
|
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]? {
|
var args: [AnyObject]? {
|
||||||
|
|||||||
@ -63,7 +63,7 @@ class SocketParser {
|
|||||||
static func parseString(message: String) -> Either<String, SocketPacket> {
|
static func parseString(message: String) -> Either<String, SocketPacket> {
|
||||||
var parser = SocketStringReader(message: message)
|
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")
|
return .Left("Invalid packet type")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user