add expiry enum

* includes date closure to verify method for testing
onmyway133 · Jan 31, 2020 · 20102cd · 20102cd
1 parent f6ec076
commit 20102cd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 13 deletions.
diff --git a/Sources/Storage+Codable.swift b/Sources/Storage+Codable.swift
@@ -21,7 +21,7 @@ public extension Storage {
         })
     }
 
-    func load<T: Codable>(forKey key: String, as: T.Type, maxAge: TimeInterval = .greatestFiniteMagnitude) throws -> T {
+    func load<T: Codable>(forKey key: String, as: T.Type, withExpiry expiry: Expiry = .never) throws -> T {
         func loadFromDisk<T: Codable>(forKey key: String, as: T.Type) throws -> T {
             let data = try Data(contentsOf: fileUrl(forKey: key))
             let decoder = options.decoder
@@ -35,7 +35,7 @@ public extension Storage {
             }
         }
 
-        return try commonLoad(forKey: key, withMaxAge: maxAge, fromData: { data in
+        return try commonLoad(forKey: key, withExpiry: expiry, fromData: { data in
             return try loadFromDisk(forKey: key, as: T.self)
         })
     }

diff --git a/Sources/Storage+Data.swift b/Sources/Storage+Data.swift
@@ -13,7 +13,7 @@ public extension Storage {
         try commonSave(object: object as AnyObject, forKey: key, toData: { object })
     }
 
-    func load(forKey key: String, withMaxAge maxAge: TimeInterval = .greatestFiniteMagnitude) throws -> Data {
-        return try commonLoad(forKey: key, withMaxAge: maxAge, fromData: { $0 })
+    func load(forKey key: String, withExpiry expiry: Expiry = .never) throws -> Data {
+        return try commonLoad(forKey: key, withExpiry: expiry, fromData: { $0 })
     }
 }
diff --git a/Sources/Storage+Image.swift b/Sources/Storage+Image.swift
@@ -19,8 +19,8 @@ public extension Storage {
         })
     }
 
-    func load(forKey key: String, withMaxAge maxAge: TimeInterval = .greatestFiniteMagnitude) throws -> Image {
-        return try commonLoad(forKey: key, withMaxAge: maxAge, fromData: { data in
+    func load(forKey key: String, withExpiry expiry: Expiry = .never) throws -> Image {
+        return try commonLoad(forKey: key, withExpiry: expiry, fromData: { data in
             return try unwrapOrThrow(Utils.image(data: data), StorageError.decodeData)
         })
     }

diff --git a/Sources/Storage.swift b/Sources/Storage.swift
@@ -82,6 +82,12 @@ extension Storage {
     func fileUrl(forKey key: String) -> URL {
         return folderUrl.appendingPathComponent(key, isDirectory: false)
     }
+
+    func verify(maxAge: TimeInterval,
+                forKey key: String,
+                fromDate date: @escaping (() -> Date) = { Date() }) throws -> Bool {
+        date().timeIntervalSince(try modificationDate(forKey: key)) <= maxAge
+    }
 }
 
 extension Storage {
@@ -93,13 +99,17 @@ extension Storage {
             .trueOrThrow(StorageError.createFile)
     }
 
-    func commonLoad<T>(forKey key: String, withMaxAge maxAge: TimeInterval, fromData: (Data) throws -> T) throws -> T {
-        func verify(maxAge: TimeInterval, forKey key: String) throws -> Bool {
-            Date().timeIntervalSince(try modificationDate(forKey: key)) <= maxAge
-        }
-
-        guard try verify(maxAge: maxAge, forKey: key) else {
-            throw StorageError.expired(maxAge: maxAge)
+    func commonLoad<T>(forKey key: String,
+                       withExpiry expiry: Expiry,
+                       fromDate date: @escaping (() -> Date) = { Date() },
+                       fromData: (Data) throws -> T) throws -> T {
+        switch expiry {
+        case .never:
+            break
+        case .maxAge(let maxAge):
+            guard try verify(maxAge: maxAge, forKey: key, fromDate: date) else {
+                throw StorageError.expired(maxAge: maxAge)
+            }
         }
 
         if let object = cache.object(forKey: key as NSString) as? T {
@@ -112,3 +122,10 @@ extension Storage {
         }
     }
 }
+
+extension Storage {
+    public enum Expiry {
+        case never
+        case maxAge(maxAge: TimeInterval)
+    }
+}