Merge pull request #4 from krakphp/support-redis-db-from-path

Support Redis DB From Path

Author: ragboyjr

README.md

@@ -69,6 +69,10 @@ Here are the available options that can be provided to the transport options arr
   - *required:* yes
   - *default:* N/A
   - *description:* The internal list name to use for storing the messages in redis. The system will also create a processing queue named `{queue}_processing` for storing the processed messages.
+- **db:**
+  - *required:* no
+  - *default:* N/A
+  - *description:* The redis database to select when performing redis operations. This value can also be set from the dsn via a query parameter or by setting the path in the dsn (`redis//redis:6379?db=1` or `redis://redis:6379/1`).
 
 ### Processed Queue
 

src/Transport/RedisTransport.php

@@ -58,9 +58,9 @@ function(Redis $conn) use ($query, $parsedUrl, $options) {
                 if ($auth) {
                     $conn->auth($auth);
                 }
-                $db = $options['db'] ?? $query['db'] ?? null;
+                $db = $parsedUrl['path'] ?? $options['db'] ?? $query['db'] ?? null;
                 if ($db !== null) {
-                    $db = intval($db);
+                    $db = intval(ltrim($db, '/'));
                     $conn->select($db);
                 }
             }

tests/Feature/TransportTest.php

@@ -29,14 +29,23 @@ protected function setUp() {
         $this->redis->flushAll();
     }
 
-    /** @test */
-    public function allows_custom_db() {
-        $this->given_the_redis_transport_contains_db();
+    /**
+     * @test
+     * @dataProvider provide_custom_redis_urls_with_db
+     */
+    public function allows_custom_db(string $place) {
+        $this->given_the_redis_transport_contains_db('1', $place);
         $this->given_there_is_a_wrapped_message();
-        $this->when_the_message_is_sent_received_and_acked();
+        $this->when_the_message_is_sent_on_the_transport();
         $this->then_the_queues_are_empty();
     }
 
+    public function provide_custom_redis_urls_with_db() {
+        yield 'db in query params' => ['query_string'];
+        yield 'db in path' => ['path'];
+        yield 'db in options' => ['options'];
+    }
+
     /** @test */
     public function can_send_a_message() {
         $this->given_there_is_a_wrapped_message();
@@ -199,8 +208,17 @@ public function then_the_message_is_available_after(int $delayMs) {
         $this->assertCount(1, $res);
     }
 
-    public function given_the_redis_transport_contains_db()
+    public function given_the_redis_transport_contains_db(string $db, string $place)
     {
-        $this->transport = RedisTransport::fromDsn(Serializer::create(), getenv('REDIS_DSN'), ['db' => 2]);
+        if ($place === 'options') {
+            $this->transport = RedisTransport::fromDsn(Serializer::create(), getenv('REDIS_DSN'), ['db' => $db]);
+        } else if ($place === 'query_string') {
+            $this->transport = RedisTransport::fromDsn(Serializer::create(), getenv('REDIS_DSN').'&db='.$db);
+        } else if ($place === 'path') {
+            [$base, $query] = explode('?', getenv('REDIS_DSN'));
+            $this->transport = RedisTransport::fromDsn(Serializer::create(), $base . '/'.$db . '?' . $query);
+        } else {
+            throw new \LogicException('Invalid place: ' . $place);
+        }
     }
 }