Merge pull request #43 from elijah-rappaport/master

Naming
freshOS · Apr 7, 2022 · 3323942 · 3323942
2 parents bfb1e8b + d789613
commit 3323942
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git 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
@@ -30,16 +30,16 @@ 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
 
         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/HTTPVerb.swift → Sources/Networking/HTTPMethod.swift b/Sources/Networking/HTTPVerb.swift → Sources/Networking/HTTPMethod.swift
@@ -1,13 +1,13 @@
 //
-//  HTTPVerb.swift
+//  HTTPMethod.swift
 //  
 //
 //  Created by Sacha DSO on 30/01/2020.
 //
 
 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
@@ -9,32 +9,32 @@ 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,
+        if let method = request.httpMethod,
             let url = request.url {
-            print("\(verb) '\(url.absoluteString)'")
+            print("\(method) '\(url.absoluteString)'")
             logHeaders(request)
             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
@@ -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
@@ -15,13 +15,13 @@ 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]?
-    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?
@@ -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)