WIP

Author: mikebronner

src/CachedBuilder.php

@@ -32,17 +32,6 @@ public function count($columns = ["*"])
         return $this->cachedValue(func_get_args(), $cacheKey);
     }
 
-    public function cursor()
-    {
-        if (! $this->isCachable()) {
-            return collect(parent::cursor());
-        }
-
-        $cacheKey = $this->makeCacheKey(["*"], null, "-cursor");
-
-        return $this->cachedValue(func_get_args(), $cacheKey);
-    }
-
     public function delete()
     {
         $this->cache($this->makeCacheTags())

src/Traits/Cachable.php

@@ -34,10 +34,6 @@ protected function addTagsWhenCalledFromCachedBuilder(array $tags) : array
         $usesCachableTrait = collect(class_uses($this))
             ->contains("GeneaLabs\LaravelModelCaching\Traits\Cachable");
 
-        if (! $usesCachableTrait) {
-            array_push($tags, str_slug(get_called_class()));
-        }
-
         return $tags;
     }
 
@@ -59,10 +55,7 @@ public function flushCache(array $tags = [])
         [$cacheCooldown] = $this->getModelCacheCooldown($this);
 
         if ($cacheCooldown) {
-            $cachePrefix = "genealabs:laravel-model-caching:"
-                . (config('laravel-model-caching.cache-prefix')
-                    ? config('laravel-model-caching.cache-prefix', '') . ":"
-                    : "");
+            $cachePrefix = $this->getCachePrefix();
             $modelClassName = get_class($this);
             $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
 
@@ -157,7 +150,7 @@ protected function checkCooldownAndRemoveIfExpired(Model $instance)
 
     protected function checkCooldownAndFlushAfterPersiting(Model $instance)
     {
-        [$cacheCooldown, $invalidatedAt, $savedAt] = $instance->getModelCacheCooldown($instance);
+        [$cacheCooldown, $invalidatedAt] = $instance->getModelCacheCooldown($instance);
 
         if (! $cacheCooldown) {
             $instance->flushCache();
@@ -167,19 +160,14 @@ protected function checkCooldownAndFlushAfterPersiting(Model $instance)
 
         $this->setCacheCooldownSavedAtTimestamp($instance);
 
-        if ($savedAt > $invalidatedAt
-                && now()->diffInSeconds($invalidatedAt) >= $cacheCooldown
-        ) {
+        if (now()->diffInSeconds($invalidatedAt) >= $cacheCooldown) {
             $instance->flushCache();
         }
     }
 
     protected function setCacheCooldownSavedAtTimestamp(Model $instance)
     {
-        $cachePrefix = "genealabs:laravel-model-caching:"
-            . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
-                : "");
+        $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($instance);
         $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:saved-at";
 
@@ -235,10 +223,7 @@ public function scopeWithCacheCooldownSeconds(
         EloquentBuilder $query,
         int $seconds
     ) : EloquentBuilder {
-        $cachePrefix = "genealabs:laravel-model-caching:"
-            . (config('laravel-model-caching.cache-prefix')
-                ? config('laravel-model-caching.cache-prefix', '') . ":"
-                : "");
+        $cachePrefix = $this->getCachePrefix();
         $modelClassName = get_class($this);
         $cacheKey = "{$cachePrefix}:{$modelClassName}-cooldown:seconds";
 

tests/Integration/CachedBuilderTest.php

@@ -786,7 +786,7 @@ public function testWhereNotInResults()
         $this->assertTrue($cachedResults->diffKeys($books)->isEmpty());
         $this->assertTrue($liveResults->diffKeys($books)->isEmpty());
     }
-/** @group test */
+
     public function testHashCollision()
     {
         $key1 = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesbook-id_notin_1_2');

tests/Integration/CachedModelTest.php

@@ -97,7 +97,7 @@ public function testWhereHasIsBeingCached()
         $this->assertEquals(1, $books->first()->author->id);
         $this->assertEquals(1, $cachedResults->first()->author->id);
     }
-/** @group test */
+
     public function testModelCacheDoesntInvalidateDuringCooldownPeriod()
     {
         $authors = (new Author)

tests/Integration/DisabledCachedBuilderTest.php

@@ -308,4 +308,25 @@ public function testValueModelResultsIsNotCached()
         $this->assertEquals($author, $liveResult);
         $this->assertNull($cachedResult);
     }
+
+    public function testPaginationIsCached()
+    {
+        $authors = (new Author)
+            ->disableCache()
+            ->paginate(3);
+
+        $key = sha1('genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor-paginate_by_3_page_1');
+        $tags = [
+            'genealabs:laravel-model-caching:genealabslaravelmodelcachingtestsfixturesauthor',
+        ];
+
+        $cachedResults = $this->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $liveResults = (new UncachedAuthor)
+            ->paginate(3);
+
+        $this->assertNull($cachedResults);
+        $this->assertEquals($liveResults->toArray(), $authors->toArray());
+    }
 }