From 37c21d87ca96a32ef77364e2fabe2fbf1594e888 Mon Sep 17 00:00:00 2001 From: Elijah Rappaport Date: Sat, 2 Apr 2022 17:31:36 -0700 Subject: [PATCH 1/2] fix naming: logLevels ==> logLevel --- README.md | 2 +- .../Networking/Calls/NetworkingClient+Requests.swift | 2 +- Sources/Networking/Logging/NetworkingLogger.swift | 10 +++++----- Sources/Networking/NetworkingClient.swift | 6 +++--- Sources/Networking/NetworkingRequest.swift | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 86902a5..367defc 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ cancellable.cancel() ### Log Network calls 3 log levels are supported: `off`, `info`, `debug` ```swift -client.logLevels = .debug +client.logLevel = .debug ``` diff --git a/Sources/Networking/Calls/NetworkingClient+Requests.swift b/Sources/Networking/Calls/NetworkingClient+Requests.swift index 6d0428f..77c931b 100644 --- a/Sources/Networking/Calls/NetworkingClient+Requests.swift +++ b/Sources/Networking/Calls/NetworkingClient+Requests.swift @@ -39,7 +39,7 @@ public extension NetworkingClient { let updateRequest = { [weak req, weak self] in guard let self = self else { return } req?.baseURL = self.baseURL - req?.logLevels = self.logLevels + req?.logLevel = self.logLevel req?.headers = self.headers req?.parameterEncoding = self.parameterEncoding req?.sessionConfiguration = self.sessionConfiguration diff --git a/Sources/Networking/Logging/NetworkingLogger.swift b/Sources/Networking/Logging/NetworkingLogger.swift index 3832233..7b0d075 100644 --- a/Sources/Networking/Logging/NetworkingLogger.swift +++ b/Sources/Networking/Logging/NetworkingLogger.swift @@ -9,10 +9,10 @@ import Foundation class NetworkingLogger { - var logLevels = NetworkingLogLevel.off + var logLevel = NetworkingLogLevel.off func log(request: URLRequest) { - guard logLevels != .off else { + guard logLevel != .off else { return } if let verb = request.httpMethod, @@ -22,19 +22,19 @@ class NetworkingLogger { logBody(request) } - if logLevels == .debug { + if logLevel == .debug { logCurl(request) } } func log(response: URLResponse, data: Data) { - guard logLevels != .off else { + guard logLevel != .off else { return } if let response = response as? HTTPURLResponse { logStatusCodeAndURL(response) } - if logLevels == .debug { + if logLevel == .debug { print(String(decoding: data, as: UTF8.self)) } } diff --git a/Sources/Networking/NetworkingClient.swift b/Sources/Networking/NetworkingClient.swift index 3050459..68c7b9a 100644 --- a/Sources/Networking/NetworkingClient.swift +++ b/Sources/Networking/NetworkingClient.swift @@ -21,9 +21,9 @@ public class NetworkingClient { Values Available are .None, Calls and CallsAndResponses. Default is None */ - public var logLevels: NetworkingLogLevel { - get { return logger.logLevels } - set { logger.logLevels = newValue } + public var logLevel: NetworkingLogLevel { + get { return logger.logLevel } + set { logger.logLevel = newValue } } private let logger = NetworkingLogger() diff --git a/Sources/Networking/NetworkingRequest.swift b/Sources/Networking/NetworkingRequest.swift index 5f271ee..51632b4 100644 --- a/Sources/Networking/NetworkingRequest.swift +++ b/Sources/Networking/NetworkingRequest.swift @@ -19,9 +19,9 @@ public class NetworkingRequest: NSObject { public var params = Params() var headers = [String: String]() var multipartData: [MultipartData]? - var logLevels: NetworkingLogLevel { - get { return logger.logLevels } - set { logger.logLevels = newValue } + var logLevel: NetworkingLogLevel { + get { return logger.logLevel } + set { logger.logLevel = newValue } } private let logger = NetworkingLogger() var timeout: TimeInterval? From d789613f592aa519805251702c785dc5fa772cd1 Mon Sep 17 00:00:00 2001 From: Elijah Rappaport Date: Sat, 2 Apr 2022 17:33:55 -0700 Subject: [PATCH 2/2] fix naming: HTTPVerb ==> HTTPMethod --- .../Networking/Calls/NetworkingClient+Requests.swift | 4 ++-- .../Networking/{HTTPVerb.swift => HTTPMethod.swift} | 4 ++-- Sources/Networking/Logging/NetworkingLogger.swift | 4 ++-- Sources/Networking/NetworkingRequest.swift | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) rename Sources/Networking/{HTTPVerb.swift => HTTPMethod.swift} (78%) diff --git a/Sources/Networking/Calls/NetworkingClient+Requests.swift b/Sources/Networking/Calls/NetworkingClient+Requests.swift index 77c931b..52e8cf3 100644 --- a/Sources/Networking/Calls/NetworkingClient+Requests.swift +++ b/Sources/Networking/Calls/NetworkingClient+Requests.swift @@ -30,9 +30,9 @@ public extension NetworkingClient { request(.delete, route, params: params) } - internal func request(_ httpVerb: HTTPVerb, _ route: String, params: Params = Params()) -> NetworkingRequest { + internal func request(_ httpMethod: HTTPMethod, _ route: String, params: Params = Params()) -> NetworkingRequest { let req = NetworkingRequest() - req.httpVerb = httpVerb + req.httpMethod = httpMethod req.route = route req.params = params diff --git a/Sources/Networking/HTTPVerb.swift b/Sources/Networking/HTTPMethod.swift similarity index 78% rename from Sources/Networking/HTTPVerb.swift rename to Sources/Networking/HTTPMethod.swift index 40c205e..453abce 100644 --- a/Sources/Networking/HTTPVerb.swift +++ b/Sources/Networking/HTTPMethod.swift @@ -1,5 +1,5 @@ // -// HTTPVerb.swift +// HTTPMethod.swift // // // Created by Sacha DSO on 30/01/2020. @@ -7,7 +7,7 @@ import Foundation -public enum HTTPVerb: String { +public enum HTTPMethod: String { case get = "GET" case put = "PUT" case patch = "PATCH" diff --git a/Sources/Networking/Logging/NetworkingLogger.swift b/Sources/Networking/Logging/NetworkingLogger.swift index 7b0d075..253707a 100644 --- a/Sources/Networking/Logging/NetworkingLogger.swift +++ b/Sources/Networking/Logging/NetworkingLogger.swift @@ -15,9 +15,9 @@ class NetworkingLogger { guard logLevel != .off else { return } - if let verb = request.httpMethod, + if let method = request.httpMethod, let url = request.url { - print("\(verb) '\(url.absoluteString)'") + print("\(method) '\(url.absoluteString)'") logHeaders(request) logBody(request) diff --git a/Sources/Networking/NetworkingRequest.swift b/Sources/Networking/NetworkingRequest.swift index 51632b4..3f37f92 100644 --- a/Sources/Networking/NetworkingRequest.swift +++ b/Sources/Networking/NetworkingRequest.swift @@ -15,7 +15,7 @@ public class NetworkingRequest: NSObject { var parameterEncoding = ParameterEncoding.urlEncoded var baseURL = "" var route = "" - var httpVerb = HTTPVerb.get + var httpMethod = HTTPMethod.get public var params = Params() var headers = [String: String]() var multipartData: [MultipartData]? @@ -137,7 +137,7 @@ public class NetworkingRequest: NSObject { internal func buildURLRequest() -> URLRequest? { var urlString = baseURL + route - if httpVerb == .get { + if httpMethod == .get { urlString = getURLWithParams() } @@ -146,7 +146,7 @@ public class NetworkingRequest: NSObject { } var request = URLRequest(url: url) - if httpVerb != .get && multipartData == nil { + if httpMethod != .get && multipartData == nil { switch parameterEncoding { case .urlEncoded: request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") @@ -155,7 +155,7 @@ public class NetworkingRequest: NSObject { } } - request.httpMethod = httpVerb.rawValue + request.httpMethod = httpMethod.rawValue for (key, value) in headers { request.setValue(value, forHTTPHeaderField: key) } @@ -164,7 +164,7 @@ public class NetworkingRequest: NSObject { request.timeoutInterval = timeout } - if httpVerb != .get && multipartData == nil { + if httpMethod != .get && multipartData == nil { switch parameterEncoding { case .urlEncoded: request.httpBody = params.asPercentEncodedString().data(using: .utf8)