Update to Alamofire 5.0.0.beta.1

Restofire · Dec 11, 2018 · 8e0f7ec · 8e0f7ec
1 parent 9c4f48e
commit 8e0f7ec
Show file tree

Hide file tree

Showing 19 changed files with 86 additions and 37 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "Alamofire/Alamofire" "alamofire5"
+github "Alamofire/Alamofire" ~> 5.0.0 
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "Alamofire/Alamofire" "a8a2827f5c14c9168a0373e948e963d36edfdbc5"
+github "Alamofire/Alamofire" "5.0.0.beta.1"
 github "Quick/Nimble" "v7.3.0"
 github "Quick/Quick" "v1.3.1"
diff --git a/Carthage/Checkouts/Alamofire b/Carthage/Checkouts/Alamofire
diff --git a/Sources/Alamofire/RestofireRequest.swift b/Sources/Alamofire/RestofireRequest.swift
@@ -8,7 +8,6 @@
 
 import Foundation
 import Alamofire
-import Alamofire
 
 class RestofireRequest {
 

diff --git a/Sources/BaseRequestable/_Configurable.swift b/Sources/BaseRequestable/_Configurable.swift
@@ -50,7 +50,7 @@ public protocol _Configurable {
     var encoding: ParameterEncoding { get }
 
     /// The HTTP headers.
-    var headers: [String : String]? { get }
+    var headers: HTTPHeaders? { get }
 
     /// The request parameters.
     var parameters: Any? { get }
@@ -96,7 +96,7 @@ public extension _Configurable {
     }
 
     /// `nil`
-    public var headers: [String: String]? {
+    public var headers: HTTPHeaders? {
         return nil
     }
 

diff --git a/Sources/BaseRequestable/_Requestable.swift b/Sources/BaseRequestable/_Requestable.swift
@@ -51,7 +51,10 @@ public extension _Requestable {
             .compactMap { $0 }
             .joined(separator: "/")
 
-        let allHeaders = headers + configuration.headers
+        var allHeaders = headers ?? HTTPHeaders()
+        configuration.headers.forEach { (header: HTTPHeader) in
+            allHeaders.add(header)
+        }
         var request = try! URLRequest(url: url, method: method, headers: allHeaders)
 
         let allQueryParameters = queryParameters + configuration.queryParameters

diff --git a/Sources/Configuration/Configuration.swift b/Sources/Configuration/Configuration.swift
@@ -42,7 +42,7 @@ public struct Configuration {
     public var encoding: ParameterEncoding = JSONEncoding.default
 
     /// The HTTP headers. `nil` by default.
-    public var headers: [String : String] = [:]
+    public var headers: HTTPHeaders = [:]
 
     /// The request delegates. `empty` by default.
     public var requestDelegates: [RequestDelegate] = []

diff --git a/Sources/Configuration/Protocols/ResponseSerializable.swift b/Sources/Configuration/Protocols/ResponseSerializable.swift
@@ -56,3 +56,62 @@ public extension ResponseSerializable where Response == Data {
     }
 
 }
+
+public class AnyResponseSerializer<Value>: ResponseSerializer {
+
+    /// A closure which can be used to serialize data responses.
+    public typealias DataSerializer = (_ request: URLRequest?, _ response: HTTPURLResponse?, _ data: Data?, _ error: Error?) throws -> Value
+    /// A closure which can be used to serialize download reponses.
+    public typealias DownloadSerializer = (_ request: URLRequest?, _ response: HTTPURLResponse?, _ fileURL: URL?, _ error: Error?) throws -> Value
+
+    let dataSerializer: DataSerializer
+    let downloadSerializer: DownloadSerializer?
+
+    /// Initializes the `ResponseSerializer` instance with the given serialize response closure.
+    ///
+    /// - Parameters:
+    ///   - dataSerializer:     A `DataSerializer` closure.
+    ///   - downloadSerializer: A `DownloadSerializer` closure.
+    public init(dataSerializer: @escaping DataSerializer, downloadSerializer: @escaping DownloadSerializer) {
+        self.dataSerializer = dataSerializer
+        self.downloadSerializer = downloadSerializer
+    }
+
+    /// Initialze the instance with a `DataSerializer` closure. Download serialization will fallback to a default
+    /// implementation.
+    ///
+    /// - Parameters:
+    ///   - dataSerializer:     A `DataSerializer` closure.
+    public init(dataSerializer: @escaping DataSerializer) {
+        self.dataSerializer = dataSerializer
+        self.downloadSerializer = nil
+    }
+
+    public func serialize(request: URLRequest?, response: HTTPURLResponse?, data: Data?, error: Error?) throws -> Value {
+        return try dataSerializer(request, response, data, error)
+    }
+
+    public func serializeDownload(request: URLRequest?, response: HTTPURLResponse?, fileURL: URL?, error: Error?) throws -> Value {
+        return try downloadSerializer?(request, response, fileURL, error) ?? { (request, response, fileURL, error) in
+            guard error == nil else { throw error! }
+
+            guard let fileURL = fileURL else {
+                throw AFError.responseSerializationFailed(reason: .inputFileNil)
+            }
+
+            let data: Data
+            do {
+                data = try Data(contentsOf: fileURL)
+            } catch {
+                throw AFError.responseSerializationFailed(reason: .inputFileReadFailed(at: fileURL))
+            }
+
+            do {
+                return try serialize(request: request, response: response, data: data, error: error)
+            } catch {
+                throw error
+            }
+            }(request, response, fileURL, error)
+    }
+
+}
diff --git a/Tests/Alamofire/JSONDecodableResponseSerializerSpec.swift b/Tests/Alamofire/JSONDecodableResponseSerializerSpec.swift
@@ -32,7 +32,7 @@ class JSONDecodableResponseSerializerSpec: BaseSpec {
 
                 // When
                 waitUntil(timeout: self.timeout) { done in
-                    request.responseJSONDecodable(completionHandler: { (response: DataResponse<HTTPBin>) in
+                    request.responseDecodable(completionHandler: { (response: DataResponse<HTTPBin>) in
                         defer { done() }
 
                         // Then

diff --git a/Tests/AlamofireRequestable/ADataUploadableSpec.swift b/Tests/AlamofireRequestable/ADataUploadableSpec.swift
@@ -29,10 +29,8 @@ class ADataUploadableSpec: BaseSpec {
 
                     func prepare(_ request: URLRequest, requestable: ARequestable) -> URLRequest {
                         var request = request
-                        let header = HTTPHeaders.authorization(username: "user", password: "password")
-                        header.forEach {
-                            request.setValue($0.value, forHTTPHeaderField: $0.key)
-                        }
+                        let header = HTTPHeader.authorization(username: "user", password: "password")
+                        request.setValue(header.value, forHTTPHeaderField: header.name)
                         expect(request.value(forHTTPHeaderField: "Authorization"))
                             .to(equal("Basic dXNlcjpwYXNzd29yZA=="))
                         return request

diff --git a/Tests/AlamofireRequestable/ADownloadableSpec.swift b/Tests/AlamofireRequestable/ADownloadableSpec.swift
@@ -31,10 +31,8 @@ class ADownloadableSpec: BaseSpec {
 
                     func prepare(_ request: URLRequest, requestable: ARequestable) -> URLRequest {
                         var request = request
-                        let header = HTTPHeaders.authorization(username: "user", password: "password")
-                        header.forEach {
-                            request.setValue($0.value, forHTTPHeaderField: $0.key)
-                        }
+                        let header = HTTPHeader.authorization(username: "user", password: "password")
+                        request.setValue(header.value, forHTTPHeaderField: header.name)
                         expect(request.value(forHTTPHeaderField: "Authorization"))
                             .to(equal("Basic dXNlcjpwYXNzd29yZA=="))
                         return request

diff --git a/Tests/AlamofireRequestable/AFileUploadableSpec.swift b/Tests/AlamofireRequestable/AFileUploadableSpec.swift
@@ -27,10 +27,8 @@ class AFileUploadableSpec: BaseSpec {
 
                     func prepare(_ request: URLRequest, requestable: ARequestable) -> URLRequest {
                         var request = request
-                        let header = HTTPHeaders.authorization(username: "user", password: "password")
-                        header.forEach {
-                            request.setValue($0.value, forHTTPHeaderField: $0.key)
-                        }
+                        let header = HTTPHeader.authorization(username: "user", password: "password")
+                        request.setValue(header.value, forHTTPHeaderField: header.name)
                         expect(request.value(forHTTPHeaderField: "Authorization"))
                             .to(equal("Basic dXNlcjpwYXNzd29yZA=="))
                         return request

diff --git a/Tests/AlamofireRequestable/AMultipartUploadableSpec.swift b/Tests/AlamofireRequestable/AMultipartUploadableSpec.swift
@@ -32,10 +32,8 @@ class AMultipartUploadableSpec: BaseSpec {
 
                     func prepare(_ request: URLRequest, requestable: ARequestable) -> URLRequest {
                         var request = request
-                        let header = HTTPHeaders.authorization(username: "user", password: "password")
-                        header.forEach {
-                            request.setValue($0.value, forHTTPHeaderField: $0.key)
-                        }
+                        let header = HTTPHeader.authorization(username: "user", password: "password")
+                        request.setValue(header.value, forHTTPHeaderField: header.name)
                         expect(request.value(forHTTPHeaderField: "Authorization"))
                             .to(equal("Basic dXNlcjpwYXNzd29yZA=="))
                         return request

diff --git a/Tests/AlamofireRequestable/ARequestableSpec.swift b/Tests/AlamofireRequestable/ARequestableSpec.swift
@@ -26,10 +26,8 @@ class ARequestableSpec: BaseSpec {
 
                     func prepare(_ request: URLRequest, requestable: ARequestable) -> URLRequest {
                         var request = request
-                        let header = HTTPHeaders.authorization(username: "user", password: "password")
-                        header.forEach {
-                            request.setValue($0.value, forHTTPHeaderField: $0.key)
-                        }
+                        let header = HTTPHeader.authorization(username: "user", password: "password")
+                        request.setValue(header.value, forHTTPHeaderField: header.name)
                         expect(request.value(forHTTPHeaderField: "Authorization"))
                             .to(equal("Basic dXNlcjpwYXNzd29yZA=="))
                         return request

diff --git a/Tests/AlamofireRequestable/AStreamUploadableSpec.swift b/Tests/AlamofireRequestable/AStreamUploadableSpec.swift
@@ -27,10 +27,8 @@ class AStreamUploadableSpec: BaseSpec {
 
                     func prepare(_ request: URLRequest, requestable: ARequestable) -> URLRequest {
                         var request = request
-                        let header = HTTPHeaders.authorization(username: "user", password: "password")
-                        header.forEach {
-                            request.setValue($0.value, forHTTPHeaderField: $0.key)
-                        }
+                        let header = HTTPHeader.authorization(username: "user", password: "password")
+                        request.setValue(header.value, forHTTPHeaderField: header.name)
                         expect(request.value(forHTTPHeaderField: "Authorization"))
                             .to(equal("Basic dXNlcjpwYXNzd29yZA=="))
                         return request

diff --git a/Tests/Configuration/ResponseSerializerSpec.swift b/Tests/Configuration/ResponseSerializerSpec.swift
@@ -88,7 +88,7 @@ class ResponseSerializerSpec: BaseSpec {
                 struct Service: Requestable {
                     typealias Response = HTTPBin
                     var responseSerializer: AnyResponseSerializer<Result<Response>> = AnyResponseSerializer<Result<Response>>.init(dataSerializer: { (request, response, data, error) -> Result<Response> in
-                        return Result { try JSONDecodableResponseSerializer().serialize(request: request,
+                        return Result { try DecodableResponseSerializer().serialize(request: request,
                                                                                         response: response,
                                                                                         data: data,
                                                                                         error: error)}

diff --git a/Tests/Requestable/DownloadableSpec.swift b/Tests/Requestable/DownloadableSpec.swift
@@ -33,7 +33,7 @@ class DownloadableSpec: BaseSpec {
                         var path: String? = "get"
                         var destination: DownloadRequest.Destination? = { _, _ in (BaseSpec.jsonFileURL, []) }
                         var responseSerializer: AnyResponseSerializer<Result<Response>> = AnyResponseSerializer<Result<Response>>.init(dataSerializer: { (request, response, data, error) -> Result<Response> in
-                            return Result { try JSONDecodableResponseSerializer().serialize(request: request,
+                            return Result { try DecodableResponseSerializer().serialize(request: request,
                                                                                    response: response,
                                                                                    data: data,
                                                                                    error: error)}

diff --git a/Tests/Requestable/MultipartUploadableSpec.swift b/Tests/Requestable/MultipartUploadableSpec.swift
@@ -35,7 +35,7 @@ class MultipartUploadableSpec: BaseSpec {
                     struct Upload: MultipartUploadable {
                         typealias Response = HTTPBin
                         var responseSerializer: AnyResponseSerializer<Result<Response>> = AnyResponseSerializer<Result<Response>>.init(dataSerializer: { (request, response, data, error) -> Result<Response> in
-                            return Result { try JSONDecodableResponseSerializer().serialize(request: request,
+                            return Result { try DecodableResponseSerializer().serialize(request: request,
                                                                                             response: response,
                                                                                             data: data,
                                                                                             error: error)}

diff --git a/Tests/Requestable/RequestableSpec.swift b/Tests/Requestable/RequestableSpec.swift
@@ -32,7 +32,7 @@ class RequestableSpec: BaseSpec {
 
                         var path: String? = "get"
                         var responseSerializer: AnyResponseSerializer<Result<Response>> = AnyResponseSerializer<Result<Response>>.init(dataSerializer: { (request, response, data, error) -> Result<Response> in
-                            return Result { try JSONDecodableResponseSerializer().serialize(request: request,
+                            return Result { try DecodableResponseSerializer().serialize(request: request,
                                                                                             response: response,
                                                                                             data: data,
                                                                                             error: error)}