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

Modernisation #1

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Rename transform to value(for:)
danielctull committed Mar 22, 2024

Verified

This commit was signed with the committer’s verified signature.
danielctull Daniel Tull
commit c1e84f90463c2bba130aab94a665be2c2d8e52d7
2 changes: 1 addition & 1 deletion Sources/Resourceful/Resource+Combine.swift
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ extension URLSession {

Future { $0(Result { try resource.makeRequest() }) }
.flatMap { self.dataTaskPublisher(for: $0).mapError { $0 } }
.tryMap(resource.transform)
.tryMap(resource.value)
.eraseToAnyPublisher()
}
}
2 changes: 1 addition & 1 deletion Sources/Resourceful/Resource+Fetch.swift
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ extension URLSession {
do {
let request = try resource.makeRequest()
return perform(request: request) { result in
let value = Result { try resource.transform(result.get()) }
let value = Result { try resource.value(for: result.get()) }
queue.async {
completion(value)
}
22 changes: 16 additions & 6 deletions Sources/Resourceful/Resource.swift
Original file line number Diff line number Diff line change
@@ -11,12 +11,11 @@ public struct Resource<Value> {

public typealias Response = (data: Data, response: URLResponse)

private let _success: (Response) throws -> Value

/// Makes the request for the resource.
public let makeRequest: () throws -> URLRequest

/// Transforms the network response into the desired value.
public let transform: (Response) throws -> Value

/// Creates a resource located with the request and transformed from data
/// using the given transform.
///
@@ -41,7 +40,14 @@ public struct Resource<Value> {
public init(makeRequest: @escaping () throws -> URLRequest,
transform: @escaping (Response) throws -> Value) {
self.makeRequest = makeRequest
self.transform = transform
_success = transform
}
}

extension Resource {

public func value(for response: Response) throws -> Value {
try _success(response)
}
}

@@ -58,7 +64,7 @@ extension Resource {
) -> Resource<NewValue> {

return Resource<NewValue>(makeRequest: makeRequest) { response in
try transform(self.transform(response))
try transform(value(for: response))
}
}

@@ -67,7 +73,7 @@ extension Resource {
) -> Resource {
return Resource(
makeRequest: { try modify(self.makeRequest()) },
transform: transform)
transform: value(for:))
}

public func modifyRequest(
@@ -88,4 +94,8 @@ extension Resource {
/// A request used to fetch the data.
@available(*, deprecated, message: "Use makeRequest() instead.")
public var request: URLRequest { return try! makeRequest() }

/// Transforms the network response into the desired value.
@available(*, deprecated, message: "Use value(for:) instead.")
public var transform: (Response) throws -> Value { _success }
}
6 changes: 3 additions & 3 deletions Tests/ResourcefulTests/ResourceTests.swift
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ final class ResourceTests: XCTestCase {
func testInit() throws {
let resource = Resource(request: request) { _ in return "Hello" }
XCTAssertEqual(try resource.makeRequest(), request)
XCTAssertEqual(try resource.transform(response), "Hello")
XCTAssertEqual(try resource.value(for: response), "Hello")
}

func testMapRequest() {
@@ -31,8 +31,8 @@ final class ResourceTests: XCTestCase {
func testTryMap() {
let integer = Resource(request: request) { _ in return 20 }
let string = integer.tryMap { String($0) }
XCTAssertEqual(try integer.transform(response), 20)
XCTAssertEqual(try string.transform(response), "20")
XCTAssertEqual(try integer.value(for: response), 20)
XCTAssertEqual(try string.value(for: response), "20")
}

// swiftlint:disable force_unwrapping