TouchInstinct
/
LeadKitAdditions
305
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

podfile fix

This commit is contained in:
nikAshanin 2017-04-06 21:13:35 +03:00
parent 8a54260c1e
commit a34d932b81
9 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LeadKitAdditions/LeadKitAdditions/Classes/ApiResponse.swift
View File

@ -40,5 +40,5 @@ public protocol ApiResponseProtocol: ImmutableMappable {
var errorCode: Int { get }
var errorMessage: String? { get }
}

2
LeadKitAdditions/LeadKitAdditions/Classes/BaseDateFormatter.swift
View File

@ -105,5 +105,5 @@ open class BaseDateFormatter {
}
})
}
}

62
LeadKitAdditions/LeadKitAdditions/Classes/DefaultNetworkService.swift
View File

@ -62,35 +62,35 @@ open class DefaultNetworkService: NetworkService {
// MARK: - Internal methods
func request<T: ImmutableMappable>(with parameters: ApiRequestParameters) -> Observable<T> {
let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)>
return apiResponseRequest
.handleConnectionErrors()
.map {
if $0.model.errorCode == 0 {
return try T(JSON: try cast($0.model.result) as [String: Any])
} else {
throw ApiError(apiResponse: $0.model)
}
}
.handleGeneralApiErrors()
}
func requestForResult(with parameters: ApiRequestParameters) -> Observable<Bool> {
let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)>
return apiResponseRequest
.handleConnectionErrors()
.map {
if $0.model.errorCode == 0 {
return true
} else {
throw ApiError(apiResponse: $0.model)
}
}
.handleGeneralApiErrors()
}
// func request<T: ImmutableMappable>(with parameters: ApiRequestParameters) -> Observable<T> {
// let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)>
//
// return apiResponseRequest
// .handleConnectionErrors()
// .map {
// if $0.model.errorCode == 0 {
// return try T(JSON: try cast($0.model.result) as [String: Any])
// } else {
// throw ApiError(apiResponse: $0.model)
// }
// }
// .handleGeneralApiErrors()
// }
//
// func requestForResult(with parameters: ApiRequestParameters) -> Observable<Bool> {
// let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)>
//
// return apiResponseRequest
// .handleConnectionErrors()
// .map {
// if $0.model.errorCode == 0 {
// return true
// } else {
// throw ApiError(apiResponse: $0.model)
// }
// }
// .handleGeneralApiErrors()
// }
}
@ -98,11 +98,11 @@ extension ApiRequestParameters {
init(url: String, parameters: [String: Any] = [:]) {
self.init(url: URLSessionConfiguration.baseUrl() + url,
self.init(url: DefaultNetworkService.baseUrl() + url,
method: .post,
parameters: parameters,
encoding: JSONEncoding.default,
headers: nil)
}
}

4
LeadKitAdditions/LeadKitAdditions/Enums/ApiError.swift
View File

@ -26,7 +26,7 @@ public enum ApiError: Error {
case error(code: Int, message: String)
case none
}
extension ApiError: LocalizedError {
@ -47,5 +47,5 @@ extension ApiError: LocalizedError {
return nil
}
}
}

2
LeadKitAdditions/LeadKitAdditions/Enums/ConnectionError.swift
View File

@ -25,5 +25,5 @@ import Foundation
enum ConnectionError: LocalizedError {
case noConnection
}

2
LeadKitAdditions/LeadKitAdditions/Extensions/Observable+Extensions.swift
View File

@ -53,7 +53,7 @@ public extension Observable {
}
public func retryWithinErrors(_ errorTypes: [Error.Type] = [ConnectionError.self],
retryLimit: Int = SberCardsNetworkService.retryLimit)
retryLimit: Int = DefaultNetworkService.retryLimit)
-> Observable<Observable.E> {
return observeOn(CurrentThreadScheduler.instance)

2
LeadKitAdditions/LeadKitAdditions/Extensions/UserDefaults+UserService.swift
View File

@ -46,5 +46,5 @@ public extension UserDefaults {
set(newValue, forKey: Keys.userLogin)
}
}
}

10
LeadKitAdditions/Podfile
View File

@ -6,14 +6,8 @@ platform :ios, '9.0'
target 'LeadKitAdditions' do
use_frameworks!
pod "CocoaLumberjack/Swift", '~> 3.1.0'
pod "RxSwift", '3.2.0'
pod "RxCocoa", '3.2.0'
pod "RxAlamofire", '3.0.0'
pod "ObjectMapper", '~> 2.1'
pod "Toast-Swift", '~> 2.0.0'
pod "LeadKit"
pod "TableKit"
pod 'LeadKit', :git => 'https://github.com/TouchInstinct/LeadKit.git', :branch => 'fix/sharedApplication', :commit => 'fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7'
pod 'TableKit'
end

23
LeadKitAdditions/Podfile.lock
View File

@ -23,19 +23,24 @@ PODS:
- Toast-Swift (2.0.0)
DEPENDENCIES:
- CocoaLumberjack/Swift (~> 3.1.0)
- LeadKit
- ObjectMapper (~> 2.1)
- RxAlamofire (= 3.0.0)
- RxCocoa (= 3.2.0)
- RxSwift (= 3.2.0)
- LeadKit (from `https://github.com/TouchInstinct/LeadKit.git`, commit `fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7`, branch `fix/sharedApplication`)
- TableKit
- Toast-Swift (~> 2.0.0)
EXTERNAL SOURCES:
LeadKit:
:branch: fix/sharedApplication
:commit: fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7
:git: https://github.com/TouchInstinct/LeadKit.git
CHECKOUT OPTIONS:
LeadKit:
:commit: fd0eb18b8a6680ff16bbb1668d1ae0d29f29fad7
:git: https://github.com/TouchInstinct/LeadKit.git
SPEC CHECKSUMS:
Alamofire: dc44b1600b800eb63da6a19039a0083d62a6a62d
CocoaLumberjack: 8311463ddf9ee86a06ef92a071dd656c89244500
LeadKit: 00f7b16febbed12d29b05c14bd8b5ba4fb9c01ac
LeadKit: d688a8bef79de7bbd83d553da3cb6c5292d48f2d
ObjectMapper: fb30f71e08470d1e5a20b199fafe1246281db898
RxAlamofire: 0b1fa48f545fffe7f7a28af2086bcaa3b5946cc9
RxCocoa: ccdf43101a70407097a29082f648ba1676075b30
@ -43,6 +48,6 @@ SPEC CHECKSUMS:
TableKit: 02e041b443f75fa3e9f1ee6024d4b256305bd904
Toast-Swift: 5b2f8f720f7e78e48511f693df1f9c9a6e38a25a
PODFILE CHECKSUM: 29a03af2241e08742796fb1812bb8d084f03bafe
PODFILE CHECKSUM: ce4fe179e6470b751617d19baacbce25502a7002
COCOAPODS: 1.2.0