Merge branch 'master' into develop

Author: mikebronner

README.md

@@ -130,7 +130,7 @@ cache for that single query. Disabling cache via the config flag still works.
 
 **Recommendation: use option #1 in all your seeder queries to avoid pulling in
 cached information when reseeding multiple times.**
-You can disable a given query by using `disableCache()` in the query chain. It must be placed immediately behind the model, and not in the query chain. For example:
+You can disable a given query by using `disableCache()` anywhere in the query chain. For example:
 ```php
 $results = $myModel->disableCache()->where('field', $value)->get();
 ```

src/Traits/Caching.php

@@ -25,7 +25,7 @@ public function cache(array $tags = [])
         return $cache;
     }
 
-    public function disableCache()
+    public function disableModelCaching()
     {
         $this->isCachable = false;
 

src/Traits/ModelCaching.php

@@ -52,6 +52,13 @@ public function newEloquentBuilder($query)
         return new CachedBuilder($query);
     }
 
+    public function scopeDisableCache(EloquentBuilder $query) : EloquentBuilder
+    {
+        $query = $query->disableModelCaching();
+
+        return $query;
+    }
+
     public function scopeWithCacheCooldownSeconds(
         EloquentBuilder $query,
         int $seconds

tests/Integration/DisabledCachedModelTest.php

@@ -17,21 +17,43 @@ class DisabledCachedModelTest extends IntegrationTestCase
 {
     use RefreshDatabase;
 
-    public function testAllModelResultsIsNotCached()
+    public function testCacheCanBeDisabledOnModel()
     {
         $key = sha1('genealabslaravelmodelcachingtestsfixturesauthor');
         $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
         $authors = (new Author)
             ->disableCache()
-            ->all();
+            ->get();
 
         $cachedResults = $this->cache()
             ->tags($tags)
             ->get($key);
         $liveResults = (new UncachedAuthor)
-            ->all();
+            ->get();
 
         $this->assertEmpty($liveResults->diffAssoc($authors));
         $this->assertNull($cachedResults);
     }
+
+    public function testCacheCanBeDisabledOnQuery()
+    {
+        $key = sha1('genealabslaravelmodelcachingtestsfixturesauthor');
+        $tags = ['genealabslaravelmodelcachingtestsfixturesauthor'];
+        $authors = (new Author)
+            ->with('books')
+            ->disableCache()
+            ->get()
+            ->keyBy("id");
+
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key);
+        $liveResults = (new UncachedAuthor)
+            ->with('books')
+            ->get()
+            ->keyBy("id");
+
+        $this->assertNull($cachedResults);
+        $this->assertEmpty($liveResults->diffKeys($authors));
+    }
 }