Add persistent object storage (#5)

* Add persistent object storage * Add remove persistent value function * Do persistent object storage a better way * Fix tests * Remove code that is no longer needed * PR Update Sources/GKStorageKit/Storage/ObjectStorageService.swift * PR Update Sources/GKStorageKit/Storage/ObjectStorageService.swift Co-authored-by: Gligor Kotushevski <[email protected]>
gligorkot · Nov 23, 2022 · a2ead58 · a2ead58
1 parent a0b5e5b
commit a2ead58
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/Sources/GKStorageKit/Default Impl/DefaultStorage.swift b/Sources/GKStorageKit/Default Impl/DefaultStorage.swift
@@ -16,6 +16,10 @@ public final class DefaultStorage: StorageProtocol {
     public var storageIdentifier: String {
         return "defaultStorage"
     }
+
+    public var persistentStorageIdentifier: String {
+        return "persistentStorage"
+    }
 
     public var secureStorage: SecureStorage {
         guard let valetIdentifier = Identifier(nonEmpty: storageIdentifier) else {
@@ -27,6 +31,10 @@ public final class DefaultStorage: StorageProtocol {
     public var userDefaults: UserDefaults {
         return UserDefaults(suiteName: storageIdentifier)!
     }
+
+    public var persistentUserDefaults: UserDefaults {
+        return UserDefaults(suiteName: persistentStorageIdentifier)!
+    }
 
     public var fileStorageUrl: URL {
         // documents storage is the default fileStorageUrl

diff --git a/Sources/GKStorageKit/Protocol/StorageProtocol.swift b/Sources/GKStorageKit/Protocol/StorageProtocol.swift
@@ -10,7 +10,9 @@ import Foundation
 
 public protocol StorageProtocol {
     var storageIdentifier: String { get }
+    var persistentStorageIdentifier: String { get }
     var secureStorage: SecureStorage { get }
     var userDefaults: UserDefaults { get }
+    var persistentUserDefaults: UserDefaults { get }
     var fileStorageUrl: URL { get }
 }
diff --git a/Sources/GKStorageKit/StorageKit.swift b/Sources/GKStorageKit/StorageKit.swift
@@ -49,6 +49,10 @@ public final class StorageKit {
     public class var objectStorage: ObjectStorageInterface {
         return ObjectStorageService(storage: StorageKitConfiguration.shared.storage.userDefaults)
     }
+
+    public class var persistentObjectStorage: ObjectStorageInterface {
+        return ObjectStorageService(storage: StorageKitConfiguration.shared.storage.persistentUserDefaults)
+    }
 
     public class var fileStorage: FileStorageInterface {
         return FileStorageService(documentsUrl: StorageKitConfiguration.shared.storage.fileStorageUrl)

diff --git a/Tests/GKStorageKitTests/Test Helpers/TestStorage.swift b/Tests/GKStorageKitTests/Test Helpers/TestStorage.swift
@@ -15,6 +15,10 @@ final class TestStorage: StorageProtocol {
     var storageIdentifier: String {
         return "testStorage"
     }
+
+    var persistentStorageIdentifier: String {
+        return "testPersistentStorage"
+    }
 
     var secureStorage: SecureStorage {
         return Valet.iCloudValet(with: Identifier(nonEmpty: storageIdentifier)!, accessibility: .whenUnlocked)
@@ -23,6 +27,10 @@ final class TestStorage: StorageProtocol {
     var userDefaults: UserDefaults {
         return UserDefaults(suiteName: storageIdentifier)!
     }
+
+    var persistentUserDefaults: UserDefaults {
+        return UserDefaults(suiteName: persistentStorageIdentifier)!
+    }
 
     var fileStorageUrl: URL {
         return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
@@ -34,6 +42,10 @@ final class ErrorStorage: StorageProtocol {
     var storageIdentifier: String {
         return "errorTestStorage"
     }
+
+    var persistentStorageIdentifier: String {
+        return "errorTestPersistentStorage"
+    }
 
     var secureStorage: SecureStorage {
         return ErrorValet()
@@ -42,6 +54,10 @@ final class ErrorStorage: StorageProtocol {
     var userDefaults: UserDefaults {
         return UserDefaults(suiteName: storageIdentifier)!
     }
+
+    var persistentUserDefaults: UserDefaults {
+        return UserDefaults(suiteName: persistentStorageIdentifier)!
+    }
 
     var fileStorageUrl: URL {
         return URL(string: "errorUrl")!