Merge pull request #1 from WyriHaximus/fix-check-if-has-key

get needs a check if the key exists

Author: WyriHaximus

composer.json

@@ -16,7 +16,8 @@
         "phpunit/phpunit": "^5.2.3",
         "squizlabs/php_codesniffer": "^2.6",
         "vectorface/dunit": "~2.0",
-        "phake/phake": "^2.3"
+        "phake/phake": "^2.3",
+        "clue/block-react": "^1.1"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -5,6 +5,7 @@
 use Clue\React\Redis\Client;
 use React\Cache\CacheInterface;
 use React\Promise\PromiseInterface;
+use function React\Promise\reject;
 
 class Redis implements CacheInterface
 {
@@ -35,7 +36,12 @@ public function __construct(Client $client, $prefix = 'reach:cache:')
      */
     public function get($key)
     {
-        return $this->client->get($this->prefix . $key);
+        return $this->client->exists($this->prefix . $key)->then(function ($result) use ($key) {
+            if ($result == false) {
+                return reject();
+            }
+            return $this->client->get($this->prefix . $key);
+        });
     }
 
     /**

src/Redis.php

@@ -4,8 +4,12 @@
 
 use Phake;
 use Clue\React\Redis\Client;
+use React\EventLoop\Factory;
+use React\Promise\FulfilledPromise;
 use React\Promise\PromiseInterface;
+use React\Promise\RejectedPromise;
 use WyriHaximus\React\Cache\Redis;
+use function Clue\React\Block\await;
 
 class RedisTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,12 +28,30 @@ public function testGet()
     {
         $prefix = 'root:';
         $key = 'key';
-        $promise = Phake::mock(PromiseInterface::class);
-        Phake::when($this->client)->get($prefix . $key)->thenReturn($promise);
-        $result = (new Redis($this->client, $prefix))->get($key);
-        $this->assertInstanceOf(PromiseInterface::class, $result);
-        $this->assertSame($promise, $result);
-        Phake::verify($this->client)->get($prefix . $key);
+        $value = 'value';
+        Phake::when($this->client)->exists($prefix . $key)->thenReturn(new FulfilledPromise(1));
+        Phake::when($this->client)->get($prefix . $key)->thenReturn(new FulfilledPromise($value));
+        $promise = (new Redis($this->client, $prefix))->get($key);
+        $this->assertInstanceOf(PromiseInterface::class, $promise);
+        $result = await($promise, Factory::create());
+        $this->assertSame($value, $result);
+        Phake::inOrder(
+            Phake::verify($this->client)->exists($prefix . $key),
+            Phake::verify($this->client)->get($prefix . $key)
+        );
+    }
+
+    public function testGetNonExistant()
+    {
+        $prefix = 'root:';
+        $key = 'key';
+        Phake::when($this->client)->exists($prefix . $key)->thenReturn(new FulfilledPromise(0));
+        Phake::when($this->client)->get($prefix . $key)->thenReturn(new RejectedPromise());
+        $promise = (new Redis($this->client, $prefix))->get($key);
+        $this->assertInstanceOf(PromiseInterface::class, $promise);
+        $this->assertInstanceOf(RejectedPromise::class, $promise);
+        Phake::verify($this->client)->exists($prefix . $key);
+        Phake::verify($this->client, Phake::never())->get($prefix . $key);
     }
 
     public function testSet()