remove unbox dependency, use swift 4 Decodable

Author: adamdebono

.swift-version

@@ -1 +1 @@
-3.0
+4.0

NetworkMapper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "NetworkMapper"
-  s.version      = "0.2.0"
+  s.version      = "1.0.0"
   s.summary      = "A framework to map JSON responses to swift objects"
   s.homepage     = "https://github.com/adamdebono/NetworkMapper"
   s.license      = { :type => "MIT", :file => "LICENSE" }
@@ -14,6 +14,5 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/adamdebono/NetworkMapper.git", :tag => s.version }
   s.source_files  = "Source/*.swift"
 
-  s.dependency "Alamofire", "~> 4.4.0"
-  s.dependency "Unbox", "~> 2.4.0"
+  s.dependency "Alamofire", "~> 4.5.0"
 end

Source/NetworkObjectRequest.swift

@@ -1,16 +1,15 @@
 
 import Alamofire
 import Foundation
-import Unbox
 
 /// A protocol to define network requests that map directly to response objects
 public protocol NetworkObjectRequest: NetworkRequest {
     /// The type of the response object
     associatedtype ResponseType: NetworkObjectResponse
 }
 /// A protocol to define network response objects
-public protocol NetworkObjectResponse: Unboxable {
-  
+public protocol NetworkObjectResponse: Decodable {
+
 }
 
 public extension NetworkObjectRequest {
@@ -23,7 +22,7 @@ public extension NetworkObjectRequest {
     /// - returns: The request that was sent
     @discardableResult
     public func responseObject(completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) -> DataRequest {
-        return self.responseJSON { response in
+        return self.responseData { response in
             self.processObjectResponse(response: response, completionHandler: completionHandler)
         }
     }
@@ -38,7 +37,7 @@ public extension NetworkObjectRequest {
     /// - returns: The request that was sent
     @discardableResult
     public func uploadResponseObject(_ data: Data, completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) -> UploadRequest {
-        return self.uploadResponseJSON(data, completionHandler: { response in
+        return self.uploadResponseData(data, completionHandler: { response in
             self.processObjectResponse(response: response, completionHandler: completionHandler)
         })
     }
@@ -50,10 +49,8 @@ public extension NetworkObjectRequest {
     ///                                 the `MultipartFormData`.
     /// - parameter completionHandler:  A callback which is run on completion of
     ///                                 the request
-    ///
-    /// - returns: The request that was sent
     public func uploadResponseObject(multipartFormData: @escaping ((MultipartFormData) -> Void), completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) {
-        return self.uploadResponseJSON(multipartFormData: multipartFormData, completionHandler: { response in
+        self.uploadResponseData(multipartFormData: multipartFormData, completionHandler: { response in
             self.processObjectResponse(response: response, completionHandler: completionHandler)
         })
     }
@@ -67,22 +64,14 @@ public extension NetworkObjectRequest {
     /// - parameter response:           The response to process
     /// - parameter completionHandler:  A callback which is run once processing
     ///                                 is complete
-    public func processObjectResponse(response: DataResponse<Any>, completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) {
+    public func processObjectResponse(response: DataResponse<Data>, completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) {
         switch response.result {
         case .failure(let error):
             self.complete(error: error, response: response, completionHandler: completionHandler)
         case .success(let value):
-            guard let value = value as? [String: Any] else {
-                let error = ResponseError.invalidResponse
-                self.complete(error: error, response: response, completionHandler: completionHandler)
-                return
-            }
-            
             do {
-                let object: ResponseType = try unbox(dictionary: value)
+                let object = try JSONDecoder().decode(ResponseType.self, from: value)
                 self.complete(object: object, response: response, completionHandler: completionHandler)
-            } catch let unboxError as UnboxError {
-                self.complete(error: unboxError, response: response, completionHandler: completionHandler)
             } catch {
                 let error = ResponseError.invalidResponse
                 self.complete(error: error, response: response, completionHandler: completionHandler)

Source/NetworkRequest.swift

@@ -177,6 +177,26 @@ public extension NetworkRequest {
                 completionHandler(response)
             })
     }
+
+    /// Performs an upload request based on the attributes of this instance, and
+    /// retrieves the resonse data
+    ///
+    /// - parameter multipartFormData: The clouse used to append body parts to
+    ///                                the `MultipartFormData`
+    /// - parameter completionHandler: A callback which is run on completion of
+    ///                                the request
+    public func uploadResponseData(multipartFormData: @escaping ((MultipartFormData) -> Void), completionHandler: @escaping ((DataResponse<Data>) -> Void)) {
+        self.sessionManager
+            .upload(multipartFormData: multipartFormData, with: self, encodingCompletion: { encodingResult in
+                switch encodingResult {
+                case .success(let upload, _, _):
+                    upload.responseData(completionHandler: completionHandler)
+                case .failure(let error):
+                    let response: DataResponse<Data>? = nil
+                    self.complete(error: error, response: response, completionHandler: completionHandler)
+                }
+            })
+    }
 
     // MARK: JSON
 
@@ -222,8 +242,6 @@ public extension NetworkRequest {
     ///                                 the `MultipartFormData`.
     /// - parameter completionHandler:  A callback which is run on completion of
     ///                                 the request
-    ///
-    /// - returns: The request that was sent
     public func uploadResponseJSON(multipartFormData: @escaping ((MultipartFormData) -> Void), completionHandler: @escaping ((DataResponse<Any>) -> Void)) {
         self.sessionManager.upload(multipartFormData: multipartFormData, with: self, encodingCompletion: { encodingResult in
             switch encodingResult {