Merge branch 'master' into 0.9

Author: makasim

composer.json

@@ -27,6 +27,11 @@
         "enqueue/simple-client": "If you want to use enqueue client and cli commands"
     },
     "extra": {
+        "laravel": {
+            "providers": [
+                "Enqueue\\LaravelQueue\\EnqueueServiceProvider"
+            ]
+        },
         "branch-alias": {
             "dev-master": "0.9.x-dev"
         }

src/AmqpQueue.php

@@ -54,8 +54,8 @@ public function pop($queue = null)
      */
     protected function declareQueue($queue = null)
     {
-        $queue = $this->getQueueInteropContext()->createQueue($this->getQueue($queue));
-        $queue->addFlag(\Interop\Amqp\AmqpQueue::FLAG_DURABLE);
+        $interopQueue = $this->getQueue($queue);
+        $interopQueue->addFlag(\Interop\Amqp\AmqpQueue::FLAG_DURABLE);
 
         $this->getQueueInteropContext()->declareQueue($queue);
     }

src/Job.php

@@ -7,6 +7,7 @@
 use Illuminate\Queue\Jobs\Job as BaseJob;
 use Interop\Queue\Consumer;
 use Interop\Queue\Context;
+use Interop\Queue\Exception\DeliveryDelayNotSupportedException;
 use Interop\Queue\Message;
 
 class Job extends BaseJob implements JobContract
@@ -35,6 +36,11 @@ public function __construct(Container $container, Context $context, Consumer $co
         $this->connectionName = $connectionName;
     }
 
+    public function getJobId()
+    {
+        return $this->message->getMessageId();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -50,16 +56,20 @@ public function delete()
      */
     public function release($delay = 0)
     {
-        if ($delay) {
-            throw new \LogicException('To be implemented');
-        }
+        parent::release($delay);
 
         $requeueMessage = clone $this->message;
         $requeueMessage->setProperty('x-attempts', $this->attempts() + 1);
+        
+        $producer = $this->context->createProducer();
 
-        $this->context->createProducer()->send($this->consumer->getQueue(), $requeueMessage);
+        try {
+            $producer->setDeliveryDelay($this->secondsUntil($delay) * 1000);
+        } catch (DeliveryDelayNotSupportedException $e) {
+        }
 
         $this->consumer->acknowledge($this->message);
+        $producer->send($this->consumer->getQueue(), $requeueMessage);
     }
 
     public function getQueue()

src/Queue.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Queue\Queue as QueueContract;
 use Illuminate\Queue\Queue as BaseQueue;
 use Interop\Queue\Context;
+use Interop\Amqp\Impl\AmqpMessage;
 
 class Queue extends BaseQueue implements QueueContract
 {
@@ -56,9 +57,15 @@ public function push($job, $data = '', $queue = null)
      */
     public function pushRaw($payload, $queue = null, array $options = [])
     {
-        $this->context->createProducer()->send(
+        $message = $this->context->createMessage($payload);
+
+        if ($message instanceof AmqpMessage) {
+            $message->setDeliveryMode(\Interop\Amqp\AmqpMessage::DELIVERY_MODE_PERSISTENT);
+        }
+
+        return $this->context->createProducer()->send(
             $this->getQueue($queue),
-            $this->context->createMessage($payload)
+            $message
         );
     }
 
@@ -69,11 +76,13 @@ public function later($delay, $job, $data = '', $queue = null)
     {
         $message = $this->context->createMessage($this->createPayload($job, $data));
 
-        $this->context->createProducer()
-            ->setDeliveryDelay($this->secondsUntil($delay) * 1000)
+        if ($message instanceof AmqpMessage) {
+            $message->setDeliveryMode(\Interop\Amqp\AmqpMessage::DELIVERY_MODE_PERSISTENT);
+        }
 
-            ->send($this->getQueue($queue), $message)
-        ;
+        return $this->context->createProducer()
+            ->setDeliveryDelay($this->secondsUntil($delay) * 1000)
+            ->send($this->getQueue($queue), $message);
     }
 
     public function pop($queue = null)