Merge pull request #5 from gonzalezreal/direct-line

Minor improvements
gonzalezreal · Feb 18, 2020 · a420dc3 · a420dc3
2 parents d96a3d2 + 0ae26a2
commit a420dc3
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -141,8 +141,7 @@ func popularItems() -> AnyPublisher<[MovieItem], Error> {
 The `APIClient` class uses [SwiftLog](https://github.com/apple/swift-log) to log requests and responses. If you set its `logger.logLevel` to `.debug` you will start seeing requests and responses as they happen in your logs.
 
 ```Swift
-let apiClient = APIClient(baseURL: URL(string: "https://api.themoviedb.org/3")!)
-apiClient.logger.logLevel = .debug
+let apiClient = APIClient(baseURL: URL(string: "https://api.themoviedb.org/3")!, logLevel: .debug)
 ```
 
 Here is an example of the output using the default `StreamLogHandler`:

diff --git a/Sources/SimpleNetworking/APIClient.swift b/Sources/SimpleNetworking/APIClient.swift
@@ -9,10 +9,11 @@ public class APIClient {
 
     private let session: URLSession
 
-    public init(baseURL: URL, configuration: APIClientConfiguration = APIClientConfiguration(), session: URLSession = URLSession(configuration: .default)) {
+    public init(baseURL: URL, configuration: APIClientConfiguration = APIClientConfiguration(), session: URLSession = URLSession(configuration: .default), logLevel: Logger.Level = .info) {
         self.baseURL = baseURL
         self.configuration = configuration
         self.session = session
+        logger.logLevel = logLevel
     }
 
     public func response<Output>(for endpoint: Endpoint<Output>) -> AnyPublisher<Output, Error> {

diff --git a/Sources/SimpleNetworking/Data+LogDescription.swift b/Sources/SimpleNetworking/Data+LogDescription.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-internal extension Data {
+public extension Data {
     var logDescription: String {
         String(data: prettyPrintedJSON ?? self, encoding: .utf8).map {
             $0.components(separatedBy: .newlines)

diff --git a/Sources/SimpleNetworking/Endpoint.swift b/Sources/SimpleNetworking/Endpoint.swift
@@ -20,24 +20,26 @@ public struct Endpoint<Output> {
 public extension Endpoint where Output: Decodable {
     init(method: Method,
          path: String,
+         headers: [HeaderField: String] = [:],
          queryParameters: [String: String] = [:],
          dateDecodingStrategy: JSONDecoder.DateDecodingStrategy = .deferredToDate) {
         self.init(method: method,
                   path: path,
-                  headers: [.accept: ContentType.json.rawValue],
+                  headers: [.accept: ContentType.json.rawValue].merging(headers) { _, new in new },
                   queryParameters: queryParameters,
                   body: nil,
                   output: decode(with: dateDecodingStrategy))
     }
 
     init<Input>(method: Method,
                 path: String,
+                headers: [HeaderField: String] = [:],
                 body: Input,
                 dateEncodingStrategy: JSONEncoder.DateEncodingStrategy = .deferredToDate,
                 dateDecodingStrategy: JSONDecoder.DateDecodingStrategy = .deferredToDate) where Input: Encodable {
         self.init(method: method,
                   path: path,
-                  headers: [.accept: ContentType.json.rawValue, .contentType: ContentType.json.rawValue],
+                  headers: [.accept: ContentType.json.rawValue, .contentType: ContentType.json.rawValue].merging(headers) { _, new in new },
                   queryParameters: [:],
                   body: try! encode(body, with: dateEncodingStrategy),
                   output: decode(with: dateDecodingStrategy))
@@ -47,11 +49,12 @@ public extension Endpoint where Output: Decodable {
 public extension Endpoint where Output == Void {
     init<Input>(method: Method,
                 path: String,
+                headers: [HeaderField: String] = [:],
                 body: Input,
                 dateEncodingStrategy: JSONEncoder.DateEncodingStrategy = .deferredToDate) where Input: Encodable {
         self.init(method: method,
                   path: path,
-                  headers: [.contentType: ContentType.json.rawValue],
+                  headers: [.contentType: ContentType.json.rawValue].merging(headers) { _, new in new },
                   queryParameters: [:],
                   body: try! encode(body, with: dateEncodingStrategy),
                   output: { _ in () })

diff --git a/Tests/SimpleNetworkingTests/EndpointTest.swift b/Tests/SimpleNetworkingTests/EndpointTest.swift
@@ -4,8 +4,9 @@ import XCTest
 final class EndpointTest: XCTestCase {
     func testEndpointWithoutQuery() {
         // given
-        let endpoint = Endpoint<User>(method: .get, path: "test")
+        let endpoint = Endpoint<User>(method: .get, path: "test", headers: [.authorization: "Bearer 3xpo"])
         var expected = URLRequest(url: Fixtures.anyURLWithPath("test"))
+        expected.addValue("Bearer 3xpo", forHTTPHeaderField: "Authorization")
         expected.addValue(ContentType.json.rawValue, forHTTPHeaderField: "Accept")
 
         // when
@@ -17,8 +18,9 @@ final class EndpointTest: XCTestCase {
 
     func testEndpointWithQuery() {
         // given
-        let endpoint = Endpoint<User>(method: .get, path: "test", queryParameters: ["foo": "bar"])
+        let endpoint = Endpoint<User>(method: .get, path: "test", headers: [.authorization: "Bearer 3xpo"], queryParameters: ["foo": "bar"])
         var expected = URLRequest(url: Fixtures.anyURLWithPath("test", query: "foo=bar"))
+        expected.addValue("Bearer 3xpo", forHTTPHeaderField: "Authorization")
         expected.addValue(ContentType.json.rawValue, forHTTPHeaderField: "Accept")
 
         // when
@@ -31,11 +33,15 @@ final class EndpointTest: XCTestCase {
     func testEndpointWithBodyAndOutput() {
         // given
         let user = User(name: "test")
-        let endpoint = Endpoint<User>(method: .post, path: "user/new", body: user)
+        let endpoint = Endpoint<User>(method: .post,
+                                      path: "user/new",
+                                      headers: [.authorization: "Bearer 3xpo"],
+                                      body: user)
 
         var expected = URLRequest(url: Fixtures.anyURLWithPath("user/new"))
         expected.httpMethod = "POST"
         expected.httpBody = try! JSONEncoder().encode(user)
+        expected.addValue("Bearer 3xpo", forHTTPHeaderField: "Authorization")
         expected.addValue(ContentType.json.rawValue, forHTTPHeaderField: "Accept")
         expected.addValue(ContentType.json.rawValue, forHTTPHeaderField: "Content-Type")
 
@@ -49,11 +55,12 @@ final class EndpointTest: XCTestCase {
     func testEndpointWithBody() {
         // given
         let user = User(name: "test")
-        let endpoint = Endpoint<Void>(method: .post, path: "user/new", body: user)
+        let endpoint = Endpoint<Void>(method: .post, path: "user/new", headers: [.authorization: "Bearer 3xpo"], body: user)
 
         var expected = URLRequest(url: Fixtures.anyURLWithPath("user/new"))
         expected.httpMethod = "POST"
         expected.httpBody = try! JSONEncoder().encode(user)
+        expected.addValue("Bearer 3xpo", forHTTPHeaderField: "Authorization")
         expected.addValue(ContentType.json.rawValue, forHTTPHeaderField: "Content-Type")
 
         // when