Added error/success callbacks

Author: adamdebono

NetworkMapper.podspec

@@ -1,19 +1,19 @@
 Pod::Spec.new do |s|
   s.name         = "NetworkMapper"
-  s.version      = "0.1.1"
+  s.version      = "0.1.2"
   s.summary      = "A framework to map JSON responses to swift objects"
   s.homepage     = "https://github.com/adamdebono/NetworkMapper"
   s.license      = { :type => "MIT", :file => "LICENSE" }
   s.author       = { "Adam Debono" => "[email protected]" }
-  
+
   s.ios.deployment_target = "9.0"
   s.osx.deployment_target = "10.11"
   s.watchos.deployment_target = "2.0"
   s.tvos.deployment_target = "9.0"
-  
+
   s.source       = { :git => "https://github.com/adamdebono/NetworkMapper.git", :tag => s.version }
   s.source_files  = "Source/*.swift"
-  
+
   s.dependency "Alamofire", "~> 4.2.0"
   s.dependency "Unbox", "~> 2.2.0"
 end

README.md

@@ -8,7 +8,7 @@ A framework to map JSON responses to swift objects, based on
 
 ### Cocoapods
 ```ruby
-pod 'NetworkMapper', '~> 0.1.1'
+pod 'NetworkMapper', '~> 0.1.2'
 ```
 
 ## Usage
@@ -57,7 +57,7 @@ implementation of which does nothing.
 ```swift
 struct ExampleObjectRequest: NetworkObjectRequest {
   typealias ResponseType = ExampleObjectResponse
-  
+
   let method: HTTPMethod = .get
   let url: URL = URL(string: "https://example.org/example/users")
   let parameters: [String:Any]? = nil
@@ -66,7 +66,7 @@ struct ExampleObjectRequest: NetworkObjectRequest {
 struct ExampleObjectResponse: NetworkObjectResponse {
   let users: [User]
   let pageNumber: Int
-  
+
   init(unboxer: Unboxable) throws {
     self.users = try unboxer.unbox(key: "users")
     self.pageNumber = try unboxer.unbox(keyPath: "pagination.page_number")
@@ -76,7 +76,7 @@ struct ExampleObjectResponse: NetworkObjectResponse {
 struct User: Unboxable {
   let name: String
   let age: Int
-  
+
   init(unboxer: Unboxable) throws {
     self.name = try unboxer.unbox(key: "name")
     self.name = try unboxer.unbox(key: "age")

Source/NetworkObjectRequest.swift

@@ -7,12 +7,6 @@ import Unbox
 public protocol NetworkObjectRequest: NetworkRequest {
     /// The type of the response object
     associatedtype ResponseType: NetworkObjectResponse
-    
-    /// A callback function to which is called immediately after the response is
-    /// decoded, but before the callback
-    ///
-    /// The default implementation of this funciton does nothing
-    func responseDecoded(_ response: ResponseType)
 }
 /// A protocol to define network response objects
 public protocol NetworkObjectResponse: Unboxable {
@@ -86,7 +80,6 @@ public extension NetworkObjectRequest {
 
             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)
@@ -96,6 +89,4 @@ public extension NetworkObjectRequest {
             }
         }
     }
-    
-    public func responseDecoded(_ response: ResponseType) {}
 }

Source/NetworkRequest.swift

@@ -25,7 +25,7 @@ public struct RequestDetails: URLRequestConvertible {
     }
 
     public func asURLRequest() throws -> URLRequest {
-        var request = try URLRequest(url: self.url, method: self.method, headers: self.headers)
+        let request = try URLRequest(url: self.url, method: self.method, headers: self.headers)
 
         return try URLEncoding.methodDependent.encode(request, with: self.parameters)
     }
@@ -44,6 +44,21 @@ public protocol NetworkRequest: URLRequestConvertible {
     var parameters: [String: Any]? { get }
     /// Any headers (or nil) for the request
     var headers: HTTPHeaders? { get }
+
+    /// A callback function which is called after the request succeeds,
+    /// immediately before the callback
+    ///
+    /// The default implementation of this funciton does nothing.
+    ///
+    /// - parameter response:   The decoded response in the format requested
+    func onSuccess<T>(_ response: T) -> Void
+    /// A callback function which is called after the request fails, immediately
+    /// before the callback
+    ///
+    /// The default implementation of this funciton does nothing.
+    ///
+    /// - parameter error:  The error that caused the failure
+    func onError(_ error: Error) -> Void
 }
 public extension NetworkRequest {
     /// Creates a `RequestDetails` object based on the attributes of the
@@ -71,6 +86,8 @@ public extension NetworkRequest {
     /// - parameter response:           The response from the Alamofire
     /// - parameter completionHandler:  The completion handler to run
     public func complete<R, T>(error: Error, response: DataResponse<R>?, completionHandler: (DataResponse<T>) -> Void) {
+        self.onError(error)
+
         let result = Result<T>.failure(error)
         let errorResponse = DataResponse(request: response?.request, response: response?.response, data: response?.data, result: result)
         completionHandler(errorResponse)
@@ -84,11 +101,16 @@ public extension NetworkRequest {
     /// - parameter response:           The response from Alamofire
     /// - parameter completionHandler:  The completion handler to run
     public func complete<R, T>(object: T, response: DataResponse<R>, completionHandler: (DataResponse<T>) -> Void) {
+        self.onSuccess(object)
+
         let result = Result<T>.success(object)
         let successResponse = DataResponse(request: response.request, response: response.response, data: response.data, result: result)
         completionHandler(successResponse)
     }
-    
+
+    public func onSuccess<T>(_ response: T) {}
+    public func onError(_ error: Error) {}
+
     // MARK: Data
 
     /// Performs a network request based on the attributes of this instance, and