Make array repository a singleton

Author: stevebauman

src/ActiveRedisServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace DirectoryTree\ActiveRedis;
 
+use DirectoryTree\ActiveRedis\Repositories\ArrayRepository;
 use Illuminate\Support\ServiceProvider;
 
 class ActiveRedisServiceProvider extends ServiceProvider
@@ -12,6 +13,8 @@ class ActiveRedisServiceProvider extends ServiceProvider
     public function register(): void
     {
         Model::clearBootedModels();
+
+        $this->app->singleton(ArrayRepository::class);
     }
 
     /**

src/Model.php

@@ -432,8 +432,8 @@ public static function setRepository(string $repository): void
     protected function newRepository(): Repository
     {
         return match ($repository = static::$repository) {
-            'array' => new ArrayRepository,
-            'redis' => new RedisRepository($this->getConnection()),
+            'array' => app(ArrayRepository::class),
+            'redis' => app(RedisRepository::class, ['redis' => $this->getConnection()]),
             default => throw new InvalidArgumentException("Repository [{$repository}] is not supported."),
         };
     }

src/Query.php

@@ -23,7 +23,7 @@ class Query
      */
     public function __construct(
         protected Model $model,
-        protected Repository $cache,
+        protected Repository $repository,
     ) {}
 
     /**
@@ -39,7 +39,7 @@ public function find(?string $id, int $chunk = 1000): ?Model
             return $this->whereKey($id)->first($chunk);
         }
 
-        if (! $this->cache->exists($hash = $this->model->getBaseHashWithKey($id))) {
+        if (! $this->repository->exists($hash = $this->model->getBaseHashWithKey($id))) {
             return null;
         }
 
@@ -232,7 +232,7 @@ public function each(Closure $callback, int $chunk = 1000): void
      */
     public function chunk(int $count, Closure $callback): void
     {
-        foreach ($this->cache->chunk($this->getQuery(), $count) as $chunk) {
+        foreach ($this->repository->chunk($this->getQuery(), $count) as $chunk) {
             $models = $this->model->newCollection();
 
             foreach ($chunk as $hash) {
@@ -251,7 +251,7 @@ public function chunk(int $count, Closure $callback): void
     protected function newModelFromHash(string $hash): Model
     {
         return $this->model->newFromBuilder([
-            ...$this->cache->getAttributes($hash),
+            ...$this->repository->getAttributes($hash),
             $this->model->getKeyName() => $this->getKeyValue($hash),
         ]);
     }
@@ -286,18 +286,34 @@ public function getQuery(): string
         return sprintf('%s:%s', $this->model->getHashPrefix(), rtrim($pattern, ':'));
     }
 
+    /**
+     * Get the model instance.
+     */
+    public function getModel(): Model
+    {
+        return $this->model;
+    }
+
+    /**
+     * Get the repository instance.
+     */
+    public function getRepository(): Repository
+    {
+        return $this->repository;
+    }
+
     /**
      * Insert or update a record in the cache.
      */
     public function insertOrUpdate(string $hash, array $attributes = []): void
     {
-        $this->cache->transaction(function () use ($hash, $attributes) {
+        $this->repository->transaction(function () use ($hash, $attributes) {
             if (! empty($delete = array_keys($attributes, null, true))) {
-                $this->cache->deleteAttributes($hash, $delete);
+                $this->repository->deleteAttributes($hash, $delete);
             }
 
             if (! empty($update = array_diff_key($attributes, array_flip($delete)))) {
-                $this->cache->setAttributes($hash, $update);
+                $this->repository->setAttributes($hash, $update);
             }
         });
     }
@@ -307,22 +323,22 @@ public function insertOrUpdate(string $hash, array $attributes = []): void
      */
     public function expire(string $hash, int $seconds): void
     {
-        $this->cache->setExpiry($hash, $seconds);
+        $this->repository->setExpiry($hash, $seconds);
     }
 
     /**
      * Get a model's time-to-live (in seconds).
      */
     public function expiry(string $hash): ?int
     {
-        return $this->cache->getExpiry($hash);
+        return $this->repository->getExpiry($hash);
     }
 
     /**
      * Delete a model from the cache.
      */
     public function destroy(string $hash): void
     {
-        $this->cache->delete($hash);
+        $this->repository->delete($hash);
     }
 }

tests/ModelArrayQueryTest.php

@@ -0,0 +1,22 @@
+<?php
+
+use DirectoryTree\ActiveRedis\Repositories\ArrayRepository;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStub;
+
+beforeAll(fn () => ModelStub::setRepository('array'));
+afterAll(fn () => ModelStub::setRepository('redis'));
+
+it('can use array repository', function () {
+    ModelStub::create();
+    ModelStub::create();
+
+    $repository = ModelStub::query()->getRepository();
+
+    expect($repository)->toBeInstanceOf(ArrayRepository::class);
+
+    $results = iterator_to_array(
+        $repository->chunk('*', 100)
+    );
+
+    expect($results[0])->toHaveCount(2);
+});

tests/ModelCastTest.php

@@ -2,8 +2,8 @@
 
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelEnumStub;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStubWithCasts;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelEnumStub;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStubWithCasts;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Facades\Redis;

tests/ModelEventTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStubWithEventListeners;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStubWithEventListeners;
 use Illuminate\Support\Facades\Redis;
 
 beforeEach(function () {

tests/ModelHiddenAttributesTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStubWithHiddenAttributes;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStubWithVisibleAttributes;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStubWithHiddenAttributes;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStubWithVisibleAttributes;
 
 it('does not include hidden attributes when transformed into array', function () {
     $model = new ModelStubWithHiddenAttributes([

tests/ModelObserverTest.php

@@ -1,7 +1,7 @@
 <?php
 
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelObserverStub;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStub;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelObserverStub;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStub;
 use Illuminate\Support\Facades\Redis;
 
 beforeEach(function () {

tests/ModelQueryTest.php

@@ -2,9 +2,9 @@
 
 use DirectoryTree\ActiveRedis\Exceptions\ModelNotFoundException;
 use DirectoryTree\ActiveRedis\Query;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStub;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStubWithCustomKey;
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStubWithCustomPrefix;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStub;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStubWithCustomKey;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStubWithCustomPrefix;
 use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Facades\Redis;
 
@@ -64,11 +64,11 @@
 
 it('throws exception when finding by non-existent key', function () {
     ModelStub::findOrFail('invalid');
-})->throws(ModelNotFoundException::class, 'No query results for model [DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStub] invalid');
+})->throws(ModelNotFoundException::class, 'No query results for model [DirectoryTree\ActiveRedis\Tests\Stubs\ModelStub] invalid');
 
 it('throws exception when retrieving first of an empty query', function () {
     ModelStub::firstOrFail();
-})->throws(ModelNotFoundException::class, 'No query results for model [DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStub].');
+})->throws(ModelNotFoundException::class, 'No query results for model [DirectoryTree\ActiveRedis\Tests\Stubs\ModelStub].');
 
 it('can create query', function () {
     expect(ModelStub::query())->toBeInstanceOf(Query::class);

tests/ModelRoutableTest.php

@@ -1,6 +1,6 @@
 <?php
 
-use DirectoryTree\ActiveRedis\Tests\Fixtures\ModelStub;
+use DirectoryTree\ActiveRedis\Tests\Stubs\ModelStub;
 
 it('is routable', function () {
     $model = ModelStub::create();