Merge pull request #588 from bocharsky-bw/master

Add image rotate filter

Author: makasim

Imagine/Filter/Loader/RotateFilterLoader.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Liip\ImagineBundle\Imagine\Filter\Loader;
+
+use Imagine\Image\ImageInterface;
+use Imagine\Image\ManipulatorInterface;
+
+/**
+ * Loader for Imagine's basic rotate method
+ *
+ * @author Bocharsky Victor <[email protected]>
+ */
+class RotateFilterLoader implements LoaderInterface
+{
+    /**
+     * Loads and applies a filter on the given image.
+     *
+     * @param ImageInterface $image
+     * @param array $options
+     *
+     * @return ManipulatorInterface
+     */
+    public function load(ImageInterface $image, array $options = array())
+    {
+        $angle = isset($options['angle']) ? (int) $options['angle'] : 0;
+
+        return 0 === $angle ? $image : $image->rotate($angle);
+    }
+}

Resources/config/imagine.xml

@@ -41,6 +41,7 @@
         <parameter key="liip_imagine.filter.loader.background.class">Liip\ImagineBundle\Imagine\Filter\Loader\BackgroundFilterLoader</parameter>
         <parameter key="liip_imagine.filter.loader.upscale.class">Liip\ImagineBundle\Imagine\Filter\Loader\UpscaleFilterLoader</parameter>
         <parameter key="liip_imagine.filter.loader.auto_rotate.class">Liip\ImagineBundle\Imagine\Filter\Loader\AutoRotateFilterLoader</parameter>
+        <parameter key="liip_imagine.filter.loader.rotate.class">Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader</parameter>
         <parameter key="liip_imagine.filter.loader.interlace.class">Liip\ImagineBundle\Imagine\Filter\Loader\InterlaceFilterLoader</parameter>
 
         <!-- Data loaders' classes -->
@@ -183,6 +184,10 @@
             <tag name="liip_imagine.filter.loader" loader="auto_rotate" />
         </service>
 
+        <service id="liip_imagine.filter.loader.rotate" class="%liip_imagine.filter.loader.rotate.class%">
+            <tag name="liip_imagine.filter.loader" loader="rotate" />
+        </service>
+
         <service id="liip_imagine.filter.loader.interlace" class="%liip_imagine.filter.loader.interlace.class%">
             <tag name="liip_imagine.filter.loader" loader="interlace" />
         </service>

Resources/doc/filters.rst

@@ -171,6 +171,20 @@ should be called as early as possible)** Configuration looks like this:
                 filters:
                     auto_rotate: ~
 
+The ``rotate`` filter
+~~~~~~~~~~~~~~~~~~~~~
+
+The rotate filter rotates the image based on specified angle (in degrees).
+Configuration looks like this:
+
+.. code-block:: yaml
+
+    liip_imagine:
+        filter_sets:
+            my_thumb:
+                filters:
+                    rotate: { angle: 90 }
+
 The ``interlace`` filter
 ~~~~~~~~~~~~~~~~~~~~~~~~
 

Tests/Functional/Imagine/Filter/Loader/RotateFilterLoaderTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Liip\ImagineBundle\Tests\Functional\Imagine\Filter\Loader;
+
+use Liip\ImagineBundle\Tests\Functional\WebTestCase;
+
+/**
+ * Functional test cases for RotateFilterLoader class
+ *
+ * @author Bocharsky Victor <[email protected]>
+ */
+class RotateFilterLoaderTest extends WebTestCase
+{
+    public function testCouldBeGetFromContainerAsService()
+    {
+        $this->createClient();
+        $service = self::$kernel->getContainer()->get('liip_imagine.filter.loader.rotate');
+
+        $this->assertInstanceOf('Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader', $service);
+    }
+}

Tests/Imagine/Filter/Loader/RotateFilterLoaderTest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Liip\ImagineBundle\Tests\Filter;
+
+use Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader;
+use Liip\ImagineBundle\Tests\AbstractTest;
+
+/**
+ * Test cases for RotateFilterLoader class
+ *
+ * @covers Liip\ImagineBundle\Imagine\Filter\Loader\RotateFilterLoader
+ * @author Bocharsky Victor <[email protected]>
+ */
+class RotateFilterLoaderTest extends AbstractTest
+{
+    public function testLoadRotate0Degrees()
+    {
+        $loader = new RotateFilterLoader();
+
+        $image = $this->getMockImage();
+
+        $result = $loader->load($image, array('angle' => 0));
+        $this->assertSame($image, $result);
+    }
+
+    public function testLoadRotate90Degrees()
+    {
+        $loader = new RotateFilterLoader();
+
+        $image = $this->getMockImage();
+        $rotatedImage = $this->getMockImage();
+
+        $image
+            ->expects($this->once())
+            ->method('rotate')
+            ->with(90)
+            ->willReturn($rotatedImage)
+        ;
+
+        $result = $loader->load($image, array('angle' => 90));
+        $this->assertSame($rotatedImage, $result);
+    }
+}