Added softdeletes parsing

Author: mikebronner

src/CacheKey.php

@@ -9,17 +9,20 @@ class CacheKey
 {
     use CachePrefixing;
 
+    protected $currentBinding = 0;
     protected $eagerLoad;
+    protected $macroKey;
     protected $model;
     protected $query;
-    protected $currentBinding = 0;
 
     public function __construct(
         array $eagerLoad,
         $model,
-        $query
+        $query,
+        $macroKey
     ) {
         $this->eagerLoad = $eagerLoad;
+        $this->macroKey = $macroKey;
         $this->model = $model;
         $this->query = $query;
     }
@@ -40,6 +43,7 @@ public function make(
         $key .= $this->getOffsetClause();
         $key .= $this->getLimitClause();
         $key .= $keyDifferentiator;
+        $key .= $this->macroKey;
 
         return $key;
     }

src/Traits/Caching.php

@@ -14,6 +14,22 @@ trait Caching
 {
     protected $isCachable = true;
     protected $scopesAreApplied = false;
+    protected $macroKey = "";
+
+    public function __call($method, $parameters)
+    {
+        $result = parent::__call($method, $parameters);
+
+        if (isset($this->localMacros[$method])) {
+            $this->macroKey .= "-{$method}";
+
+            if ($parameters) {
+                $this->macroKey .= implode("_", $parameters);
+            }
+        }
+
+        return $result;
+    }
 
     protected function applyScopesToInstance()
     {
@@ -28,8 +44,6 @@ protected function applyScopesToInstance()
                 continue;
             }
 
-            $this->scopesAreApplied = true;
-
             $this->callScope(function () use ($scope) {
                 if ($scope instanceof Closure) {
                     $scope($this);
@@ -42,6 +56,8 @@ protected function applyScopesToInstance()
                 }
             });
         }
+
+        $this->scopesAreApplied = true;
     }
 
     public function cache(array $tags = [])
@@ -132,7 +148,7 @@ protected function makeCacheKey(
             $query = $this->query->getQuery();
         }
 
-        return (new CacheKey($eagerLoad, $model, $query))
+        return (new CacheKey($eagerLoad, $model, $query, $this->macroKey))
             ->make($columns, $idColumn, $keyDifferentiator);
     }
 

tests/Integration/CachedBuilder/SoftDeletesTest.php

@@ -8,13 +8,13 @@ class SoftDeletesTest extends IntegrationTestCase
 {
     public function testWithTrashedIsCached()
     {
-        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.id_=_1-first");
-        $tags = [
-            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
-        ];
         $author = (new UncachedAuthor)
             ->first();
         $author->delete();
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-find_1-withTrashed");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
+        ];
 
         $deletedAuthor = (new Author)
             ->withTrashed()
@@ -31,26 +31,56 @@ public function testWithTrashedIsCached()
         $this->assertEquals($cachedResults->toArray(), $deletedUncachedAuthor->toArray());
     }
 
-    // public function testWithoutTrashedIsCached()
-    // {
-    //     $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor_1-first");
-    //     $tags = [
-    //         "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
-    //     ];
-    //     $author = (new UncachedAuthor)
-    //         ->first();
-    //     $author->delete();
-
-    //     $deletedAuthor = (new Author)
-    //         ->first($author->id);
-    //     $cachedResults = $this
-    //         ->cache()
-    //         ->tags($tags)
-    //         ->get($key)['value'];
-    //     $deletedUncachedAuthor = (new UncachedAuthor)
-    //         ->first($author->id);
-
-    //     $this->assertEquals($cachedResults->toArray(), $deletedAuthor->toArray());
-    //     $this->assertEquals($cachedResults->toArray(), $deletedUncachedAuthor->toArray());
-    // }
+    public function testWithoutTrashedIsCached()
+    {
+        $author = (new UncachedAuthor)
+            ->first();
+        $author->delete();
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.deleted_at_null-find_{$author->id}-withoutTrashed");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
+        ];
+
+        $result = (new Author)
+            ->withoutTrashed()
+            ->find($author->id);
+        $cachedResult = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $uncachedResult = (new UncachedAuthor)
+            ->withoutTrashed()
+            ->find($author->id);
+
+        $this->assertEquals($uncachedResult, $result);
+        $this->assertEquals($uncachedResult, $cachedResult);
+        $this->assertNull($result);
+        $this->assertNull($cachedResult);
+        $this->assertNull($uncachedResult);
+    }
+
+    public function testonlyTrashedIsCached()
+    {
+        $author = (new UncachedAuthor)
+            ->first();
+        $author->delete();
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.deleted_at_notnull-find_{$author->id}-onlyTrashed");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
+        ];
+
+        $deletedAuthor = (new Author)
+            ->onlyTrashed()
+            ->find($author->id);
+        $cachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $deletedUncachedAuthor = (new UncachedAuthor)
+            ->onlyTrashed()
+            ->find($author->id);
+
+        $this->assertEquals($cachedResults->toArray(), $deletedAuthor->toArray());
+        $this->assertEquals($cachedResults->toArray(), $deletedUncachedAuthor->toArray());
+    }
 }