feat(): implemented support for a custom RemoteImageURLDataPublisher

Author: Christian Elies

Sources/RemoteImage/private/Protocols/RemoteImageURLDataPublisher.swift

@@ -15,8 +15,8 @@ struct RemoteImageServiceDependencies: RemoteImageServiceDependenciesProtocol {
     let photoKitService: PhotoKitServiceProtocol
     let remoteImageURLDataPublisher: RemoteImageURLDataPublisher
 
-    init() {
+    init(remoteImageURLDataPublisher: RemoteImageURLDataPublisher) {
         photoKitService = PhotoKitService()
-        remoteImageURLDataPublisher = URLSession.shared
+        self.remoteImageURLDataPublisher = remoteImageURLDataPublisher
     }
 }

Sources/RemoteImage/private/Services/RemoteImageServiceDependencies.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/Extensions/URLSession+RemoteImageURLDataPublisher.swift renamed to Sources/RemoteImage/public/Extensions/URLSession+RemoteImageURLDataPublisher.swift

@@ -0,0 +1,13 @@
+//
+//  RemoteImageURLDataPublisher.swift
+//  RemoteImage
+//
+//  Created by Christian Elies on 15.12.19.
+//
+
+import Combine
+import Foundation
+
+public protocol RemoteImageURLDataPublisher {
+    func dataPublisher(for url: URL) -> AnyPublisher<(data: Data, response: URLResponse), URLError>
+}

Sources/RemoteImage/public/Protocols/RemoteImageURLDataPublisher.swift

@@ -49,9 +49,7 @@ private extension RemoteImageService {
             return
         }
 
-        let urlRequest = URLRequest(url: url)
-
-        cancellable = dependencies.remoteImageURLDataPublisher.dataPublisher(for: urlRequest)
+        cancellable = dependencies.remoteImageURLDataPublisher.dataPublisher(for: url)
             .map { UniversalImage(data: $0.data) }
             .receive(on: RunLoop.main)
             .sink(receiveCompletion: { [weak self] completion in

Sources/RemoteImage/public/Services/RemoteImageService.swift

@@ -6,8 +6,8 @@
 //
 
 public final class RemoteImageServiceFactory {
-    public static func makeRemoteImageService() -> RemoteImageService {
-        let dependencies = RemoteImageServiceDependencies()
+    public static func makeRemoteImageService(remoteImageURLDataPublisher: RemoteImageURLDataPublisher) -> RemoteImageService {
+        let dependencies = RemoteImageServiceDependencies(remoteImageURLDataPublisher: remoteImageURLDataPublisher)
         return RemoteImageService(dependencies: dependencies)
     }
 }

Sources/RemoteImage/public/Services/RemoteImageServiceFactory.swift

@@ -16,7 +16,7 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:
     private let imageView: (Image) -> ImageView
     private let loadingView: () -> LoadingView
 
-    @ObservedObject private var service = RemoteImageServiceFactory.makeRemoteImageService()
+    @ObservedObject private var service: RemoteImageService
 
     public var body: some View {
         switch service.state {
@@ -33,12 +33,15 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:
         }
     }
 
-    public init(type: RemoteImageType, @ViewBuilder errorView: @escaping (Error) -> ErrorView, @ViewBuilder imageView: @escaping (Image) -> ImageView, @ViewBuilder loadingView: @escaping () -> LoadingView) {
+    public init(type: RemoteImageType, remoteImageURLDataPublisher: RemoteImageURLDataPublisher = URLSession.shared, @ViewBuilder errorView: @escaping (Error) -> ErrorView, @ViewBuilder imageView: @escaping (Image) -> ImageView, @ViewBuilder loadingView: @escaping () -> LoadingView) {
         self.type = type
         self.errorView = errorView
         self.imageView = imageView
         self.loadingView = loadingView
 
+        let service = RemoteImageServiceFactory.makeRemoteImageService(remoteImageURLDataPublisher: remoteImageURLDataPublisher)
+        _service = ObservedObject(wrappedValue: service)
+
         service.fetchImage(ofType: type)
     }
 }