Rearranging namespaces to prep for factories

justinrainbow · Jul 23, 2012 · 1d6d72c · 1d6d72c
1 parent fe3393e
commit 1d6d72c
Show file tree

Hide file tree

Showing 16 changed files with 251 additions and 122 deletions.
diff --git a/src/Presque/Event/JobEvent.php b/src/Presque/Event/JobEvent.php
@@ -11,9 +11,9 @@
 
 namespace Presque\Event;
 
-use Presque\JobInterface;
-use Presque\QueueInterface;
-use Presque\WorkerInterface;
+use Presque\Job\JobInterface;
+use Presque\Queue\QueueInterface;
+use Presque\Worker\WorkerInterface;
 
 class JobEvent extends Event
 {

diff --git a/src/Presque/Event/WorkerEvent.php b/src/Presque/Event/WorkerEvent.php
@@ -11,7 +11,7 @@
 
 namespace Presque\Event;
 
-use Presque\WorkerInterface;
+use Presque\Worker\WorkerInterface;
 
 class WorkerEvent extends Event
 {

diff --git a/src/Presque/EventListener/JobRetryListener.php b/src/Presque/EventListener/JobRetryListener.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Presque package.
+ *
+ * (c) Justin Rainbow <justin.rainbow@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Presque\EventListener;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Presque\Events;
+use Presque\Event\JobEvent;
+
+class JobRetryListener implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents()
+    {
+        return array(
+            Events::JOB_FINISHED => 'onJobFinished'
+        );
+    }
+
+    public function onJobFinished(JobEvent $event)
+    {
+        $job = $event->getJob();
+
+        if ($job->isError()) {
+            $event->getQueue()->enqueue($job);
+        }
+    }
+}
diff --git a/src/Presque/AbstractJob.php → src/Presque/Job/AbstractJob.php b/src/Presque/AbstractJob.php → src/Presque/Job/AbstractJob.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Presque;
+namespace Presque\Job;
 
 use Presque\StatusInterface;
 

diff --git a/src/Presque/Job.php → src/Presque/Job/Job.php b/src/Presque/Job.php → src/Presque/Job/Job.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Presque;
+namespace Presque\Job;
 
 use Presque\Exception\InvalidArgumentException;
+use Presque\StatusInterface;
 
 class Job extends AbstractJob
 {
@@ -33,6 +34,14 @@ public static function create($class, array $args = array())
         return new static($class, $args);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public static function recreate(array $payload)
+    {
+        return new static($payload['class'], $payload['args']);
+    }
+
     /**
      * @param string $class Class that will be performing
      * @param array  $args  List of arguments to pass to the `$class->perform()` method

diff --git a/src/Presque/JobInterface.php → src/Presque/Job/JobInterface.php b/src/Presque/JobInterface.php → src/Presque/Job/JobInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Presque;
+namespace Presque\Job;
 
 interface JobInterface
 {
@@ -21,6 +21,17 @@ interface JobInterface
      */
     static function create($class, array $args = array());
 
+    /**
+     * Recreates a Job instance from the payload data.
+     *
+     * @param array $payload
+     *
+     * @return JobInterface
+     *
+     * @throws InvalidArgumentException If `$payload` is not valid
+     */
+    static function recreate(array $payload);
+
     /**
      * @return Boolean
      */

diff --git a/src/Presque/Queue/AbstractQueue.php b/src/Presque/Queue/AbstractQueue.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of the Presque package.
+ *
+ * (c) Justin Rainbow <justin.rainbow@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Presque\Queue;
+
+use Presque\Storage\StorageInterface;
+use Presque\Job\JobInterface;
+use Presque\Job\Job;
+
+abstract class AbstractQueue implements QueueInterface
+{
+}
diff --git a/src/Presque/Queue.php → src/Presque/Queue/Queue.php b/src/Presque/Queue.php → src/Presque/Queue/Queue.php
@@ -9,11 +9,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Presque;
+namespace Presque\Queue;
 
 use Presque\Storage\StorageInterface;
+use Presque\Job\JobInterface;
+use Presque\Job\Job;
 
-class Queue implements QueueInterface
+class Queue extends AbstractQueue
 {
     protected $name;
     protected $storage;
@@ -26,26 +28,41 @@ public function __construct($name, StorageInterface $storage = null, $timeout =
         $this->timeout = $timeout;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function getName()
     {
         return $this->name;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function getTimeout()
     {
         return $this->timeout;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function getStorage()
     {
         return $this->storage;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function setStorage(StorageInterface $storage)
     {
         $this->storage = $storage;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function enqueue(JobInterface $job)
     {
         $this->storage->push($this->name, array(
@@ -54,6 +71,9 @@ public function enqueue(JobInterface $job)
         ));
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function reserve()
     {
         $payload = $this->storage->pop($this->name, $this->getTimeout());
@@ -62,6 +82,6 @@ public function reserve()
             return false;
         }
 
-        return Job::create($payload['class'], $payload['args']);
+        return Job::recreate($payload);
     }
 }
diff --git a/src/Presque/QueueInterface.php → src/Presque/Queue/QueueInterface.php b/src/Presque/QueueInterface.php → src/Presque/Queue/QueueInterface.php
@@ -9,9 +9,10 @@
  * file that was distributed with this source code.
  */
 
-namespace Presque;
+namespace Presque\Queue;
 
 use Presque\Storage\StorageInterface;
+use Presque\Job\JobInterface;
 
 interface QueueInterface
 {

diff --git a/src/Presque/Worker/AbstractWorker.php b/src/Presque/Worker/AbstractWorker.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of the Presque package.
+ *
+ * (c) Justin Rainbow <justin.rainbow@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Presque\Worker;
+
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Presque\Event\JobEvent;
+use Presque\Event\WorkerEvent;
+use Presque\Log\LoggerAwareInterface;
+use Presque\Log\LoggerInterface;
+use Presque\Queue\QueueInterface;
+use Presque\Job\JobInterface;
+use Presque\StatusInterface;
+use Presque\Events;
+
+abstract class AbstractWorker implements WorkerInterface, LoggerAwareInterface
+{
+    protected $id;
+    protected $status;
+    protected $queues;
+    protected $eventDispatcher;
+    protected $logger;
+
+    public function __construct($id = null)
+    {
+        if (null === $id) {
+            $id = gethostname() . ':' . getmypid();
+        }
+
+        $this->id = $id;
+        $this->queues = new \SplObjectStorage();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setStatus($status)
+    {
+        $this->status = $status;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function addQueue(QueueInterface $queue)
+    {
+        $this->queues->attach($queue);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function removeQueue(QueueInterface $queue)
+    {
+        if ($this->queues->contains($queue)) {
+            $this->queues->detach($queue);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getQueues()
+    {
+        return $this->queues;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setEventDispatcher(EventDispatcherInterface $eventDispatcher = null)
+    {
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasEventDispatcher()
+    {
+        return null !== $this->eventDispatcher;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setLogger(LoggerInterface $logger = null)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function hasLogger()
+    {
+        return null !== $this->logger;
+    }
+}