JZDesign · JZDesign · Aug 21, 2020 · Aug 20, 2020 · Aug 21, 2020 · Aug 21, 2020
diff --git a/.codebeatignore b/.codebeatignore
@@ -0,0 +1 @@
+Sources/HTTPEngine/HTTPEngine+ConvenienceMethods.swift
diff --git a/Sources/HTTPEngine/Errors.swift b/Sources/HTTPEngine/Errors.swift
@@ -1,3 +1,4 @@
+// swiftlint:disable nesting
 import Foundation
 
 public struct Errors {

diff --git a/Sources/HTTPEngine/HTTPEngine+ConvenienceMethods.swift b/Sources/HTTPEngine/HTTPEngine+ConvenienceMethods.swift
@@ -1,3 +1,4 @@
+// swiftlint:disable line_length
 import Foundation
 import Combine
 
@@ -81,8 +82,8 @@ public extension HTTPEngine {
             .decode(type: decodableResponse.self, decoder: JSONDecoder())
             .eraseToAnyPublisher()
     }
-    
-    
+
+
     /// Makes a request via HTTP and Decodes the response
     /// - Parameters:
     ///   - decodableResponse: Decodable - An object that represents the response body
@@ -108,7 +109,7 @@ public extension HTTPEngine {
     }
 
 
-    /// Makes a request via HTTP, Encodes the body and Decodes the response
+    /// Makes a POST request via HTTP, Encodes the body and Decodes the response
     /// - Parameters:
     ///   - decodableResponse: Decodable - An object that represents the response body
     ///   - urlString: URL domain + path as a string: `"abc.com/some/path"`
@@ -134,8 +135,8 @@ public extension HTTPEngine {
         makeRequestAndParseResponse(value.self, method: .post, url: url, body: body, validator: validator)
     }
 
-    
-    /// Makes a request via HTTP, Encodes the body and Decodes the response
+
+    /// Makes a POST request via HTTP, Encodes the body and Decodes the response
     /// - Parameters:
     ///   - decodableResponse: Decodable - An object that represents the response body
     ///   - urlString: URL domain + path as a string: `"abc.com/some/path"`
@@ -158,6 +159,86 @@ public extension HTTPEngine {
     ) -> AnyPublisher<Response, Error> {
         post(value.self, url: url, body: nil as NilBody?, validator: validator)
     }
+
+
+    /// Makes a PATCH request via HTTP, Encodes the body and Decodes the response
+    /// - Parameters:
+    ///   - decodableResponse: Decodable - An object that represents the response body
+    ///   - urlString: URL domain + path as a string: `"abc.com/some/path"`
+    ///   - body: Encodable?: The encodable object that represents body data to send with a request
+    ///   - validator: `(Int) -> Bool` - A function to validate the response code of the request. By default, makeRequest() will fail if the status code does not fall within the 200 - 299 range. To override this, pass in a function that compares the status code and returns a boolean. True == success, False == failure. Upon failure an error will be thrown that contains the HTTPURLResponse for inspection.
+    ///
+    /// - Returns: AnyPubliser<Data, Error>
+    ///
+    ///    -- Validation
+    ///
+    ///    By default the validation checks for a 200-299 status code and fails if the code is out of bounds
+    ///    ```swift
+    ///    // example validator
+    ///    validator: { $0 == 202 }
+    ///    // Failure throws Errors.Response.unexpectedStatusCode(HTTPURLRequest)
+    ///    ```
+    func patch<Response: Decodable, Body: Encodable>(
+        _ value: Response.Type,
+        url: String,
+        body: Body? = nil,
+        validator: ResponseValidationClosure? = nil
+    ) -> AnyPublisher<Response, Error> {
+        makeRequestAndParseResponse(value.self, method: .patch, url: url, body: body, validator: validator)
+    }
+
+
+    /// Makes a PUT request via HTTP, Encodes the body and Decodes the response
+    /// - Parameters:
+    ///   - decodableResponse: Decodable - An object that represents the response body
+    ///   - urlString: URL domain + path as a string: `"abc.com/some/path"`
+    ///   - body: Encodable?: The encodable object that represents body data to send with a request
+    ///   - validator: `(Int) -> Bool` - A function to validate the response code of the request. By default, makeRequest() will fail if the status code does not fall within the 200 - 299 range. To override this, pass in a function that compares the status code and returns a boolean. True == success, False == failure. Upon failure an error will be thrown that contains the HTTPURLResponse for inspection.
+    ///
+    /// - Returns: AnyPubliser<Data, Error>
+    ///
+    ///    -- Validation
+    ///
+    ///    By default the validation checks for a 200-299 status code and fails if the code is out of bounds
+    ///    ```swift
+    ///    // example validator
+    ///    validator: { $0 == 202 }
+    ///    // Failure throws Errors.Response.unexpectedStatusCode(HTTPURLRequest)
+    ///    ```
+    func put<Response: Decodable, Body: Encodable>(
+        _ value: Response.Type,
+        url: String,
+        body: Body? = nil,
+        validator: ResponseValidationClosure? = nil
+    ) -> AnyPublisher<Response, Error> {
+        makeRequestAndParseResponse(value.self, method: .put, url: url, body: body, validator: validator)
+    }
+
+    /// Makes a DELETE request via HTTP, Encodes the body and Decodes the response
+    /// - Parameters:
+    ///   - decodableResponse: Decodable - An object that represents the response body
+    ///   - urlString: URL domain + path as a string: `"abc.com/some/path"`
+    ///   - body: Encodable?: The encodable object that represents body data to send with a request
+    ///   - validator: `(Int) -> Bool` - A function to validate the response code of the request. By default, makeRequest() will fail if the status code does not fall within the 200 - 299 range. To override this, pass in a function that compares the status code and returns a boolean. True == success, False == failure. Upon failure an error will be thrown that contains the HTTPURLResponse for inspection.
+    ///
+    /// - Returns: AnyPubliser<Data, Error>
+    ///
+    ///    -- Validation
+    ///
+    ///    By default the validation checks for a 200-299 status code and fails if the code is out of bounds
+    ///    ```swift
+    ///    // example validator
+    ///    validator: { $0 == 202 }
+    ///    // Failure throws Errors.Response.unexpectedStatusCode(HTTPURLRequest)
+    ///    ```
+    func delete<Response: Decodable, Body: Encodable>(
+        _ value: Response.Type,
+        url: String,
+        body: Body? = nil,
+        validator: ResponseValidationClosure? = nil
+    ) -> AnyPublisher<Response, Error> {
+        makeRequestAndParseResponse(value.self, method: .delete, url: url, body: body, validator: validator)
+    }
 }
 
 private struct NilBody: Encodable {}
