Merge branch 'development'

* development:
  Bump starscream and remove cocoaseeds from readme
  update module file
  Change starscream branch
  Remove old version language
  correct version is 11.1.1
  Fix SPM and bump version
  Update starscream version in readme
  grammar
  Update comment
  Use errors in parsing method
  Rename directory to SocketIO
  work on podspec
  faq doesn't need to be in the project
  Reorganize files
  Add faqs page

Author: nuclearace

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "Source/Starscream"]
 	path = Source/Starscream
 	url = https://github.com/nuclearace/Starscream
-	branch = socket.io
+	branch = socket.io-dev

README.md

@@ -65,13 +65,13 @@ Requires Swift 3/Xcode 8.x
 
 If you need swift 2.3 use the swift2.3 tag (Pre-Swift 3 support is no longer maintained)
 
-If you need swift 2.2 use 7.x (Pre-Swift 3 support is no longer maintained)
+If you need swift 2.2 use 7.x.
 
-If you need Swift 2.1 use v5.5.0 (Pre-Swift 2.2 support is no longer maintained)
+If you need Swift 2.1 use v5.5.0.
 
-If you need Swift 1.2 use v2.4.5 (Pre-Swift 2 support is no longer maintained)
+If you need Swift 1.2 use v2.4.5.
 
-If you need Swift 1.1 use v1.5.2. (Pre-Swift 1.2 support is no longer maintained)
+If you need Swift 1.1 use v1.5.2.
 
 ### Swift Package Manager
 Add the project as a dependency to your Package.swift:
@@ -91,8 +91,8 @@ Then import `import SocketIO`.
 ### Carthage
 Add these line to your `Cartfile`:
 ```
-github "nuclearace/Starscream" ~> 8.0.4
-github "socketio/socket.io-client-swift" ~> 11.1.1 # Or latest version
+github "nuclearace/Starscream" ~> 8.0.5
+github "socketio/socket.io-client-swift" ~> 11.1.2 # Or latest version
 ```
 
 Run `carthage update --platform ios,macosx`.
@@ -104,7 +104,7 @@ Create `Podfile` and add `pod 'Socket.IO-Client-Swift'`:
 use_frameworks!
 
 target 'YourApp' do
-    pod 'Socket.IO-Client-Swift', '~> 11.1.1' # Or latest version
+    pod 'Socket.IO-Client-Swift', '~> 11.1.2' # Or latest version
 end
 ```
 
@@ -127,16 +127,6 @@ Objective-C:
 @import SocketIO;
 ```
 
-### CocoaSeeds
-
-Add this line to your `Seedfile`:
-
-```
-github "socketio/socket.io-client-swift", "v11.1.1", :files => "Source/*.swift" # Or latest version
-```
-
-Run `seed install`.
-
 
 # [Docs](https://nuclearace.github.io/Socket.IO-Client-Swift/index.html)
 

Socket.IO-Client-Swift.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Socket.IO-Client-Swift"
   s.module_name  = "SocketIO"
-  s.version      = "11.1.1"
+  s.version      = "11.1.2"
   s.summary      = "Socket.IO-client for iOS and OS X"
   s.description  = <<-DESC
                    Socket.IO-client for iOS and OS X.
@@ -17,12 +17,12 @@ Pod::Spec.new do |s|
   s.requires_arc = true
   s.source = {
     :git => "https://github.com/socketio/socket.io-client-swift.git",
-    :tag => 'v11.1.1',
+    :tag => 'v11.1.2',
     :submodules => true
   }
   s.pod_target_xcconfig = {
       'SWIFT_VERSION' => '3.1'
   }
-  s.source_files  = "Source/*.swift"
-  s.dependency "StarscreamSocketIO", "~> 8.0.4"
+  s.source_files  = "Source/SocketIO/**/*.swift", "Source/SocketIO/*.swift"
+  s.dependency "StarscreamSocketIO", "~> 8.0.5"
 end

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

