Add Queue::getName()

Author: Eugene Leonovich

src/Queue.php

@@ -16,15 +16,15 @@
 class Queue
 {
     private $client;
-    private $tubeName;
+    private $name;
 
     /**
      * @param \Tarantool|\Tarantool\Client\Client $client
-     * @param string $tubeName
+     * @param string $name
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct($client, $tubeName)
+    public function __construct($client, $name)
     {
         if ($client instanceof Client) {
             $client = new ClientAdapter($client);
@@ -36,7 +36,15 @@ public function __construct($client, $tubeName)
         }
 
         $this->client = $client;
-        $this->tubeName = $tubeName;
+        $this->name = $name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
     }
 
     /**
@@ -48,7 +56,7 @@ public function __construct($client, $tubeName)
     public function put($data, array $options = [])
     {
         $args = $options ? [$data, $options] : [$data];
-        $result = $this->client->call("queue.tube.$this->tubeName:put", $args);
+        $result = $this->client->call("queue.tube.$this->name:put", $args);
 
         return Task::createFromTuple($result[0]);
     }
@@ -61,7 +69,7 @@ public function put($data, array $options = [])
     public function take($timeout = null)
     {
         $args = null === $timeout ? [] : [$timeout];
-        $result = $this->client->call("queue.tube.$this->tubeName:take", $args);
+        $result = $this->client->call("queue.tube.$this->name:take", $args);
 
         return empty($result[0]) ? null : Task::createFromTuple($result[0]);
     }
@@ -73,7 +81,7 @@ public function take($timeout = null)
      */
     public function ack($taskId)
     {
-        $result = $this->client->call("queue.tube.$this->tubeName:ack", [$taskId]);
+        $result = $this->client->call("queue.tube.$this->name:ack", [$taskId]);
 
         return Task::createFromTuple($result[0]);
     }
@@ -87,7 +95,7 @@ public function ack($taskId)
     public function release($taskId, array $options = [])
     {
         $args = $options ? [$taskId, $options] : [$taskId];
-        $result = $this->client->call("queue.tube.$this->tubeName:release", $args);
+        $result = $this->client->call("queue.tube.$this->name:release", $args);
 
         return Task::createFromTuple($result[0]);
     }
@@ -99,7 +107,7 @@ public function release($taskId, array $options = [])
      */
     public function peek($taskId)
     {
-        $result = $this->client->call("queue.tube.$this->tubeName:peek", [$taskId]);
+        $result = $this->client->call("queue.tube.$this->name:peek", [$taskId]);
 
         return Task::createFromTuple($result[0]);
     }
@@ -111,7 +119,7 @@ public function peek($taskId)
      */
     public function bury($taskId)
     {
-        $result = $this->client->call("queue.tube.$this->tubeName:bury", [$taskId]);
+        $result = $this->client->call("queue.tube.$this->name:bury", [$taskId]);
 
         return Task::createFromTuple($result[0]);
     }
@@ -123,7 +131,7 @@ public function bury($taskId)
      */
     public function kick($count)
     {
-        $result = $this->client->call("queue.tube.$this->tubeName:kick", [$count]);
+        $result = $this->client->call("queue.tube.$this->name:kick", [$count]);
 
         return $result[0][0];
     }
@@ -135,14 +143,14 @@ public function kick($count)
      */
     public function delete($taskId)
     {
-        $result = $this->client->call("queue.tube.$this->tubeName:delete", [$taskId]);
+        $result = $this->client->call("queue.tube.$this->name:delete", [$taskId]);
 
         return Task::createFromTuple($result[0]);
     }
 
     public function truncate()
     {
-        $this->client->call("queue.tube.$this->tubeName:truncate");
+        $this->client->call("queue.tube.$this->name:truncate");
     }
 
     /**
@@ -154,7 +162,7 @@ public function truncate()
      */
     public function stats($path = null)
     {
-        $result = $this->client->call('queue.stats', [$this->tubeName]);
+        $result = $this->client->call('queue.stats', [$this->name]);
 
         if (null === $path) {
             return $result[0][0];

tests/Integration/QueueTest.php

@@ -53,22 +53,22 @@ public static function tearDownAfterClass()
 
     protected function setUp()
     {
-        $name = preg_replace('/^test([^\s]+).*$/', '\1', $this->getName());
-        $name = strtolower($name);
+        $testName = preg_replace('/^test([^\s]+).*$/', '\1', $this->getName());
+        $testName = strtolower($testName);
 
         $tubeType = $this->getTubeType();
-        $tubeName = sprintf('t_%s_%s', $tubeType, $name);
+        $queueName = sprintf('t_%s_%s', $tubeType, $testName);
 
-        self::$client->evaluate('create_tube(...)', [$tubeName, $tubeType]);
+        self::$client->evaluate('create_tube(...)', [$queueName, $tubeType]);
 
         $ann = $this->getAnnotations();
         if (!empty($ann['method']['eval'])) {
             foreach ($ann['method']['eval'] as $eval) {
-                self::$client->evaluate(str_replace('%tube_name%', $tubeName, $eval));
+                self::$client->evaluate(str_replace('%tube_name%', $queueName, $eval));
             }
         }
 
-        $this->queue = new Queue(self::$client, $tubeName);
+        $this->queue = new Queue(self::$client, $queueName);
     }
 
     protected function tearDown()

tests/Unit/QueueTest.php

@@ -12,7 +12,6 @@
 namespace Tarantool\Queue\Tests\Unit;
 
 use Tarantool\Queue\Queue;
-use Tarantool\Queue\Task;
 
 class QueueTest extends \PHPUnit_Framework_TestCase
 {
@@ -43,4 +42,17 @@ public function provideConstructorInvalidArgumentData()
             [[], 'array'],
         ];
     }
+
+    public function testGetName()
+    {
+        $clientClass = class_exists('Tarantool') ? 'Tarantool' : 'Tarantool\Client\Client';
+        $client = $this->getMockBuilder($clientClass)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $queueName = uniqid('queue_', true);
+        $queue = new Queue($client, $queueName);
+
+        $this->assertSame($queueName, $queue->getName());
+    }
 }