Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Naming #43

Merged
merged 2 commits into from
Apr 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ cancellable.cancel()
### Log Network calls
3 log levels are supported: `off`, `info`, `debug`
```swift
client.logLevels = .debug
client.logLevel = .debug
```


Expand Down
6 changes: 3 additions & 3 deletions Sources/Networking/Calls/NetworkingClient+Requests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
14 changes: 7 additions & 7 deletions Sources/Networking/Logging/NetworkingLogger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/Networking/NetworkingClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
16 changes: 8 additions & 8 deletions Sources/Networking/NetworkingRequest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -137,7 +137,7 @@ public class NetworkingRequest: NSObject {

internal func buildURLRequest() -> URLRequest? {
var urlString = baseURL + route
if httpVerb == .get {
if httpMethod == .get {
urlString = getURLWithParams()
}

Expand All @@ -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")
Expand All @@ -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)
}
Expand All @@ -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)
Expand Down