Updated Swift and S4 (#10)

* Updated Swift and S4

* use single headers

.swift-version

@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-05-03-a
+DEVELOPMENT-SNAPSHOT-2016-05-31-a

.travis.yml

@@ -10,6 +10,6 @@ osx_image: xcode7.3
 install:
   - eval "$(curl -sL https://raw.githubusercontent.com/Zewo/Zewo/5254525d9da56df29346fd76e99529c22034d61d/Scripts/install-swiftenv.sh)"
 script:
-  - swift build -Xlinker -rpath -Xlinker $(pwd)/.build/debug/
-  - swift build --configuration release -Xlinker -rpath -Xlinker $(pwd)/.build/release/
+  - swift build
+  - swift build --configuration release
   - swift test

Package.swift

@@ -3,7 +3,7 @@ import PackageDescription
 let package = Package(
 	name: "HTTPSerializer",
 	dependencies: [
-        .Package(url: "https://github.com/open-swift/S4.git", majorVersion: 0, minor: 6),
-        .Package(url: "https://github.com/Zewo/URI.git", majorVersion: 0, minor: 7)
+        .Package(url: "https://github.com/open-swift/S4.git", majorVersion: 0, minor: 9),
+        .Package(url: "https://github.com/Zewo/URI.git", majorVersion: 0, minor: 8)
     ]
 )

Sources/Cookie.swift

@@ -0,0 +1,31 @@
+extension Cookie: CustomStringConvertible {
+    public var description: String {
+        var string = "\(name)=\(value)"
+
+        if let expires = expires {
+            string += "; Expires=\(expires)"
+        }
+
+        if let maxAge = maxAge {
+            string += "; Max-Age=\(maxAge)"
+        }
+
+        if let domain = domain {
+            string += "; Domain=\(domain)"
+        }
+
+        if let path = path {
+            string += "; Path=\(path)"
+        }
+
+        if secure {
+            string += "; Secure"
+        }
+
+        if HTTPOnly {
+            string += "; HttpOnly"
+        }
+
+        return string
+    }
+}

Sources/RequestSerializer.swift

@@ -34,11 +34,9 @@ public struct RequestSerializer: S4.RequestSerializer {
         try transport.send("\(request.method) \(request.uri.percentEncoded()) HTTP/\(request.version.major).\(request.version.minor)".data, timingOut: .never)
         try transport.send(newLine)
 
-        for (name, values) in request.headers.headers {
-            for value in values.values {
-                try transport.send("\(name): \(value)".data)
-                try transport.send(newLine)
-            }
+        for (name, value) in request.headers.headers {
+            try transport.send("\(name): \(value)".data)
+            try transport.send(newLine)
         }
 
         try transport.send(newLine)
@@ -65,6 +63,8 @@ public struct RequestSerializer: S4.RequestSerializer {
             try transport.send("0".data)
             try transport.send(newLine)
             try transport.send(newLine)
+        default:
+            throw BodyError.inconvertibleType
         }
 
         try transport.flush()

Sources/ResponseSerializer.swift

@@ -33,11 +33,14 @@ public struct ResponseSerializer: S4.ResponseSerializer {
         try transport.send("HTTP/\(response.version.major).\(response.version.minor) \(response.status.statusCode) \(response.status.reasonPhrase)".data)
         try transport.send(newLine)
 
-        for (name, values) in response.headers.headers {
-            for value in values.values {
-                try transport.send("\(name): \(value)".data)
-                try transport.send(newLine)
-            }
+        for (name, value) in response.headers.headers {
+            try transport.send("\(name): \(value)".data)
+            try transport.send(newLine)
+        }
+
+        for cookie in response.cookies {
+            try transport.send("Set-Cookie: \(cookie)".data)
+            try transport.send(newLine)
         }
 
         try transport.send(newLine)
@@ -64,6 +67,8 @@ public struct ResponseSerializer: S4.ResponseSerializer {
             try transport.send("0".data)
             try transport.send(newLine)
             try transport.send(newLine)
+        default:
+            throw BodyError.inconvertibleType
         }
 
         try transport.flush()

Tests/HTTPSerializer/HTTPSerializerTests.swift

@@ -8,7 +8,7 @@ class HTTPSerializerTests: XCTestCase {
 }
 
 extension HTTPSerializerTests {
-    static var allTests: [(String, HTTPSerializerTests -> () throws -> Void)] {
+    static var allTests: [(String, (HTTPSerializerTests) -> () throws -> Void)] {
         return [
            ("testReality", testReality),
         ]