Merge pull request #4 from scoreyou/fix/dateFormatter
Fix/date formatter
This commit is contained in:
commit
d54f733b4f
|
|
@ -1,6 +1,6 @@
|
|||
Pod::Spec.new do |s|
|
||||
s.name = "LeadKitAdditions"
|
||||
s.version = "0.0.6"
|
||||
s.version = "0.0.7"
|
||||
s.summary = "iOS framework with a bunch of tools for rapid development"
|
||||
s.homepage = "https://github.com/NikAshanin/LeadKitAdditions"
|
||||
s.license = "Apache License, Version 2.0"
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ open class DefaultNetworkService: NetworkService {
|
|||
|
||||
open class var serverTrustPolicies: [String: ServerTrustPolicy] {
|
||||
return [
|
||||
DefaultNetworkService.baseUrl: .disableEvaluation
|
||||
baseUrl: .disableEvaluation
|
||||
]
|
||||
}
|
||||
|
||||
|
|
@ -67,13 +67,17 @@ open class DefaultNetworkService: NetworkService {
|
|||
return sessionManager
|
||||
}
|
||||
|
||||
public static func apiRequestParameters(url: String, parameters: [String: Any] = [:]) -> ApiRequestParameters {
|
||||
return ApiRequestParameters(baseUrl: baseUrl, url: url, parameters: parameters)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
extension ApiRequestParameters {
|
||||
private extension ApiRequestParameters {
|
||||
|
||||
init(url: String, parameters: [String: Any] = [:]) {
|
||||
init(baseUrl: String, url: String, parameters: [String: Any] = [:]) {
|
||||
|
||||
self.init(url: DefaultNetworkService.baseUrl + url,
|
||||
self.init(url: baseUrl + url,
|
||||
method: .post,
|
||||
parameters: parameters,
|
||||
encoding: JSONEncoding.default,
|
||||
|
|
|
|||
|
|
@ -29,12 +29,6 @@ import RxAlamofire
|
|||
|
||||
open class SimpleNetworkService: DefaultNetworkService {
|
||||
|
||||
public convenience init() {
|
||||
self.init(sessionManager: SimpleNetworkService.sessionManager)
|
||||
}
|
||||
|
||||
// MARK: - Public methods
|
||||
|
||||
open func request<T: ImmutableMappable>(with parameters: ApiRequestParameters) -> Observable<T> {
|
||||
let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue