added NetworkObjectRequest which extracts object mapping functionality from NetworkRequest

Author: Adam Debono

NetworkMapper.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "NetworkMapper"
-  s.version      = "0.0.1"
+  s.version      = "0.0.2"
   s.summary      = "Map JSON responses to Swift Objects"
   s.homepage     = "https://github.com/adamdebono/NetworkMapper"
   s.license      = { :type => "MIT", :file => "LICENSE" }

Source/NetworkObjectRequest.swift

@@ -0,0 +1,42 @@
+
+import Alamofire
+import Foundation
+import Unbox
+
+public protocol NetworkObjectRequest: NetworkRequest {
+    associatedtype ResponseType: Unboxable
+    
+    func responseDecoded(_ response: ResponseType)
+}
+
+public extension NetworkObjectRequest {
+    @discardableResult
+    public func responseObject(completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) -> DataRequest {
+        return self.responseJSON { response in
+            self.processObjectResponse(response: response, completionHandler: completionHandler)
+        }
+    }
+    public func processObjectResponse(response: DataResponse<Any>, 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)
+                self.responseDecoded(object)
+                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

@@ -1,9 +1,8 @@
 
 import Alamofire
 import Foundation
-import Unbox
 
-public struct RequestDetails {
+public struct RequestDetails: URLRequestConvertible {
     public let method: HTTPMethod
     public let url: URL
     public let parameters: [String: Any]?
@@ -13,18 +12,20 @@ public struct RequestDetails {
         self.url = url
         self.parameters = parameters
     }
+    
+    public func asURLRequest() throws -> URLRequest {
+        var request = URLRequest(url: self.url)
+        request.httpMethod = self.method.rawValue
+        
+        return try URLEncoding.methodDependent.encode(request, with: self.parameters)
+    }
 }
 
 public protocol NetworkRequest: URLRequestConvertible {
-    associatedtype ResponseType: Unboxable
-    
     var method: HTTPMethod { get }
     var url: URL { get }
     var parameters: [String: Any]? { get }
-    
-    func responseDecoded(_ response: ResponseType)
 }
-
 public extension NetworkRequest {
     public func getRequestDetails() -> RequestDetails {
         return RequestDetails(
@@ -35,11 +36,7 @@ public extension NetworkRequest {
     }
 
     public func asURLRequest() throws -> URLRequest {
-        let requestDetails = self.getRequestDetails()
-        var request = URLRequest(url: requestDetails.url)
-        request.httpMethod = requestDetails.method.rawValue
-        
-        return try URLEncoding.methodDependent.encode(request, with: requestDetails.parameters)
+        return try self.getRequestDetails().asURLRequest()
     }
 
     public func complete<R, T>(error: Error, response: DataResponse<R>?, completionHandler: (DataResponse<T>) -> Void) {
@@ -53,6 +50,28 @@ public extension NetworkRequest {
         completionHandler(successResponse)
     }
 
+    // MARK: Data
+    
+    @discardableResult
+    public func responseData(completionHandler: @escaping ((DataResponse<Data>) -> Void)) -> DataRequest {
+        return Alamofire.request(self).responseData(completionHandler: { response in
+            switch response.result {
+            case .failure(let error):
+                if let error = error as? URLError {
+                    if error.code == URLError.cancelled {
+                        return
+                    }
+                }
+            default:
+                break
+            }
+            
+            completionHandler(response)
+        })
+    }
+    
+    // MARK: JSON
+    
     @discardableResult
     public func responseJSON(completionHandler: @escaping ((DataResponse<Any>) -> Void)) -> DataRequest {
         return Alamofire.request(self).responseJSON { response in
@@ -74,34 +93,4 @@ public extension NetworkRequest {
 
         completionHandler(response)
     }
-    
-    @discardableResult
-    public func responseObject(completionHandler: @escaping ((DataResponse<ResponseType>) -> Void)) -> DataRequest {
-        return self.responseJSON { response in
-            self.processObjectResponse(response: response, completionHandler: completionHandler)
-        }
-    }
-    public func processObjectResponse(response: DataResponse<Any>, 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)
-                self.responseDecoded(object)
-                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)
-            }
-        }
-    }
 }