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

rename observable mappable method

This commit is contained in:
Madhas 2018-05-24 13:02:13 +03:00
parent 3edfe50164
commit 32eefa77a6
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Extensions/Alamofire/AlamofireRequest+Extensions.swift
View File

@ -54,7 +54,7 @@ public extension Reactive where Base: DataRequest {
.observeOn(SerialDispatchQueueScheduler(queue: mappingQueue, internalSerialQueueName: mappingQueue.label))
.tryMapObservableResult { response, value in
let json = try JSONSerialization.jsonObject(with: value, options: [])
return T.createFrom(decoder: decoder, jsonObject: json)
return T.create(from: json, with: decoder)
.map { (response, $0) }
}
}

2
Sources/Protocols/ObservableMappable.swift
View File

@ -27,6 +27,6 @@ public protocol ObservableMappable {
associatedtype ModelType: Decodable
static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable<ModelType>
static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable<ModelType>
}

2
Tests/Models/Album.swift
View File

@ -47,7 +47,7 @@ extension Album: Equatable {
extension Album: ObservableMappable {
static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable<Album> {
static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable<Album> {
return Observable.deferredJust {
let data = try JSONSerialization.data(withJSONObject: jsonObject, options: [])
return try decoder.decode(Album.self, from: data)

2
Tests/Models/AlbumsContainer.swift
View File

@ -30,7 +30,7 @@ struct AlbumContainer: Decodable {
extension AlbumContainer: ObservableMappable {
static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable<AlbumContainer> {
static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable<AlbumContainer> {
return Observable.deferredJust { try cast(jsonObject) as [Any] }
.flatMap {
$0.concurrentRxMap { json -> Album in

2
Tests/Models/Post.swift
View File

@ -41,7 +41,7 @@ struct Post: Decodable {
extension Post: ObservableMappable {
static func createFrom(decoder: JSONDecoder, jsonObject: Any) -> Observable<Post> {
static func create(from jsonObject: Any, with decoder: JSONDecoder) -> Observable<Post> {
return Observable.deferredJust {
let data = try JSONSerialization.data(withJSONObject: jsonObject, options: [])
return try decoder.decode(Post.self, from: data)