PHPCRGenerator: add test

Author: Roel Sint

Generator/PHPCRGenerator.php

@@ -15,21 +15,18 @@
 class PHPCRGenerator implements GeneratorInterface
 {
     /**
-     * @abstract
-     *
      * @param \Sonata\MediaBundle\Model\MediaInterface $media
      *
      * @return string
      */
     public function generatePath(MediaInterface $media)
     {
-        $id = strpos($media->getId(), 0);
-        $parts = explode('/', ltrim($id, '/'));
+        $segments = preg_split('#/#', $media->getId(), null, PREG_SPLIT_NO_EMPTY);
 
-        if (count($parts) > 0) {
+        if (count($segments) > 1) {
             // remove last part from id
-            array_pop($parts);
-            $path = implode('/', $parts);
+            array_pop($segments);
+            $path = join($segments, '/');
         } else {
             $path = '';
         }

Provider/ImageProvider.php

@@ -128,7 +128,7 @@ public function generatePublicUrl(MediaInterface $media, $format)
             $path = $this->getReferenceImage($media);
         } else {
             $path = $this->thumbnail->generatePublicUrl($this, $media, $format);
-    }
+        }
 
         return $this->getCdn()->getPath($path, $media->getCdnIsFlushable());
     }

Tests/Generator/PHPCRGeneratorTest.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Sonata package.
+ *
+ * (c) Thomas Rabaix <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\MediaBundle\Tests\Generator;
+
+use Sonata\MediaBundle\Generator\PHPCRGenerator;
+use Sonata\MediaBundle\Tests\Entity\Media;
+
+class PHPCRGeneratorTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testPHPCRGenerator()
+    {
+
+        $generator = new PHPCRGenerator;
+
+        $media = new Media;
+        $media->setContext('user');
+
+        $media->setId('nodename');
+        $this->assertEquals('user', $generator->generatePath($media));
+
+        $media->setId('/media/nodename');
+        $this->assertEquals('user/media', $generator->generatePath($media));
+
+        $media->setId('/media/sub/path/nodename');
+        $this->assertEquals('user/media/sub/path', $generator->generatePath($media));
+    }
+}