Merge branch 'development'

* development:
  update readme
  Renamed modules to make then consistent.
  rename engine init
  tweaks
  Add SocketIOClientConfiguration
  Rename variable
  refactor some reconnect code
  bump websocket version
  move extensions
  refactor out checking for base64

Author: nuclearace

README.md

@@ -5,7 +5,9 @@ Socket.IO-client for iOS/OS X.
 
 ##Example
 ```swift
-let socket = SocketIOClient(socketURL: NSURL(string: "http://localhost:8080")!, options: [.Log(true), .ForcePolling(true)])
+import SocketIO
+
+let socket = SocketIOClient(socketURL: NSURL(string: "http://localhost:8080")!, config: [.Log(true), .ForcePolling(true)])
 
 socket.on("connect") {data, ack in
     print("socket connected")
@@ -26,8 +28,9 @@ socket.connect()
 
 ##Objective-C Example
 ```objective-c
+@import SocketIO;
 NSURL* url = [[NSURL alloc] initWithString:@"http://localhost:8080"];
-SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:url options:@{@"log": @YES, @"forcePolling": @YES}];
+SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:url config:@{@"log": @YES, @"forcePolling": @YES}];
 
 [socket on:@"connect" callback:^(NSArray* data, SocketAckEmitter* ack) {
     NSLog(@"socket connected");
@@ -115,13 +118,13 @@ Import the module:
 
 Swift:
 ```swift
-import SocketIOClientSwift
+import SocketIO
 ```
 
 Objective-C:
 
 ```Objective-C
-@import SocketIOClientSwift;
+@import SocketIO;
 ```
 
 CocoaSeeds
@@ -139,7 +142,7 @@ Run `seed install`.
 ##API
 Constructors
 -----------
-`init(var socketURL: NSURL, options: Set<SocketIOClientOption> = [])` - Creates a new SocketIOClient. options is a Set of SocketIOClientOption. If your socket.io server is secure, you need to specify `https` in your socketURL.
+`init(var socketURL: NSURL, config: SocketIOClientConfiguration = [])` - Creates a new SocketIOClient. options is a Set of SocketIOClientOption. If your socket.io server is secure, you need to specify `https` in your socketURL.
 
 `convenience init(socketURL: NSURL, options: NSDictionary?)` - Same as above, but meant for Objective-C. See Options on how convert between SocketIOClientOptions and dictionary keys.
 

Socket.IO-Client-Swift.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SocketIOClientSwift
+@testable import SocketIO
 
 class SocketAckManagerTest: XCTestCase {
     var ackManager = SocketAckManager()

SocketIO-MacTests/SocketAckManagerTest.swift

@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SocketIOClientSwift
+@testable import SocketIO
 
 class SocketBasicPacketTest: XCTestCase {
     let data = "test".dataUsingEncoding(NSUTF8StringEncoding)!

SocketIO-MacTests/SocketBasicPacketTest.swift

@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SocketIOClientSwift
+@testable import SocketIO
 
 class SocketEngineTest: XCTestCase {
     var client: SocketIOClient!

SocketIO-MacTests/SocketEngineTest.swift

@@ -0,0 +1,46 @@
+//
+//  TestSocketIOClientConfiguration.swift
+//  Socket.IO-Client-Swift
+//
+//  Created by Erik Little on 8/13/16.
+//
+//
+
+import XCTest
+import SocketIO
+
+class TestSocketIOClientConfiguration: XCTestCase {
+    var config = [] as SocketIOClientConfiguration
+
+    override func setUp() {
+        super.setUp()
+        
+        config = [.Log(false), .ForceNew(true)]
+    }
+
+    func testReplaceSameOption() {
+        config.insert(.Log(true))
+        
+        XCTAssertEqual(config.count, 2)
+        
+        switch config[0] {
+        case let .Log(log):
+            XCTAssertTrue(log)
+        default:
+            XCTFail()
+        }
+    }
+    
+    func testIgnoreIfExisting() {
+        config.insert(.ForceNew(false), replacing: false)
+        
+        XCTAssertEqual(config.count, 2)
+        
+        switch config[1] {
+        case let .ForceNew(new):
+            XCTAssertTrue(new)
+        default:
+            XCTFail()
+        }
+    }
+}

SocketIO-MacTests/SocketIOClientConfigurationTest.swift

@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SocketIOClientSwift
+@testable import SocketIO
 
 class SocketNamespacePacketTest: XCTestCase {
     let data = "test".dataUsingEncoding(NSUTF8StringEncoding)!

SocketIO-MacTests/SocketNamespacePacketTest.swift

@@ -8,7 +8,7 @@
 //
 
 #import <XCTest/XCTest.h>
-@import SocketIOClientSwift;
+@import SocketIO;
 
 @interface SocketObjectiveCTest : XCTestCase
 
@@ -21,7 +21,7 @@ @implementation SocketObjectiveCTest
 - (void)setUp {
     [super setUp];
     NSURL* url = [[NSURL alloc] initWithString:@"http://localhost"];
-    self.socket = [[SocketIOClient alloc] initWithSocketURL:url options:nil];
+    self.socket = [[SocketIOClient alloc] initWithSocketURL:url config:nil];
 }
 
 - (void)testOnSyntax {

SocketIO-MacTests/SocketObjectiveCTest.m

@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SocketIOClientSwift
+@testable import SocketIO
 
 class SocketParserTest: XCTestCase {
     let testSocket = SocketIOClient(socketURL: NSURL())

SocketIO-MacTests/SocketParserTest.swift

@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SocketIOClientSwift
+@testable import SocketIO
 
 class SocketSideEffectTest: XCTestCase {
     let data = "test".dataUsingEncoding(NSUTF8StringEncoding)!