Skip to content

Commit e7c365b

Browse files
committed
Add request to callbacks
1 parent 1f331d4 commit e7c365b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

NetworkMapper.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "NetworkMapper"
3-
s.version = "0.1.2"
3+
s.version = "0.1.3"
44
s.summary = "A framework to map JSON responses to swift objects"
55
s.homepage = "https://github.com/adamdebono/NetworkMapper"
66
s.license = { :type => "MIT", :file => "LICENSE" }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ A framework to map JSON responses to swift objects, based on
88

99
### Cocoapods
1010
```ruby
11-
pod 'NetworkMapper', '~> 0.1.2'
11+
pod 'NetworkMapper', '~> 0.1.23'
1212
```
1313

1414
## Usage

Source/NetworkRequest.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ public protocol NetworkRequest: URLRequestConvertible {
5151
/// The default implementation of this funciton does nothing.
5252
///
5353
/// - parameter response: The decoded response in the format requested
54-
func onSuccess<T>(_ response: T) -> Void
54+
func onSuccess<T>(_ response: T, request: URLRequest?) -> Void
5555
/// A callback function which is called after the request fails, immediately
5656
/// before the callback
5757
///
5858
/// The default implementation of this funciton does nothing.
5959
///
6060
/// - parameter error: The error that caused the failure
61-
func onError(_ error: Error) -> Void
61+
func onError(_ error: Error, request: URLRequest?) -> Void
6262
}
6363
public extension NetworkRequest {
6464
/// Creates a `RequestDetails` object based on the attributes of the
@@ -86,7 +86,7 @@ public extension NetworkRequest {
8686
/// - parameter response: The response from the Alamofire
8787
/// - parameter completionHandler: The completion handler to run
8888
public func complete<R, T>(error: Error, response: DataResponse<R>?, completionHandler: (DataResponse<T>) -> Void) {
89-
self.onError(error)
89+
self.onError(error, request: response?.request)
9090

9191
let result = Result<T>.failure(error)
9292
let errorResponse = DataResponse(request: response?.request, response: response?.response, data: response?.data, result: result)
@@ -101,15 +101,15 @@ public extension NetworkRequest {
101101
/// - parameter response: The response from Alamofire
102102
/// - parameter completionHandler: The completion handler to run
103103
public func complete<R, T>(object: T, response: DataResponse<R>, completionHandler: (DataResponse<T>) -> Void) {
104-
self.onSuccess(object)
104+
self.onSuccess(object, request: response.request)
105105

106106
let result = Result<T>.success(object)
107107
let successResponse = DataResponse(request: response.request, response: response.response, data: response.data, result: result)
108108
completionHandler(successResponse)
109109
}
110110

111-
public func onSuccess<T>(_ response: T) {}
112-
public func onError(_ error: Error) {}
111+
public func onSuccess<T>(_ response: T, request: URLRequest?) {}
112+
public func onError(_ error: Error, request: URLRequest?) {}
113113

114114
// MARK: Data
115115

0 commit comments

Comments
 (0)