TouchInstinct
/
LeadKit
304
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37 from TouchInstinct/bugfix/background_mapping 

Bugfix/background mapping
This commit is contained in:
Ivan Smolin 2016-12-30 16:08:28 +04:00 committed by GitHub
parent dd26a70db0 0416b5d979
commit a80acfef3d
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
LeadKit/LeadKit/Extensions/Alamofire/AlamofireManager+Extensions.swift
View File

@ -28,23 +28,25 @@ public extension Reactive where Base: Alamofire.SessionManager {
/// Method which executes request and serializes response into target object
///
/// - Parameter requestParameters: api parameters to pass Alamofire
/// - Parameter mappingQueue: The dispatch queue to use for mapping
/// - Returns: Observable with HTTP URL Response and target object
func responseModel<T: ImmutableMappable>(requestParameters: ApiRequestParameters) -> Observable<(HTTPURLResponse, T)> {
func responseModel<T: ImmutableMappable>(requestParameters: ApiRequestParameters,
mappingQueue: DispatchQueue = DispatchQueue.global()) -> Observable<(HTTPURLResponse, T)> {
return apiRequest(requestParameters: requestParameters)
.observeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
.flatMap { $0.rx.apiResponse() }
.flatMap { $0.rx.apiResponse(mappingQueue: mappingQueue) }
}
/// Method which executes request and serializes response into target object
///
/// - Parameter requestParameters: api parameters to pass Alamofire
/// - Parameter mappingQueue: The dispatch queue to use for mapping
/// - Returns: Observable with HTTP URL Response and target object
func responseObservableModel<T: ObservableMappable>(requestParameters: ApiRequestParameters) ->
Observable<(HTTPURLResponse, T)> where T.ModelType == T {
func responseObservableModel<T: ObservableMappable>(requestParameters: ApiRequestParameters,
mappingQueue: DispatchQueue = DispatchQueue.global()) -> Observable<(HTTPURLResponse, T)>
where T.ModelType == T {
return apiRequest(requestParameters: requestParameters)
.observeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
.flatMap { $0.rx.apiResponse() }
.flatMap { $0.rx.apiResponse(mappingQueue: mappingQueue) }
}
}

34
LeadKit/LeadKit/Extensions/Alamofire/AlamofireRequest+Extensions.swift
View File

@ -15,25 +15,37 @@ public extension Reactive where Base: DataRequest {
/// Method which serializes response into target object
///
/// - Parameter mappingQueue: The dispatch queue to use for mapping
/// - Returns: Observable with HTTP URL Response and target object
func apiResponse<T: ImmutableMappable>() -> Observable<(HTTPURLResponse, T)> {
return responseJSON().map { resp, value in
let json = try cast(value) as [String: Any]
func apiResponse<T: ImmutableMappable>(mappingQueue: DispatchQueue = DispatchQueue.global())
-> Observable<(HTTPURLResponse, T)> {
return (resp, try T(JSON: json))
}
return responseJSONOnQueue(mappingQueue)
.map { resp, value in
let json = try cast(value) as [String: Any]
return (resp, try T(JSON: json))
}
}
/// Method which serializes response into target object
///
/// - Parameter mappingQueue: The dispatch queue to use for mapping
/// - Returns: Observable with HTTP URL Response and target object
func apiResponse<T: ObservableMappable>() -> Observable<(HTTPURLResponse, T)> where T.ModelType == T {
return responseJSON().flatMap { resp, value -> Observable<(HTTPURLResponse, T)> in
let json = try cast(value) as [String: Any]
func apiResponse<T: ObservableMappable>(mappingQueue: DispatchQueue = DispatchQueue.global())
-> Observable<(HTTPURLResponse, T)> where T.ModelType == T {
return T.createFrom(map: Map(mappingType: .fromJSON, JSON: json))
.map { (resp, $0) }
}
return responseJSONOnQueue(mappingQueue)
.flatMap { resp, value -> Observable<(HTTPURLResponse, T)> in
let json = try cast(value) as [String: Any]
return T.createFrom(map: Map(mappingType: .fromJSON, JSON: json))
.map { (resp, $0) }
}
}
internal func responseJSONOnQueue(_ queue: DispatchQueue) -> Observable<(HTTPURLResponse, Any)> {
return responseResult(queue: queue, responseSerializer: DataRequest.jsonResponseSerializer(options: .allowFragments))
}
}