wip

vormkracht10 · Apr 28, 2024 · c4c891d · c4c891d
1 parent 434cb09
commit c4c891d
Show file tree

Hide file tree

Showing 7 changed files with 117 additions and 43 deletions.
diff --git a/src/CachesValue.php b/src/CachesValue.php
@@ -5,7 +5,6 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Console\Scheduling\CallbackEvent;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\PendingDispatch;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Cache;
@@ -45,27 +44,18 @@ trait CachesValue
      */
     protected $expression = null;
 
-    /**
-     * The parameters this cache should be stored with.
-     *
-     * @var array<string, mixed>
-     */
+    /** @var array<string, mixed> */
     protected $parameters = [];
 
-    /**
-     * Indicates whether this cache is currently updating or not.
-     *
-     * @var bool
-     */
-    private $isUpdating = false;
+    private bool $isUpdating = false;
 
     /**
      * Update the cached value, this method expects an event if
      * the cacher is not static.
      *
-     * @internal You shouldn't call this yourself, use the `CachesValue::update` method instead.
+     * @internal You shouldn't call this yourself.
      */
-    final public function handle($event = null): void
+    final public function handle($event = null): mixed
     {
         $this->isUpdating = true;
 
@@ -78,14 +68,16 @@ final public function handle($event = null): void
             : $this->run($event);
 
         if (is_null($value)) {
-            return;
+            return null;
         }
 
         Cache::driver($driver)->forever($cacheKey, $value);
 
         PermanentCacheUpdated::dispatch($this);
 
         $this->isUpdating = false;
+
+        return $value;
     }
 
     public function getParameters()
@@ -115,23 +107,29 @@ private static function store($parameters): array
 
     public function shouldBeUpdating(): bool
     {
-        return app()->runningInConsole();
+        return (
+            !app()->environment('testing') &&
+            app()->runningInConsole()
+        );
     }
 
     /**
      * Manually force a static cache to update.
      */
