Merge pull request #35 from jdecool/twig-image-url

Add imageUrl Twig filter

Author: skwi

Tests/Units/Twig/Extension/FileManagementExtension.php

@@ -134,6 +134,36 @@ public function testFileUrl()
         ;
     }
 
+    public function testImageUrl()
+    {
+        $this
+            ->if($testedClass = $this->createTestedClassInstance())
+            ->given(
+                $myEntity = $this->createEntityMock(array(
+                        'nullPhotoFilename' => null,
+                        'photoFilename' => '/my-photo.png',
+                        'photoWithFormatFilename' => '/picture-{-imgformat-}.jpg',
+                    ))
+            )
+            ->then
+                ->variable($testedClass->imageUrl($myEntity, 'nullPhoto', 'mini', false))
+                    ->isNull()
+                ->string($testedClass->imageUrl($myEntity, 'photo', 'mini', false))
+                    ->isEqualTo('http://localhost/mydir/my-photo.png')
+                ->string($testedClass->imageUrl($myEntity, 'photoWithFormat', 'mini', false))
+                    ->isEqualTo('http://localhost/mydir/picture-mini.jpg')
+                ->string($testedClass->imageUrl($myEntity, 'photoWithFormat', 'normal', false))
+                    ->isEqualTo('http://localhost/mydir/picture-normal.jpg')
+                ->string($testedClass->imageUrl($myEntity, 'photo', 'mini'))
+                    ->match('#^http:\/\/localhost\/mydir\/my-photo.png\?v=\d+$#')
+                ->exception(function() use ($testedClass, $myEntity) {
+                    $testedClass->imageUrl($myEntity, 'undefinedField', 'photo');
+                })
+                    ->isInstanceOf('Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException')
+                    ->hasCode(0)
+        ;
+    }
+
     private function createTestedClassInstance($webdir = '/mydir')
     {
         $controller = new \mageekguy\atoum\mock\controller();

Twig/Extension/FileManagementExtension.php

@@ -24,6 +24,7 @@ public function getFilters()
             'filepath'  => new \Twig_Filter_Method($this, 'filepath'),
             'imagepath' => new \Twig_Filter_Method($this, 'imagepath'),
             'fileUrl'   => new \Twig_Filter_Method($this, 'fileUrl'),
+            'imageUrl'  => new \Twig_Filter_Method($this, 'imageUrl'),
         );
     }
 
@@ -59,6 +60,24 @@ public function imagepath($entity, $propertyName, $format, $updateCache = true)
     public function fileUrl($entity, $propertyName)
     {
         $path = $this->filepath($entity, $propertyName);
+
+        return $this->getUrl($path);
+    }
+
+    public function imageUrl($entity, $propertyName, $format, $updateCache = true)
+    {
+        $path = $this->imagepath($entity, $propertyName, $format, $updateCache);
+
+        return $this->getUrl($path);
+    }
+
+    public function getName()
+    {
+        return 'twigextension';
+    }
+
+    private function getUrl($path)
+    {
         if (empty($path)) {
             return null;
         }
@@ -69,10 +88,5 @@ public function fileUrl($entity, $propertyName)
             $path
         );
     }
-
-    public function getName()
-    {
-        return 'twigextension';
-    }
 }