Skip to content

add allowCompletion to requestBehavior #4

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.

Sign up for GitHub

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

Open
swwol wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

add allowCompletion to requestBehavior #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d77d124
add allowCompletion to requestBehavior
Jul 25, 2019
d05dfb3
remove call to completion, replace with call to after(). Update tests
Jul 25, 2019
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
40 changes: 40 additions & 0 deletions NetworkingTests/Webservice/WebserviceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,44 @@ final class WebserviceTests: XCTestCase {

waitForExpectations(timeout: 0.1, handler: nil)
}

struct CancelRequestBehavior: RequestBehavior {
func allowCompletion(data: Data?, response: URLResponse?, error: Error?) -> Bool {
return false
}

func after(completion result: Result<HTTPURLResponse, Error>) {
switch result {
case .success:
XCTFail("should not get called")
case .failure(let error):
if case Webservice.Error.cancelled = error {
print("request cancelled")
} else {
XCTFail("incorrect error")
}
}
}
}

func testCancelledBehavior() {
Copy link
Contributor

@wainglaister wainglaister Jul 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is the test for a cancel request behaviour that returns true?


let sessionMock = URLSessionDataTaskLoaderFake(data: nil,
response: HTTPURLResponse(url: URL.fake(),
statusCode: 200,
httpVersion: nil,
headerFields: nil),
error: nil)

webservice = Webservice(baseURL: URL.fake(),
session: sessionMock,
defaultRequestBehavior: CancelRequestBehavior())

let resource = Resource<Empty, Empty>(endpoint: "/", decoder: EmptyDecoder())

webservice.load(resource) { _ in
XCTFail("completion should not get called")
}
}
}

14 changes: 12 additions & 2 deletions Sources/Webservice/Requests/RequestBehavior.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ public protocol RequestBehavior {
func modify(urlComponents: URLComponents) -> URLComponents
func modify(planned request: URLRequest) -> URLRequest
func before(sending request: URLRequest)

func modifyResponse(data: Data?, response: URLResponse?, error: Error?) -> (Data?, URLResponse?, Error?)
func allowCompletion(data: Data?, response: URLResponse?, error: Error?) -> Bool
func after(completion result: Result<HTTPURLResponse, Error>)

}

public extension RequestBehavior {
func modify(urlComponents: URLComponents) -> URLComponents { return urlComponents }
func modify(planned request: URLRequest) -> URLRequest { return request }
func before(sending: URLRequest) {}

func allowCompletion(data: Data?, response: URLResponse?, error: Error?) -> Bool { return true }
func modifyResponse(data: Data?, response: URLResponse?, error: Error?)
-> (Data?, URLResponse?, Error?) { return (data, response, error) }
func after(completion result: Result<HTTPURLResponse, Error>) {}
Expand Down Expand Up @@ -74,4 +75,13 @@ private struct CompoundRequestBehavior: RequestBehavior {
$0.after(completion: result)
}
}

func allowCompletion(data: Data?, response: URLResponse?, error: Error?) -> Bool {
for behaviour in behaviors {
if !behaviour.allowCompletion(data: data, response: response, error: error) {
return false
}
}
return true
}
}
7 changes: 7 additions & 0 deletions Sources/Webservice/Webservice.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public struct Webservice: ResourceRequestable {
public enum Error: Swift.Error {
case http(HTTP.StatusCode, Swift.Error?)
case unknown(Swift.Error?)
case cancelled
}

private let baseURL: URL
Expand Down Expand Up @@ -42,6 +43,12 @@ public struct Webservice: ResourceRequestable {
requestBehavior.before(sending: request)

session.dataTask(with: request) { data, response, error in

guard requestBehavior.allowCompletion(data: data, response: response, error: error) else {
requestBehavior.after(completion: Result.failure(Error.cancelled))
return
}

let (data, response, error) = requestBehavior.modifyResponse(data: data,
response: response,
error: error)
Expand Down