Merge pull request #307 from joeljfischer/bugfix/issue-306-existsObject-changes

Add objectExists to replace existsObject

Author: 3lvis

Source/Shared/Storage/AsyncStorage.swift

@@ -106,6 +106,7 @@ extension AsyncStorage {
     })
   }
 
+  @available(*, deprecated, renamed: "objectExists(forKey:completion:)")
   public func existsObject(
     forKey key: Key,
     completion: @escaping (Result<Bool, Error>) -> Void) {
@@ -115,6 +116,16 @@ extension AsyncStorage {
       }))
     })
   }
+
+  public func objectExists(
+    forKey key: Key,
+    completion: @escaping (Result<Bool, Error>) -> Void) {
+      object(forKey: key, completion: { (result: Result<Value, Error>) in
+        completion(result.map({ _ in
+          return true
+        }))
+      })
+    }
 }
 
 public extension AsyncStorage {

Source/Shared/Storage/StorageAware.swift

@@ -47,8 +47,15 @@ public protocol StorageAware {
    Check if an object exist by the given key.
    - Parameter key: Unique key to identify the object.
    */
+  @available(*, deprecated, renamed: "objectExists(forKey:)")
   func existsObject(forKey key: Key) throws -> Bool
 
+  /**
+   Check if an object exist by the given key.
+   - Parameter key: Unique key to identify the object.
+   */
+  func objectExists(forKey key: Key) -> Bool
+
   /**
    Removes all objects from the cache storage.
    */
@@ -80,6 +87,15 @@ public extension StorageAware {
     }
   }
 
+  func objectExists(forKey key: Key) -> Bool {
+    do {
+      let _: Value = try object(forKey: key)
+      return true
+    } catch {
+      return false
+    }
+  }
+
   func isExpiredObject(forKey key: Key) throws -> Bool {
     do {
       let entry = try self.entry(forKey: key)

Tests/iOS/Tests/Storage/AsyncStorageTests.swift

@@ -50,7 +50,7 @@ final class AsyncStorageTests: XCTestCase {
     }
 
     then("all are removed") {
-      intStorage.existsObject(forKey: "key-99", completion: { result in
+      intStorage.objectExists(forKey: "key-99", completion: { result in
         switch result {
         case .success:
           XCTFail()

Tests/iOS/Tests/Storage/SyncStorageTests.swift

@@ -40,8 +40,8 @@ final class SyncStorageTests: XCTestCase {
       try intStorage.removeAll()
     }
 
-    try then("all are removed") {
-      XCTAssertFalse(try intStorage.existsObject(forKey: "key-99"))
+    then("all are removed") {
+      XCTAssertFalse(intStorage.objectExists(forKey: "key-99"))
     }
   }
 }