-    final public static function update($parameters = []): ?PendingDispatch
+    final public static function update($parameters = []): mixed
     {
         $instance = app()->make(static::class, $parameters);
 
-        if (! is_subclass_of(static::class, ShouldQueue::class)) {
-            $instance->handle();
+        if (
+            app()->runningInConsole() &&
+            is_subclass_of(static::class, ShouldQueue::class)
+        ) {
+            dispatch($instance);
 
             return null;
         }
 
-        return dispatch($instance);
+        return $instance->handle();
     }
 
     /**
@@ -152,27 +150,16 @@ final public static function get($default = null, bool $update = false): mixed
 
         $cache = Cache::driver($driver);
 
-        if ($update && ! $cache->has($cacheKey)) {
-            static::update($parameters ?? [])->onConnection('sync');
+        if (
+            $update ||
+            ! $cache->has($cacheKey)
+        ) {
+            return static::update($parameters ?? []);
         }
 
         return $cache->get($cacheKey, $default);
     }
 
-    /**
-     * Force an update of the cache and return the updated value.
-     *
-     * @return V|mixed
-     */
-    final public static function updateAndGet($parameters = []): mixed
-    {
-        [$driver, $cacheKey] = self::store($parameters);
-
-        static::update($parameters)->onConnection('sync');
-
-        return Cache::driver($driver)->get($cacheKey);
-    }
-
     /**
      * Get the cached value this cacher provides.
      *
@@ -253,7 +240,7 @@ private static function parseCacheString($class, ?string $store, ?array $paramet
         }
 
         $cacheDriver ??= config('cache.default');
-        $cacheKey ??= preg_replace('/[^A-Za-z0-9]+/', '_', strtolower(\Str::snake($class)));
+        $cacheKey ??= preg_replace('/[^A-Za-z0-9]+/', '_', strtolower(snake_case($class)));
 
         if ($parameters) {
             $cacheKey .= ':'.http_build_query($parameters);

diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php
diff --git a/tests/Unit/CachedComponent/CachedComponent.php b/tests/Unit/CachedComponent/CachedComponent.php
@@ -0,0 +1,19 @@
+<?php
+
+use Vormkracht10\PermanentCache\Scheduled;
+
+class CachedComponent extends \Vormkracht10\PermanentCache\CachedComponent
+{
+    protected $store = 'file:unique-cache-key';
+
+    public function render(): string
+    {
+        sleep(3);
+
+        return <<<HTML
+            <div class="alert alert-danger">
+                This is a cached component!
+            </div>
+        HTML;
+    }
+}
diff --git a/tests/Unit/CachedComponent/CachedComponentTest.php b/tests/Unit/CachedComponent/CachedComponentTest.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Support\Facades\Blade;
+
+require_once 'tests/Unit/CachedComponent/CachedComponent.php';
+require_once 'tests/Unit/CachedComponent/ScheduledCachedComponent.php';
+
+beforeEach(function () {
+    Cache::driver('file')->clear();
+    (fn () => $this->cachers = new \SplObjectStorage)->call(app(\Vormkracht10\PermanentCache\PermanentCache::class));
+});
+
+test('test cached component is cached second time', function () {
+    $time = microtime(true);
+
+    Blade::renderComponent(new CachedComponent);
+
+    $this->assertGreaterThanOrEqual(3, microtime(true) - $time);
+
+    $time = microtime(true);
+
+    Blade::renderComponent(new CachedComponent);
+
+    $this->assertLessThan(3, microtime(true) - $time);
+});
diff --git a/tests/Unit/CachedComponent/ScheduledCachedComponent.php b/tests/Unit/CachedComponent/ScheduledCachedComponent.php
@@ -0,0 +1,24 @@
+<?php
+
+use Vormkracht10\PermanentCache\Scheduled;
+
+class ScheduledCachedComponent extends \Vormkracht10\PermanentCache\CachedComponent implements Scheduled
+{
+    protected $store = 'file:unique-cache-key';
+
+    public function render(): string
+    {
+        sleep(10);
+
+        return <<<HTML
+            <div class="alert alert-danger">
+                This is a cached component!
+            </div>
+        HTML;
+    }
+
+    public static function schedule($callback)
+    {
+        return $callback->everyMinute();
+    }
+}
diff --git a/tests/Unit/CachedComponent/ScheduledCachedComponentTest.php b/tests/Unit/CachedComponent/ScheduledCachedComponentTest.php
@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Support\Facades\Blade;
+use Vormkracht10\PermanentCache\Facades\PermanentCache;
+
+require_once 'tests/Unit/CachedComponent/CachedComponent.php';
+require_once 'tests/Unit/CachedComponent/ScheduledCachedComponent.php';
+
+beforeEach(function () {
+    Cache::driver('file')->clear();
+    (fn () => $this->cachers = new \SplObjectStorage)->call(app(\Vormkracht10\PermanentCache\PermanentCache::class));
+});
+
+test('test scheduled cached component gets scheduled', function () {
+    PermanentCache::caches([
+        ScheduledCachedComponent::class
+    ]);
+
+    $events = collect(app(\Illuminate\Console\Scheduling\Schedule::class)->events())
+        ->filter(fn ($schedule) => $schedule->description === 'ScheduledCachedComponent');
+
+    expect($events)->toHaveCount(1);
+    expect($events->first()->expression)->toBe('* * * * *');
+});
diff --git a/tests/Unit/ReactiveCacheTest.php b/tests/Unit/ReactiveCacheTest.php
@@ -8,7 +8,7 @@
 use Vormkracht10\PermanentCache\Facades\PermanentCache;
 
 beforeEach(function () {
-    Cache::driver('array')->clear();
+    Cache::driver('file')->clear();
     (fn () => $this->cachers = new \SplObjectStorage)->call(app(\Vormkracht10\PermanentCache\PermanentCache::class));
 });