diff --git a/Sources/HTTPEngine/HTTPEngine.swift b/Sources/HTTPEngine/HTTPEngine.swift
@@ -1,3 +1,4 @@
+// swiftlint:disable line_length
 import Foundation
 import Combine
 

diff --git a/Sources/HTTPEngine/Utilities.swift b/Sources/HTTPEngine/Utilities.swift
@@ -1,3 +1,4 @@
+// swiftlint:disable line_length
 import Foundation
 import Combine
 

diff --git a/Tests/HTTPEngineTests/HTTPEngine+ConvenieceMethodTests.swift b/Tests/HTTPEngineTests/HTTPEngine+ConvenieceMethodTests.swift
@@ -5,14 +5,7 @@ import OHHTTPStubsSwift
 @testable import HTTPEngine
 
 final class HTTPEngineConvenienceMethodTests: XCTestCase {
-    static var allTests = [
-    ("make request and parse response decodes into type", testMakeRequestAndParseResponseDecodesIntoType),
-    ("make request and parse response throws if Decode fails", testMakeRequestAndParseResponseThrowsIfDecodeFails),
-    ("make request and parse response Encodes and Decodes into type", testMakeRequestAndParseResponseEncodesAndDecodesIntoType),
-    ("get succeeds", testGetSucceeds),
-    ("post succeeds", testPostSucceeds),
-    ]
-
+
     func testMakeRequestAndParseResponseDecodesIntoType() {
         stub(condition: isHost("google.com") && isMethodGET()) { _ in
             HTTPStubsResponse(jsonObject: ["key":"value"], statusCode: 200, headers: nil)
@@ -25,7 +18,7 @@ final class HTTPEngineConvenienceMethodTests: XCTestCase {
         }
 
     }
-    
+
     func testMakeRequestAndParseResponseThrowsIfDecodeFails() {
         stub(condition: isHost("google.com") && isMethodGET()) { _ in
             HTTPStubsResponse(jsonObject: [:], statusCode: 200, headers: nil)
@@ -46,7 +39,7 @@ final class HTTPEngineConvenienceMethodTests: XCTestCase {
                 XCTAssertEqual($0.key, "value")
         }
     }
-    
+
     func testGetSucceeds() {
         stub(condition: isHost("google.com") && isMethodGET()) { _ in
             HTTPStubsResponse(jsonObject: ["key": "value"], statusCode: 200, headers: nil)
@@ -59,7 +52,7 @@ final class HTTPEngineConvenienceMethodTests: XCTestCase {
 
         }
     }
-    
+
     func testPostSucceeds() {
         stub(condition: isHost("google.com") && isMethodPOST()) { _ in
             HTTPStubsResponse(jsonObject: ["key": "value"], statusCode: 200, headers: nil)
@@ -71,6 +64,42 @@ final class HTTPEngineConvenienceMethodTests: XCTestCase {
                 XCTAssertEqual($0.key, "value")
         }
     }
+
+    func testPatchSucceeds() {
+        stub(condition: isHost("google.com") && isMethodPATCH()) { _ in
+            HTTPStubsResponse(jsonObject: ["key": "value"], statusCode: 200, headers: nil)
+        }
+
+        HTTPEngine()
+            .patch(TestResponseBody.self, url: "https://google.com", body: nil as TestResponseBody?)
+            .assertResult(test: self) {
+                XCTAssertEqual($0.key, "value")
+        }
+    }
+
+    func testPutSucceeds() {
+        stub(condition: isHost("google.com") && isMethodPUT()) { _ in
+            HTTPStubsResponse(jsonObject: ["key": "value"], statusCode: 200, headers: nil)
+        }
+
+        HTTPEngine()
+            .put(TestResponseBody.self, url: "https://google.com", body: nil as TestResponseBody?)
+            .assertResult(test: self) {
+                XCTAssertEqual($0.key, "value")
+        }
+    }
+
+    func testDeleteSucceeds() {
+        stub(condition: isHost("google.com") && isMethodDELETE()) { _ in
+            HTTPStubsResponse(jsonObject: ["key": "value"], statusCode: 200, headers: nil)
+        }
+
+        HTTPEngine()
+            .delete(TestResponseBody.self, url: "https://google.com", body: nil as TestResponseBody?)
+            .assertResult(test: self) {
+                XCTAssertEqual($0.key, "value")
+        }
+    }
 }
 
 struct TestResponseBody: Codable {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Sources/HTTPEngine/HTTPEngine+ConvenienceMethods.swift