Marshal mapping #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| // | ||
| // MarshalMapping.swift | ||
| // ACKReactiveExtensions | ||
| // | ||
| // Created by Jakub Olejník on 06/04/2017. | ||
| // Ackee | ||
| // | ||
|
|
||
| import Result | ||
| import Marshal | ||
| import ReactiveSwift | ||
|
|
||
| /** | ||
| * Protocol that allows creation of custom Marshal errors | ||
| */ | ||
| public protocol MarshalErrorCreatable: Error { | ||
|
|
||
| /** | ||
| * Create error containing passed `MarshalError` | ||
| * | ||
| * - parameter marshalError: `MarshalError` which should be wrapped | ||
| */ | ||
| static func createMarshalError(_ marshalError: MarshalError) -> Self | ||
| } | ||
|
|
||
| extension MarshalError: MarshalErrorCreatable { | ||
| public static func createMarshalError(_ marshalError: MarshalError) -> MarshalError { | ||
| return marshalError | ||
| } | ||
| } | ||
|
|
||
| extension SignalProtocol where Value == Any, Error: MarshalErrorCreatable { | ||
|
|
||
| /** | ||
| * Map value as `Unmarshaling` object | ||
| * | ||
| * - parameter key: If your objects are contained within dictionary pass the key here | ||
| */ | ||
| public func mapResponseMarshal<Model>(for key: KeyType? = nil) -> Signal<Model, Error> where Model: Unmarshaling { | ||
| return attemptMap { json in | ||
| Result { | ||
| guard let marshaledJSON = json as? MarshaledObject | ||
| else { | ||
| assertionFailure("json isn't any of the known MarshaledObject types (Dictionary or Array)") | ||
| throw NSError(domain: "", code: 0, userInfo: nil) | ||
|
There was a problem hiding this comment. Could we get rid of this and throw some better error? |
||
| } | ||
| if let key = key { | ||
| return try marshaledJSON.value(for: key) | ||
| } else { | ||
| return try Model.init(object: marshaledJSON) | ||
| } | ||
| } | ||
| .mapError { Error.createMarshalError($0) } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Map value as `Unmarshaling` object | ||
| * | ||
| * - parameter key: If your objects are contained within dictionary pass the key here | ||
| */ | ||
| public func mapResponseMarshal<Model>(for key: KeyType? = nil) -> Signal<[Model], Error> where Model: Unmarshaling { | ||
| return attemptMap { json in | ||
| Result { | ||
| if let key = key, let marshaledJSON = json as? MarshaledObject { | ||
| return try marshaledJSON.value(for: key) | ||
| } | ||
| else if let marshaledArray = json as? [MarshaledObject] { | ||
| let dummyKey = "dummyKey" | ||
| return try [dummyKey: marshaledArray].value(for: dummyKey) | ||
|
There was a problem hiding this comment. |
||
| } | ||
| else { | ||
| assertionFailure("json isn't any of the known MarshaledObject types (Dictionary or Array)") | ||
| throw NSError(domain: "", code: 0, userInfo: nil) | ||
| } | ||
| } | ||
| .mapError { Error.createMarshalError($0) } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Map value as `ValueType` | ||
| * | ||
| * - parameter key: If your objects are contained within dictionary pass the key here | ||
| */ | ||
| public func mapResponseMarshal<Model>(for key: KeyType) -> Signal<Model, Error> where Model: ValueType { | ||
| return attemptMap { json in | ||
| Result { | ||
| guard let marshaledJSON = json as? MarshaledObject | ||
| else { | ||
| assertionFailure("json isn't any of the known MarshaledObject types (Dictionary or Array)") | ||
| throw NSError(domain: "", code: 0, userInfo: nil) | ||
| } | ||
| return try marshaledJSON.value(for: key) | ||
| } | ||
| .mapError { Error.createMarshalError($0) } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| extension SignalProducerProtocol where Value == Any, Error: MarshalErrorCreatable { | ||
| /** | ||
| * Map value as `Unmarshaling` object | ||
| * | ||
| * - parameter key: If your objects are contained within dictionary pass the key here | ||
| */ | ||
| public func mapResponseMarshal<Model>(for key: KeyType? = nil) -> SignalProducer<Model, Error> where Model: Unmarshaling { | ||
|
There was a problem hiding this comment. I would change it to |
||
| return lift { $0.mapResponseMarshal(for: key) } | ||
| } | ||
|
|
||
| /** | ||
| * Map value as `Unmarshaling` object | ||
| * | ||
| * - parameter key: If your objects are contained within dictionary pass the key here | ||
| */ | ||
| public func mapResponseMarshal<Model>(for key: KeyType? = nil) -> SignalProducer<[Model], Error> where Model: Unmarshaling { | ||
| return lift { $0.mapResponseMarshal(for: key) } | ||
| } | ||
|
|
||
| /** | ||
| * Map value as `ValueType` | ||
| * | ||
| * - parameter key: If your objects are contained within dictionary pass the key here | ||
| */ | ||
| public func mapResponseMarshal<Model>(for key: KeyType) -> SignalProducer<Model, Error> where Model: ValueType { | ||
| return lift { $0.mapResponseMarshal(for: key) } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. It would be also nice to have some test to call the public API There was a problem hiding this comment. You mean something like this? |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be
_ marshalError: NSError?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't see any reason why? As far as Marshal is throwing
MarshalErrors.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Aaaaa I see...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Now when all errors thrown by the extension are really
MarshalErrors this is correct.