WIP

Author: sjbronner

phpunit.xml

@@ -6,7 +6,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="true"
+    stopOnFailure="false"
     syntaxCheck="false"
     bootstrap="vendor/autoload.php"
 >

src/CachedBuilder.php

@@ -7,6 +7,19 @@ class CachedBuilder extends EloquentBuilder
 {
     use Cachable;
 
+    protected $isCacheDisabled = false;
+
+    public function __call(string $method, array $parameters)
+    {
+        if (method_exists($this, $method)) {
+            if (isCacheDisabled) {
+                return parent::$method($parameters);
+            }
+
+            $this->$method($parameters);
+        }
+    }
+
     public function avg($column)
     {
         return $this->cache($this->makeCacheTags())

src/CachedModel.php

@@ -3,12 +3,12 @@
 use GeneaLabs\LaravelModelCaching\CachedBuilder as Builder;
 use Illuminate\Cache\CacheManager;
 use Illuminate\Cache\TaggableStore;
+use Illuminate\Cache\TaggedCache;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
-use LogicException;
-
-use Illuminate\Cache\TaggedCache;
 use Illuminate\Support\Collection;
+use LogicException;
 
 abstract class CachedModel extends Model
 {
@@ -52,6 +52,13 @@ public function cache(array $tags = [])
         return $cache;
     }
 
+    public function scopeDisableCache(EloquentBuilder $query) : EloquentBuilder
+    {
+        $query->disableCache();
+
+        return $query;
+    }
+
     public function flushCache(array $tags = [])
     {
         $this->cache($tags)->flush();

tests/Unit/CachedModelTest.php

@@ -24,7 +24,7 @@ public function setUp()
         cache()->flush();
         $publishers = factory(Publisher::class, 10)->create();
         factory(Author::class, 10)->create()
-            ->each(function($author) use ($publishers) {
+            ->each(function ($author) use ($publishers) {
                 factory(Book::class, random_int(2, 10))->make()
                     ->each(function ($book) use ($author, $publishers) {
                         $book->author()->associate($author);
@@ -59,4 +59,21 @@ public function testAllModelResultsCreatesCache()
         $this->assertEquals($authors, $cachedResults);
         $this->assertEmpty($liveResults->diffAssoc($cachedResults));
     }
+
+    public function testScopeDisablesCaching()
+    {
+        $key = 'genealabslaravelmodelcachingtestsfixturesauthor';
+        $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
+        $authors = (new Author)
+            ->where("name", "Bruno")
+            ->disableCache()
+            ->get();
+
+        $cachedResults = cache()
+            ->tags($tags)
+            ->get($key);
+
+        $this->assertNull($cachedResults);
+        $this->assertNotEquals($authors, $cachedResults);
+    }
 }