feat: iOS 13+ async methods

Rubenfer · Dec 23, 2021 · e5e318d · e5e318d
1 parent 8cdd890
commit e5e318d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 39 deletions.
diff --git a/Sources/REESwift/Extensions/URLSession.swift b/Sources/REESwift/Extensions/URLSession.swift
@@ -0,0 +1,17 @@
+import Foundation
+
+@available(iOS, deprecated: 15.0)
+extension URLSession {
+    func data(from url: URL) async throws -> (Data, URLResponse) {
+        try await withCheckedThrowingContinuation { continuation in
+            let task = self.dataTask(with: url) { data, response, error in
+                guard let data = data, let response = response else {
+                    let error = error ?? URLError(.badServerResponse)
+                    return continuation.resume(throwing: error)
+                }
+                continuation.resume(returning: (data, response))
+            }
+            task.resume()
+        }
+    }
+}
diff --git a/Sources/REESwift/Network.swift b/Sources/REESwift/Network.swift
@@ -17,10 +17,6 @@ class Network {
         }
     }
 
-    @available(iOS 15.0, *)
-    @available(tvOS 15.0, *)
-    @available(watchOS 8.0, *)
-    @available(macOS 12, *)
     func request<T: Decodable>(_ endpoint: Endpoint) async throws -> T {
         let (data, response) = try await URLSession.shared.data(from: endpoint.url)
         guard (response as? HTTPURLResponse)?.statusCode == 200 else { throw URLError(.badServerResponse) }

diff --git a/Sources/REESwift/REESwift.swift b/Sources/REESwift/REESwift.swift
@@ -17,14 +17,6 @@ public extension REESwift {
         prices(id: "1001", startDate: date.start, endDate: date.end, geo: geo, completion: completion)
     }
 
-    func consumerPrices(startDate: Date, endDate: Date, geo: GEO) -> AnyPublisher<[Value], Error> {
-        return prices(id: "1001", startDate: startDate, endDate: endDate, geo: geo)
-    }
-
-    func consumerPrices(date: Date, geo: GEO) -> AnyPublisher<[Value], Error> {
-        return prices(id: "1001", startDate: date.start, endDate: date.end, geo: geo)
-    }
-
     func spotPrices(startDate: Date, endDate: Date, completion: @escaping (Result<[Value], Error>) -> Void) {
         prices(id: "600", startDate: startDate, endDate: endDate, geo: nil, completion: completion)
     }
@@ -33,14 +25,6 @@ public extension REESwift {
         prices(id: "600", startDate: date.start, endDate: date.end, geo: nil, completion: completion)
     }
 
-    func spotPrices(startDate: Date, endDate: Date) -> AnyPublisher<[Value], Error> {
-        return prices(id: "600", startDate: startDate, endDate: endDate, geo: nil)
-    }
-
-    func spotPrices(date: Date) -> AnyPublisher<[Value], Error> {
-        return prices(id: "600", startDate: date.start, endDate: date.end, geo: nil)
-    }
-
     private func prices(id: String, startDate: Date, endDate: Date, geo: GEO?, completion: @escaping (Result<[Value], Error>) -> Void) {
         let endpoint = Endpoint.prices(startDate: startDate, endDate: endDate, geo: geo)
         Network.shared.request(endpoint) { (result: Result<APIResponse, Error>) in
@@ -55,6 +39,26 @@ public extension REESwift {
         }
     }
 
+}
+
+public extension REESwift {
+
+    func consumerPrices(startDate: Date, endDate: Date, geo: GEO) -> AnyPublisher<[Value], Error> {
+        return prices(id: "1001", startDate: startDate, endDate: endDate, geo: geo)
+    }
+
+    func consumerPrices(date: Date, geo: GEO) -> AnyPublisher<[Value], Error> {
+        return prices(id: "1001", startDate: date.start, endDate: date.end, geo: geo)
+    }
+
+    func spotPrices(startDate: Date, endDate: Date) -> AnyPublisher<[Value], Error> {
+        return prices(id: "600", startDate: startDate, endDate: endDate, geo: nil)
+    }
+
+    func spotPrices(date: Date) -> AnyPublisher<[Value], Error> {
+        return prices(id: "600", startDate: date.start, endDate: date.end, geo: nil)
+    }
+
     private func prices(id: String, startDate: Date, endDate: Date, geo: GEO?) -> AnyPublisher<[Value], Error> {
         let endpoint = Endpoint.prices(startDate: startDate, endDate: endDate, geo: geo)
         return Network.shared.request(endpoint)
@@ -68,10 +72,6 @@ public extension REESwift {
 
 }
 
-@available(iOS 15.0, *)
-@available(tvOS 15.0, *)
-@available(watchOS 8.0, *)
-@available(macOS 12, *)
 public extension REESwift {
 
     func consumerPrices(startDate: Date, endDate: Date, geo: GEO) async throws -> [Value] {

diff --git a/Tests/REESwiftTests/REESwiftTests.swift b/Tests/REESwiftTests/REESwiftTests.swift
@@ -8,13 +8,9 @@ final class REESwiftTests: XCTestCase {
 
     // MARK: - Test consumer prices
 
-    @available(iOS 15.0, *)
-    @available(tvOS 15.0, *)
-    @available(watchOS 8.0, *)
-    @available(macOS 12, *)
     func testConsumerPricesAsync() async {
 
-        let now = Date.now
+        let now = Date()
 
         let todayPrices = try? await ree.consumerPrices(date: now, geo: .peninsula)
         XCTAssertNotNil(todayPrices)
@@ -31,13 +27,9 @@ final class REESwiftTests: XCTestCase {
 
     }
 
-    @available(iOS 15.0, *)
-    @available(tvOS 15.0, *)
-    @available(watchOS 8.0, *)
-    @available(macOS 12, *)
     func testConsumerPricesAsyncOtherGEOs() async {
 
-        let now = Date.now
+        let now = Date()
 
         let peninsulaPrices = try? await ree.consumerPrices(date: now, geo: .peninsula)
         let ceutaPrices = try? await ree.consumerPrices(date: now, geo: .ceuta)
@@ -132,13 +124,9 @@ final class REESwiftTests: XCTestCase {
 
     // MARK: - Test spot prices
 
-    @available(iOS 15.0, *)
-    @available(tvOS 15.0, *)
-    @available(watchOS 8.0, *)
-    @available(macOS 12, *)
     func testSpotPricesAsync() async {
 
-        let now = Date.now
+        let now = Date()
 
         let todayPrices = try? await ree.spotPrices(date: now)
         XCTAssertNotNil(todayPrices)