@@ -12,83 +12,83 @@ import XCTest
 class SocketBasicPacketTest: XCTestCase {
     let data = "test".data(using: String.Encoding.utf8)!
     let data2 = "test2".data(using: String.Encoding.utf8)!
-    
+
     func testEmpyEmit() {
         let expectedSendString = "2[\"test\"]"
         let sendData = ["test"]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
 
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testNullEmit() {
         let expectedSendString = "2[\"test\",null]"
 		let sendData: [Any] = ["test", NSNull()]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testStringEmit() {
         let expectedSendString = "2[\"test\",\"foo bar\"]"
         let sendData = ["test", "foo bar"]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testStringEmitWithQuotes() {
         let expectedSendString = "2[\"test\",\"\\\"he\\\"llo world\\\"\"]"
         let sendData = ["test", "\"he\"llo world\""]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testJSONEmit() {
         let expectedSendString = "2[\"test\",{\"null\":null,\"hello\":1,\"test\":\"hello\",\"foobar\":true}]"
         let sendData: [Any] = ["test", ["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testArrayEmit() {
         let expectedSendString = "2[\"test\",[\"hello\",1,{\"test\":\"test\"}]]"
         let sendData: [Any] = ["test", ["hello", 1, ["test": "test"]]]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testBinaryEmit() {
         let expectedSendString = "51-[\"test\",{\"_placeholder\":true,\"num\":0}]"
         let sendData: [Any] = ["test", data]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
         XCTAssertEqual(packet.binary, [data])
     }
-    
+
     func testMultipleBinaryEmit() {
         let expectedSendString = "52-[\"test\",{\"data2\":{\"_placeholder\":true,\"num\":0},\"data1\":{\"_placeholder\":true,\"num\":1}}]"
         let sendData: [Any] = ["test", ["data1": data, "data2": data2] as NSDictionary]
         let packet = SocketPacket.packetFromEmit(sendData, id: -1, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
         XCTAssertEqual(packet.binary, [data2, data])
     }
-    
+
     func testEmitWithAck() {
         let expectedSendString = "20[\"test\"]"
         let sendData = ["test"]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: false)
-        
+
         XCTAssertEqual(packet.packetString,
-                       
+
                        expectedSendString)
     }
-    
+
     func testEmitDataWithAck() {
         let expectedSendString = "51-0[\"test\",{\"_placeholder\":true,\"num\":0}]"
         let sendData: [Any] = ["test", data]
@@ -97,70 +97,67 @@ class SocketBasicPacketTest: XCTestCase {
         XCTAssertEqual(packet.packetString, expectedSendString)
         XCTAssertEqual(packet.binary, [data])
     }
-    
+
     // Acks
     func testEmptyAck() {
         let expectedSendString = "30[]"
         let packet = SocketPacket.packetFromEmit([], id: 0, nsp: "/", ack: true)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testNullAck() {
         let expectedSendString = "30[null]"
         let sendData = [NSNull()]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testStringAck() {
         let expectedSendString = "30[\"test\"]"
         let sendData = ["test"]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testJSONAck() {
         let expectedSendString = "30[{\"null\":null,\"hello\":1,\"test\":\"hello\",\"foobar\":true}]"
         let sendData = [["foobar": true, "hello": 1, "test": "hello", "null": NSNull()]]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
     }
-    
+
     func testBinaryAck() {
         let expectedSendString = "61-0[{\"_placeholder\":true,\"num\":0}]"
         let sendData = [data]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
         XCTAssertEqual(packet.binary, [data])
     }
-    
+
     func testMultipleBinaryAck() {
         let expectedSendString = "62-0[{\"data2\":{\"_placeholder\":true,\"num\":0},\"data1\":{\"_placeholder\":true,\"num\":1}}]"
         let sendData = [["data1": data, "data2": data2]]
         let packet = SocketPacket.packetFromEmit(sendData, id: 0, nsp: "/", ack: true)
-        
+
         XCTAssertEqual(packet.packetString, expectedSendString)
         XCTAssertEqual(packet.binary, [data2, data])
     }
-    
+
     func testBinaryStringPlaceholderInMessage() {
         let engineString = "52-[\"test\",\"~~0\",{\"num\":0,\"_placeholder\":true},{\"_placeholder\":true,\"num\":1}]"
         let socket = SocketIOClient(socketURL: URL(string: "http://localhost/")!)
         socket.setTestable()
-        
-        if case let .right(packet) = socket.parseString(engineString) {
-            var packet = packet
-            XCTAssertEqual(packet.event, "test")
-            _ = packet.addData(data)
-            _ = packet.addData(data2)
-            XCTAssertEqual(packet.args[0] as? String, "~~0")
-        } else {
-            XCTFail()
-        }
+
+        var packet = try! socket.parseString(engineString)
+
+        XCTAssertEqual(packet.event, "test")
+        _ = packet.addData(data)
+        _ = packet.addData(data2)
+        XCTAssertEqual(packet.args[0] as? String, "~~0")
     }
 }