From 7777c76daee0bca0788ea5254d5f0fa79261f60c Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 1 May 2017 18:43:46 -0400 Subject: [PATCH] refactor protocol --- Source/SocketIOClient.swift | 2 +- Source/SocketParsable.swift | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index a96ceda..31f0c37 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -24,7 +24,7 @@ import Foundation -public final class SocketIOClient : NSObject, SocketEngineClient, SocketParsable { +public final class SocketIOClient : NSObject, SocketIOClientSpec, SocketEngineClient, SocketParsable { public let socketURL: URL public private(set) var engine: SocketEngineSpec? diff --git a/Source/SocketParsable.swift b/Source/SocketParsable.swift index 7c9ce21..c6c9e6a 100644 --- a/Source/SocketParsable.swift +++ b/Source/SocketParsable.swift @@ -27,7 +27,7 @@ protocol SocketParsable : SocketIOClientSpec { func parseSocketMessage(_ message: String) } -extension SocketParsable { +extension SocketParsable where Self: SocketIOClientSpec { private func isCorrectNamespace(_ nsp: String) -> Bool { return nsp == self.nsp } @@ -107,8 +107,6 @@ extension SocketParsable { } } - - var dataArray = message[message.characters.index(reader.currentIndex, offsetBy: 1)..