refactor client options

Author: nuclearace

SocketIOClientSwift/SocketEngine.swift

@@ -112,7 +112,7 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
 
     public convenience init(client: SocketEngineClient, url: String, options: NSDictionary?) {
         self.init(client: client, url: url,
-            options: SocketIOClientOption.NSDictionaryToSocketOptionsSet(options ?? [:]))
+            options: Set<SocketIOClientOption>.NSDictionaryToSocketOptionsSet(options ?? [:]))
     }
 
     deinit {
@@ -210,7 +210,6 @@ public final class SocketEngine: NSObject, SocketEngineSpec, WebSocketDelegate {
         let wsUrl = urlWebSocket + (sid == "" ? "" : "&sid=\(sid)")
 
         ws = WebSocket(url: NSURL(string: wsUrl)!)
-
         if cookies != nil {
             let headers = NSHTTPCookie.requestHeaderFieldsWithCookies(cookies!)
             for (key, value) in headers {

SocketIOClientSwift/SocketIOClient.swift

@@ -105,7 +105,7 @@ public final class SocketIOClient: NSObject, SocketEngineClient {
      */
     public convenience init(socketURL: String, options: NSDictionary?) {
         self.init(socketURL: socketURL,
-            options: SocketIOClientOption.NSDictionaryToSocketOptionsSet(options ?? [:]))
+            options: Set<SocketIOClientOption>.NSDictionaryToSocketOptionsSet(options ?? [:]))
     }
 
     deinit {

SocketIOClientSwift/SocketIOClientOption.swift

@@ -24,9 +24,11 @@
 
 import Foundation
 
-protocol ClientOptions {}
+protocol ClientOption: CustomStringConvertible, Hashable {
+    func getSocketIOOptionValue() -> AnyObject?
+}
 
-public enum SocketIOClientOption: CustomStringConvertible, Hashable, ClientOptions {
+public enum SocketIOClientOption: ClientOption {
     case ConnectParams([String: AnyObject])
     case Cookies([NSHTTPCookie])
     case ExtraHeaders([String: String])
@@ -98,44 +100,44 @@ public enum SocketIOClientOption: CustomStringConvertible, Hashable, ClientOptio
     func getSocketIOOptionValue() -> AnyObject? {
        return Mirror(reflecting: self).children.first?.value as? AnyObject
     }
+}
+
+public func ==(lhs: SocketIOClientOption, rhs: SocketIOClientOption) -> Bool {
+    return lhs.description == rhs.description
+}
+
+extension Set where Element: ClientOption {
+    mutating func insertIgnore(element: Element) {
+        let (insertType, _) = Mirror(reflecting: element).children.first!
+        for item in self {
+            let (name, _) = Mirror(reflecting: item).children.first!
+            if insertType == name {
+                return
+            }
+        }
+        
+        self.insert(element)
+    }
 
     static func NSDictionaryToSocketOptionsSet(dict: NSDictionary) -> Set<SocketIOClientOption> {
         var options = Set<SocketIOClientOption>()
-                
+        
         for (rawKey, value) in dict {
-            if let key = rawKey as? String, opt = keyValueToSocketIOClientOption(key, value: value) {
+            if let key = rawKey as? String, opt = SocketIOClientOption.keyValueToSocketIOClientOption(key, value: value) {
                 options.insert(opt)
             }
         }
 
         return options
     }
 
-    static func SocketOptionsSetToNSDictionary(set: Set<SocketIOClientOption>) -> NSDictionary {
+    func SocketOptionsSetToNSDictionary() -> NSDictionary {
         let options = NSMutableDictionary()
 
-        for option in set {
+        for option in self {
             options[option.description] = option.getSocketIOOptionValue()
         }
 
         return options
     }
 }
-
-public func ==(lhs: SocketIOClientOption, rhs: SocketIOClientOption) -> Bool {
-    return lhs.description == rhs.description
-}
-
-extension Set where Element: ClientOptions {
-    mutating func insertIgnore(element: Element) {
-        let (insertType, _) = Mirror(reflecting: element).children.first!
-        for item in self {
-            let (name, _) = Mirror(reflecting: item).children.first!
-            if insertType == name {
-                return
-            }
-        }
-        
-        self.insert(element)
-    }
-}