From 2eb655ec3d51f2deb347883e00f8ed659b7a5fa0 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 20:23:21 +0300 Subject: [PATCH 1/3] One more network service fix --- .../Services/Network/SimpleNetworkService.swift | 6 ------ 1 file changed, 6 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift b/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift index 24a9961..e18c722 100644 --- a/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Services/Network/SimpleNetworkService.swift @@ -29,12 +29,6 @@ import RxAlamofire open class SimpleNetworkService: DefaultNetworkService { - public convenience init() { - self.init(sessionManager: SimpleNetworkService.sessionManager) - } - - // MARK: - Public methods - open func request(with parameters: ApiRequestParameters) -> Observable { let apiResponseRequest = rxRequest(with: parameters) as Observable<(response: HTTPURLResponse, model: ApiResponse)> From 196b952891dd3e8ab495ffcb6a6c5aeb2eef9275 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 20:32:07 +0300 Subject: [PATCH 2/3] Network service refactored --- .../Services/Network/DefaultNetworkService.swift | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/LeadKitAdditions/LeadKitAdditions/Services/Network/DefaultNetworkService.swift b/LeadKitAdditions/LeadKitAdditions/Services/Network/DefaultNetworkService.swift index 67f50b2..9be9aca 100644 --- a/LeadKitAdditions/LeadKitAdditions/Services/Network/DefaultNetworkService.swift +++ b/LeadKitAdditions/LeadKitAdditions/Services/Network/DefaultNetworkService.swift @@ -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, From 62148f799f7b3b6bb3e4b83ce660e0d63d05dd56 Mon Sep 17 00:00:00 2001 From: Alexey Gerasimov Date: Wed, 26 Apr 2017 20:47:44 +0300 Subject: [PATCH 3/3] Version incremented --- LeadKitAdditions.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LeadKitAdditions.podspec b/LeadKitAdditions.podspec index 90812f4..582e346 100644 --- a/LeadKitAdditions.podspec +++ b/LeadKitAdditions.podspec @@ -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"