Merge pull request #135 from basz/finish-id

Finish
Webador · Oct 9, 2014 · 9cac173 · 9cac173
2 parents fe98c60 + 9d7ac58
commit 9cac173
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/src/SlmQueue/Job/JobPluginManager.php b/src/SlmQueue/Job/JobPluginManager.php
@@ -6,8 +6,6 @@
 
 /**
  * JobPluginManager
- * 
- * @method JobInterface get($name)
  */
 class JobPluginManager extends AbstractPluginManager
 {
@@ -16,11 +14,19 @@ class JobPluginManager extends AbstractPluginManager
      */
     protected $shareByDefault = false;
 
+    /**
+     * @inheritdoc
+     *
+     * @param string $name
+     * @param array $options
+     * @param bool $usePeeringServiceManagers
+     * @return JobInterface
+     */
     public function get($name, $options = array(), $usePeeringServiceManagers = true)
     {
         // parent::get calls validatePlugin() so we're sure $instance is a JobInterface
         $instance = parent::get($name, $options, $usePeeringServiceManagers);
-        $instance->setMetadata('name', $name);
+        $instance->setMetadata('__name__', $name);
 
         return $instance;
     }

diff --git a/src/SlmQueue/Queue/AbstractQueue.php b/src/SlmQueue/Queue/AbstractQueue.php
@@ -61,7 +61,7 @@ public function getJobPluginManager()
     public function unserializeJob($string, array $metadata = array())
     {
         $data     =  json_decode($string, true);
-        $name     =  $data['__name__'];
+        $name     =  $data['metadata']['__name__'];
         $metadata += $data['metadata'];
         $content  =  unserialize($data['content']);
 
@@ -91,9 +91,9 @@ public function unserializeJob($string, array $metadata = array())
      */
     public function serializeJob(JobInterface $job)
     {
-        $name = $job->getMetadata('__name__');
+        $job->setMetadata('__name__', $job->getMetadata('__name__', get_class($job)));
+
         $data = array(
-            '__name__' => $name ?: get_class($job),
             'content'  => serialize($job->getContent()),
             'metadata' => $job->getMetadata()
         );

diff --git a/tests/SlmQueueTest/Job/JobPluginManagerTest.php b/tests/SlmQueueTest/Job/JobPluginManagerTest.php
@@ -44,7 +44,7 @@ public function testPluginManagerSetsServiceNameAsMetadata()
         $instance = $jobPluginManager->get('SimpleJob');
 
         $this->assertInstanceOf('SlmQueueTest\Asset\SimpleJob', $instance);
-        $this->assertEquals('SimpleJob', $instance->getMetadata('name'));
+        $this->assertEquals('SimpleJob', $instance->getMetadata('__name__'));
     }
 
     public function testPluginManagerThrowsExceptionOnInvalidJobClasses()

diff --git a/tests/SlmQueueTest/Queue/QueueTest.php b/tests/SlmQueueTest/Queue/QueueTest.php
@@ -68,7 +68,10 @@ public function testCanPushThenPopWithJobMetadata()
         $this->queue->push($this->job);
         $job = $this->queue->pop();
 
-        $this->assertEquals(array('Foo' => 'Bar'), $job->getMetadata());
+        // metadata will have reserved __name__ key with FQCN
+        $expected = array('Foo' => 'Bar') + array('__name__' => 'SlmQueueTest\Asset\SimpleJob');
+
+        $this->assertEquals($expected, $job->getMetadata());
         $this->assertEquals('Bar', $job->getMetadata('Foo'));
     }
 
@@ -77,7 +80,7 @@ public function testCorrectlySerializeJobContent()
         $job = new SimpleJob();
         $job->setContent('Foo');
 
-        $expected = '{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob","content":"s:3:\"Foo\";","metadata":[]}';
+        $expected = '{"content":"s:3:\"Foo\";","metadata":{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob"}}';
         $actual   = $this->queue->serializeJob($job);
 
         $this->assertEquals($expected, $actual);
@@ -88,7 +91,7 @@ public function testCorrectlySerializeJobMetadata()
         $job = new SimpleJob();
         $job->setMetadata('Foo', 'Bar');
 
-        $expected = '{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob","content":"N;","metadata":{"Foo":"Bar"}}';
+        $expected = '{"content":"N;","metadata":{"Foo":"Bar","__name__":"SlmQueueTest\\\Asset\\\SimpleJob"}}';
         $actual   = $this->queue->serializeJob($job);
 
         $this->assertEquals($expected, $actual);
@@ -100,7 +103,7 @@ public function testCorrectlySerializeJobContentAndMetadata()
         $job->setContent('Foo');
         $job->setMetadata('Foo', 'Bar');
 
-        $expected = '{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob","content":"s:3:\"Foo\";","metadata":{"Foo":"Bar"}}';
+        $expected = '{"content":"s:3:\"Foo\";","metadata":{"Foo":"Bar","__name__":"SlmQueueTest\\\Asset\\\SimpleJob"}}';
         $actual   = $this->queue->serializeJob($job);
 
         $this->assertEquals($expected, $actual);
@@ -111,7 +114,7 @@ public function testCorrectlySerializeJobServiceName()
         $job = new SimpleJob();
         $job->setMetadata('__name__', 'SimpleJob');
 
-        $expected = '{"__name__":"SimpleJob","content":"N;","metadata":{"__name__":"SimpleJob"}}';
+        $expected = '{"content":"N;","metadata":{"__name__":"SimpleJob"}}';
         $actual   = $this->queue->serializeJob($job);
 
         $this->assertEquals($expected, $actual);
@@ -124,7 +127,7 @@ public function testCanCreateJobWithFQCN()
                                ->with($this->jobName)
                                ->will($this->returnValue($this->job));
 
-        $payload = '{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob","content":"N;","metadata":[]}';
+        $payload = '{"content":"N;","metadata":{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob"}}';
         $job     = $this->queue->unserializeJob($payload);
 
         $expected = spl_object_hash($this->job);
@@ -139,7 +142,7 @@ public function testCanCreateJobWithStringName()
                                ->with('SimpleJob')
                                ->will($this->returnValue($this->job));
 
-        $payload = '{"__name__":"SimpleJob","content":"N;","metadata":[]}';
+        $payload = '{"content":"N;","metadata":{"__name__":"SimpleJob"}}';
         $job     = $this->queue->unserializeJob($payload);
 
         $expected = spl_object_hash($this->job);
@@ -154,7 +157,7 @@ public function testCanCreateJobWithContent()
                                ->with($this->jobName)
                                ->will($this->returnValue($this->job));
 
-        $payload = '{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob","content":"s:3:\"Foo\";","metadata":[]}';
+        $payload = '{"content":"s:3:\"Foo\";","metadata":{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob"}}';
         $job     = $this->queue->unserializeJob($payload);
 
         $this->assertEquals('Foo', $job->getContent());
@@ -167,7 +170,7 @@ public function testCanCreateJobWithMetadata()
                                ->with($this->jobName)
                                ->will($this->returnValue($this->job));
 
-        $payload = '{"__name__":"SlmQueueTest\\\Asset\\\SimpleJob","content":"N;","metadata":{"Foo":"Bar"}}';
+        $payload = '{"content":"N;","metadata":{"Foo":"Bar","__name__":"SlmQueueTest\\\Asset\\\SimpleJob"}}';
         $job     = $this->queue->unserializeJob($payload);
 
         $this->assertEquals('Bar', $job->getMetadata('Foo'));