diff --git a/AyanTechNetworkingLibrary.podspec b/AyanTechNetworkingLibrary.podspec index 4b7abf4..b2278ae 100644 --- a/AyanTechNetworkingLibrary.podspec +++ b/AyanTechNetworkingLibrary.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = "AyanTechNetworkingLibrary" - spec.version = "1.1.0" + spec.version = "1.2.2" spec.summary = "Networking library for comunicate AyanTech web services" spec.homepage = "https://github.com/AyanTech/AyanTechNetworkingLibrary-iOS" spec.license = { type: 'MIT', file: 'LICENSE' } diff --git a/AyanTechNetworkingLibrary/Model/ATRequest.swift b/AyanTechNetworkingLibrary/Model/ATRequest.swift index f642333..41d34c2 100644 --- a/AyanTechNetworkingLibrary/Model/ATRequest.swift +++ b/AyanTechNetworkingLibrary/Model/ATRequest.swift @@ -18,13 +18,13 @@ public class ATRequest { var body: Data? var task: URLSessionTask? - var contentType: ContentType = .applicationJson { + public var contentType: ContentType = .applicationJson { didSet { self.headers["Content-Type"] = self.contentType.rawValue } } - enum ContentType: String { + public enum ContentType: String { case applicationJson = "application/json" case textPlain = "text/plain" case textHtml = "text/html" @@ -40,6 +40,7 @@ public class ATRequest { let result = ATRequest() result.url = url result.method = method + result.headers = ATRequest.Configuration.defaultHeaders return result } @@ -49,7 +50,7 @@ public class ATRequest { } @discardableResult public func setJsonBody(body: JSONObject) -> Self { - self.body = body.toJsonData() + self.body = Configuration.parametersCreator(body).toJsonData() self.contentType = .applicationJson return self } @@ -79,4 +80,9 @@ public class ATRequest { responseHandler?(atResponse) } } + + public class Configuration { + public static var defaultHeaders: [String: String] = [:] + public static var parametersCreator: (JSONObject) -> JSONObject = { input in return input} + } } diff --git a/AyanTechNetworkingLibrary/Model/ATResponse.swift b/AyanTechNetworkingLibrary/Model/ATResponse.swift index 69bf4a9..77f5c85 100644 --- a/AyanTechNetworkingLibrary/Model/ATResponse.swift +++ b/AyanTechNetworkingLibrary/Model/ATResponse.swift @@ -52,8 +52,8 @@ public class ATResponse { } public class Status { - var errorCodeString: String? - var description: String? + public var errorCodeString: String? + public var description: String? public var isSuccess: Bool { return self.errorCodeString == kResponseSuccessCode diff --git a/AyanTechNetworkingLibrary/Model/Server.swift b/AyanTechNetworkingLibrary/Model/Server.swift index 43e2524..d639460 100644 --- a/AyanTechNetworkingLibrary/Model/Server.swift +++ b/AyanTechNetworkingLibrary/Model/Server.swift @@ -28,13 +28,14 @@ class Server { req.task = URLSession.shared.dataTask(with: r as URLRequest) { (data, response, error) in Utils.runOnMainThread { UIApplication.shared.isNetworkActivityIndicatorVisible = false + + if let responseString = String.init(data: data ?? Data(), encoding: .utf8) { + ATLog("RESPONSE", logData: "\(responseString)") + } + + req.task = nil + responseHandler(data, response, error) } - if let responseString = String.init(data: data ?? Data(), encoding: .utf8) { - ATLog("RESPONSE", logData: "\(responseString)") - } - - req.task = nil - responseHandler(data, response, error) } req.task?.resume() }