Merge branch 'release/0.2.33'

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.2.33] - 19 Feb 2018
+### Added
+- unit test to make sure `Model::all()` returns a collection when only only
+  record is retrieved.
+- console command to flush entire model-cache.
+
 ## [0.2.32] - 19 Feb 2018
 ### Fixed
 - hash collision logic to not run query twice if not needed.

src/Console/Commands/Flush.php

@@ -5,17 +5,18 @@
 class Flush extends Command
 {
     protected $signature = 'modelCache:flush {--model=}';
-    protected $description = 'Flush cache for a given model.';
+    protected $description = 'Flush cache for a given model. If no model is given, entire model-cache is flushed.';
 
     public function handle()
     {
         $option = $this->option('model');
 
         if (! $option) {
-            $this->error("You must specify a model to flush a model's cache:");
-            $this->line("modelCache:flush --model=App\\Model");
+            cache()
+                ->store(config('laravel-model-caching:store'))
+                ->flush();
 
-            return 1;
+            return 0;
         }
 
         $model = new $option;

tests/Unit/Console/Commands/FlushTest.php

@@ -13,11 +13,15 @@ class FlushTest extends UnitTestCase
 {
     use RefreshDatabase;
 
+    protected $cache;
+
     public function setUp()
     {
         parent::setUp();
 
-        cache()->flush();
+        $this->cache = cache()->store(config('laravel-model-caching:store'));
+
+        $this->cache->flush();
         $publishers = factory(Publisher::class, 10)->create();
         factory(Author::class, 10)->create()
             ->each(function ($author) use ($publishers) {
@@ -37,7 +41,7 @@ public function setUp()
             ->each(function ($store) use ($bookIds) {
                 $store->books()->sync(rand($bookIds->min(), $bookIds->max()));
             });
-        cache()->flush();
+        $this->cache->flush();
     }
 
     public function testGivenModelIsFlushed()
@@ -46,11 +50,11 @@ public function testGivenModelIsFlushed()
         $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor');
         $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor'];
 
-        $cachedResults = cache()
+        $cachedResults = $this->cache
             ->tags($tags)
             ->get($key)['value'];
         $result = $this->artisan('modelCache:flush', ['--model' => Author::class]);
-        $flushedResults = cache()
+        $flushedResults = $this->cache
             ->tags($tags)
             ->get($key)['value'];
 
@@ -68,14 +72,14 @@ public function testGivenModelWithRelationshipIsFlushed()
             'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook',
         ];
 
-        $cachedResults = cache()
+        $cachedResults = $this->cache
             ->tags($tags)
             ->get($key)['value'];
         $result = $this->artisan(
             'modelCache:flush',
             ['--model' => Author::class]
         );
-        $flushedResults = cache()
+        $flushedResults = $this->cache
             ->tags($tags)
             ->get($key)['value'];
 
@@ -94,10 +98,52 @@ public function testNonCachedModelsCannotBeFlushed()
         $this->assertEquals($result, 1);
     }
 
-    public function testModelOptionIsSpecified()
+    public function testAllModelsAreFlushed()
     {
-        $result = $this->artisan('modelCache:flush', []);
+        (new Author)->all();
+        (new Book)->all();
+        (new Store)->all();
 
-        $this->assertEquals($result, 1);
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor'];
+        $cachedAuthors = $this->cache
+            ->tags($tags)
+            ->get($key)['value'];
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook'];
+        $cachedBooks = $this->cache
+            ->tags($tags)
+            ->get($key)['value'];
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesstore');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesstore'];
+        $cachedStores = $this->cache
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertNotEmpty($cachedAuthors);
+        $this->assertNotEmpty($cachedBooks);
+        $this->assertNotEmpty($cachedStores);
+
+        $this->artisan('modelCache:flush', []);
+
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor'];
+        $cachedAuthors = $this->cache
+            ->tags($tags)
+            ->get($key)['value'];
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook'];
+        $cachedBooks = $this->cache
+            ->tags($tags)
+            ->get($key)['value'];
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesstore');
+        $tags = ['genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesstore'];
+        $cachedStores = $this->cache
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertEmpty($cachedAuthors);
+        $this->assertEmpty($cachedBooks);
+        $this->assertEmpty($cachedStores);
     }
 }