Merge pull request #18 from crelies/dev

4.0.0

Author: Chris

Sources/RemoteImage/private/Models/RemoteImageState.swift

@@ -0,0 +1,22 @@
+//
+//  DefaultRemoteImageServiceDependencies.swift
+//  RemoteImage
+//
+//  Created by Christian Elies on 29.10.19.
+//
+
+import Foundation
+
+protocol DefaultRemoteImageServiceDependenciesProtocol: PhotoKitServiceProvider, RemoteImageURLDataPublisherProvider {
+    
+}
+
+struct DefaultRemoteImageServiceDependencies: DefaultRemoteImageServiceDependenciesProtocol {
+    let photoKitService: PhotoKitServiceProtocol
+    let remoteImageURLDataPublisher: RemoteImageURLDataPublisher
+    
+    init(remoteImageURLDataPublisher: RemoteImageURLDataPublisher) {
+        photoKitService = PhotoKitService()
+        self.remoteImageURLDataPublisher = remoteImageURLDataPublisher
+    }
+}

Sources/RemoteImage/private/Protocols/RemoteImageServiceProtocol.swift

@@ -12,8 +12,10 @@ protocol PhotoKitServiceProvider {
 }
 
 protocol PhotoKitServiceProtocol {
-    func getPhotoData(localIdentifier: String,
-                      _ completion: @escaping (Result<Data, Error>) -> Void)
+    func getPhotoData(
+        localIdentifier: String,
+        _ completion: @escaping (Result<Data, Error>) -> Void
+    )
 }
 
 final class PhotoKitService {
@@ -22,8 +24,10 @@ final class PhotoKitService {
 }
 
 extension PhotoKitService: PhotoKitServiceProtocol {
-    func getPhotoData(localIdentifier: String,
-                      _ completion: @escaping (Result<Data, Error>) -> Void) {
+    func getPhotoData(
+        localIdentifier: String,
+        _ completion: @escaping (Result<Data, Error>) -> Void
+    ) {
         let fetchAssetsResult = Self.asset.fetchAssets(withLocalIdentifiers: [localIdentifier], options: nil)
         guard let phAsset = fetchAssetsResult.firstObject else {
             completion(.failure(PhotoKitServiceError.phAssetNotFound(localIdentifier: localIdentifier)))

Sources/RemoteImage/private/Protocols/RemoteImageURLDataPublisher.swift

@@ -9,7 +9,7 @@ import Combine
 import Foundation
 
 extension URLSession: RemoteImageURLDataPublisher {
-    func dataPublisher(for request: URLRequest) -> AnyPublisher<(data: Data, response: URLResponse), URLError> {
-        dataTaskPublisher(for: request).eraseToAnyPublisher()
+    public func dataPublisher(for url: URL) -> AnyPublisher<(data: Data, response: URLResponse), URLError> {
+        dataTaskPublisher(for: url).eraseToAnyPublisher()
     }
 }

Sources/RemoteImage/private/Services/DefaultRemoteImageServiceDependencies.swift

@@ -0,0 +1,15 @@
+//
+//  RemoteImageState.swift
+//  RemoteImage
+//
+//  Created by Christian Elies on 11.08.19.
+//  Copyright © 2019 Christian Elies. All rights reserved.
+//
+
+import Foundation
+
+public enum RemoteImageState: Hashable {
+    case error(_ error: NSError)
+    case image(_ image: UniversalImage)
+    case loading
+}

Sources/RemoteImage/private/Services/PhotoKitService.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 public enum RemoteImageType {
+    @available(*, deprecated, message: "Will be removed in the future because the localIdentifier is device specific and therefore cannot be used to uniquely identify a PHAsset across devices.")
     case phAsset(localIdentifier: String)
     case url(_ url: URL)
 }

Sources/RemoteImage/private/Services/RemoteImageServiceDependencies.swift

@@ -0,0 +1,26 @@
+//
+//  RemoteImageService.swift
+//  RemoteImage
+//
+//  Created by Christian Elies on 15.12.19.
+//
+
+import Combine
+
+public typealias RemoteImageCacheKeyProvider = (RemoteImageType) -> AnyObject
+
+/// Represents the service associated with a `RemoteImage` view. Responsible for fetching the image and managing the state.
+public protocol RemoteImageService where Self: ObservableObject {
+    /// The cache for the images fetched by any instance of `RemoteImageService`.
+    static var cache: RemoteImageCache { get set }
+    /// Provides a key for a given `RemoteImageType` used for storing an image in the cache.
+    static var cacheKeyProvider: RemoteImageCacheKeyProvider { get set }
+
+    /// The current state of the image fetching process - `loading`, `error` or `image (success)`.
+    var state: RemoteImageState { get set }
+
+    /// Fetches the image with the given type.
+    ///
+    /// - Parameter type: Specifies the source type of the remote image. Choose between `.url` or `.phAsset`.
+    func fetchImage(ofType type: RemoteImageType)
+}