Master

Controller/ImagineController.php

@@ -5,9 +5,11 @@
 use Avalanche\Bundle\ImagineBundle\Imagine\Filter\FilterManager;
 use Imagine\Image\ImagineInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Avalanche\Bundle\ImagineBundle\Imagine\CacheManager;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 class ImagineController
 {
@@ -57,7 +59,11 @@ public function __construct(ImagineInterface $imagine, CacheManager $cacheManage
      */
     public function filter($path, $filter)
     {
-        $cachedPath = $this->cacheManager->cacheImage($this->request->getBaseUrl(), $path, $filter);
+        try {
+            $cachedPath = $this->cacheManager->cacheImage($this->request->getBaseUrl(), $path, $filter);
+        } catch (RouteNotFoundException $e) {
+            throw new NotFoundHttpException('Filter doesn\'t exist.');
+        }
 
          // if cache path cannot be determined, return 404
         if (null === $cachedPath) {
@@ -115,4 +121,16 @@ public function setRequest(Request $request = null)
 	{
 		$this->request = $request;
 	}
+
+    /**
+     * Set the request
+     *
+     * @param Request $request
+     */
+    public function setRequestStack(RequestStack $request_stack = null)
+    {
+        if(!isset($this->request)) {
+            $this->request=$request_stack->getCurrentRequest();
+        }
+    }
 }

DependencyInjection/AvalancheImagineExtension.php

@@ -44,7 +44,7 @@ private function mergeConfig(array $configs)
         $config = array();
 
         foreach ($configs as $cnf) {
-            $config = array_merge($config, $cnf);
+            $config = array_merge_recursive($config, $cnf);
         }
 
         return $config;

Imagine/CacheManager.php

@@ -18,14 +18,16 @@ class CacheManager
      * @param Filesystem        $filesystem
      * @param string            $webRoot
      * @param string            $sourceRoot
+     * @param int               $permissions
      */
     public function __construct(
         CachePathResolver $cachePathResolver,
         ImagineInterface $imagine,
         FilterManager $filterManager,
         Filesystem $filesystem,
         $webRoot,
-        $sourceRoot
+        $sourceRoot,
+        $permissions
     )
     {
         $this->cachePathResolver = $cachePathResolver;
@@ -34,6 +36,7 @@ public function __construct(
         $this->filesystem        = $filesystem;
         $this->webRoot           = $webRoot;
         $this->sourceRoot        = $sourceRoot;
+        $this->permissions       = $permissions;
     }
 
     /**
@@ -62,24 +65,32 @@ public function cacheImage($basePath, $path, $filter)
         }
 
         $realPath = $this->webRoot.$browserPath;
-        $sourcePath = $this->sourceRoot.$path;
+
+        $sourcePathRoot = $this->filterManager->getOption($filter, "source_root", $this->sourceRoot);
+        $sourcePath = $sourcePathRoot.$path;
 
         // if the file has already been cached, just return path
-        if (file_exists($realPath)) {
+        if (is_file($realPath)) {
             return $realPath;
         }
 
-        if (!file_exists($sourcePath)) {
+        if (!is_file($sourcePath)) {
             return null;
         }
 
         $dir = pathinfo($realPath, PATHINFO_DIRNAME);
 
         if (!is_dir($dir)) {
-            if (false === $this->filesystem->mkdir($dir)) {
-                throw new \RuntimeException(sprintf(
-                    'Could not create directory %s', $dir
-                ));
+            try {
+                if (false === $this->filesystem->mkdir($dir)) {
+                    throw new \RuntimeException(sprintf(
+                        'Could not create directory %s', $dir
+                    ));
+                }
+            } catch (\Exception $e) {
+                if (!is_dir($dir)) {
+                    throw $e;
+                }
             }
         }
 
@@ -92,6 +103,18 @@ public function cacheImage($basePath, $path, $filter)
             ))
         ;
 
+        try {
+            if (!chmod($realPath, $this->permissions))
+            {
+                throw new \RuntimeException(sprintf(
+                    'Could not set permissions %s on image saved in %s', $this->permissions, $realPath
+                ));
+            }
+
+        } catch (Exception $e) {
+            throw $e;
+        }
+
         return $realPath;
     }
 }

Imagine/CachePathResolver.php

@@ -11,6 +11,11 @@ class CachePathResolver
      * @var string
      */
     private $webRoot;
+
+    /**
+     * @var string
+     */
+    private $sourceRoot;
 
     /**
      * @var Symfony\Component\Routing\RouterInterface
@@ -21,11 +26,13 @@ class CachePathResolver
      * Constructs cache path resolver with a given web root and cache prefix
      *
      * @param string                                    $webRoot
+     * @param string                                    $sourceRoot
      * @param Symfony\Component\Routing\RouterInterface $router
      */
-    public function __construct($webRoot, RouterInterface $router)
+    public function __construct($webRoot, $sourceRoot, RouterInterface $router)
     {
         $this->webRoot = $webRoot;
+        $this->sourceRoot = $sourceRoot;
         $this->router  = $router;
     }
 
@@ -38,11 +45,11 @@ public function __construct($webRoot, RouterInterface $router)
      */
     public function getBrowserPath($path, $filter, $absolute = false)
     {
-        // identify if current path is not under specified web root and return
+        // identify if current path is not under specified source root and return
         // unmodified path in that case
-        $realPath = realpath($this->webRoot.$path);
+        $realPath = realpath($this->sourceRoot.$path);
 
-        if (!0 === strpos($realPath, $this->webRoot)) {
+        if (!0 === strpos($realPath, $this->sourceRoot)) {
             return $path;
         }
 
@@ -56,7 +63,7 @@ public function getBrowserPath($path, $filter, $absolute = false)
 
         $cached = realpath($this->webRoot.$path);
 
-        if (file_exists($cached) && filemtime($realPath) > filemtime($cached)) {
+        if (file_exists($cached) && !is_dir($cached) && filemtime($realPath) > filemtime($cached)) {
             unlink($cached);
         }
 

Imagine/Filter/Loader/CropFilterLoader.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader;
+
+use Imagine\Image\Box;
+use Imagine\Image\Point;
+
+use Imagine\Filter\Basic\Crop;
+use Imagine\Image\ImageInterface;
+
+class CropFilterLoader implements LoaderInterface
+{
+    public function load(array $options = array())
+    {
+        list($x, $y) = $options['start'];
+        list($width, $height) = $options['size'];
+
+        return new Crop(new Point($x, $y), new Box($width, $height));
+    }
+}

README.md

@@ -1,3 +1,8 @@
+Deprecated
+==========
+
+This project is no longer actively maintained, please find one of the populate forks. Thanks!
+
 AvalancheImagineBundle
 ======================
 
@@ -12,7 +17,7 @@ This will perform the transformation called `thumbnail`, which you can define
 to do a number of different things, such as resizing, cropping, drawing,
 masking, etc.
 
-This bundle integrates the standalone PHP "[Imagine library](/avalanche123/Imagine)".
+This bundle integrates the standalone PHP "[Imagine library](https://github.com/avalanche123/Imagine)".
 
 ## Installation
 
@@ -26,18 +31,8 @@ Installation is a quick 3 step process:
 
 Add AvalancheImagineBundle in your composer.json:
 
-```js
-{
-    "require": {
-        "avalanche123/imagine-bundle": "v2.1"
-    }
-}
-```
-
-Now tell composer to download the bundle by running the command:
-
-``` bash
-$ php composer.phar update avalanche123/imagine-bundle
+```sh
+composer require avalanche123/imagine-bundle
 ```
 
 Composer will install the bundle to your project's `vendor/avalanche123/imagine-bundle` directory.
@@ -209,6 +204,7 @@ Each filter that you specify have the following options:
  - `type` - determine the type of filter to be used, refer to *Filters* section for more information
  - `options` - options that should be passed to the specific filter type
  - `path` - override the global `cache_prefix` and replace it with this path
+ - `source_root` - override the global `source_root` and replace it with this path
 
 ## Built-in Filters
 
@@ -313,6 +309,18 @@ avalanche_imagine:
 
 ```
 
+### Crop
+
+The `crop` filter crop an image with start coordinate, and size dimension.
+
+``` yaml
+avalanche_imagine:
+    filters:
+        crop:
+            type   : crop
+            options: { start: [0, 0], size: [100, 100] } #crop image with 100x100 square box
+```
+
 ## Load your Custom Filters
 
 The ImagineBundle allows you to load your own custom filter classes. The only
@@ -361,12 +369,19 @@ will apply your filter to '.jpg', and then concatenate the result to
 
 ## Using as a service
 
-You can also use ImagineBundle as a service and create the cache image from controller.
+You can use ImagineBundle as a service and resolve the cached image path.
 ```php
 $avalancheService = $this->get('imagine.cache.path.resolver');
 ```
 
 Then, call the getBrowserPath and pass the original image webpath and the filter you want to use
 ```php
 $cachedImage = $avalancheService->getBrowserPath($object->getWebPath(), 'my_thumb');
-```
+```
+
+And also use ImagineBundle as a service and create the cache image from controller.
+```php
+$cacheManager = $this->get('imagine.cache.manager');
+$cachedPath = $cacheManager->cacheImage($this->getRequest()->getBaseUrl(), '/images/picture1.jpg', 'my_filter');
+```
+

Resources/config/imagine.xml

@@ -11,6 +11,7 @@
         <parameter key="imagine.source_root">%kernel.root_dir%/../web</parameter>
         <parameter key="imagine.cache_prefix">media/cache</parameter>
         <parameter key="imagine.filters" type="collection" />
+        <parameter key="imagine.permissions">0644</parameter>
 
         <!-- Utility classes -->
 
@@ -49,6 +50,8 @@
 
         <parameter key="imagine.filter.loader.chain.class">Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader\ChainFilterLoader</parameter>
 
+        <parameter key="imagine.filter.loader.crop.class">Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader\CropFilterLoader</parameter> 
+
     </parameters>
 
     <services>
@@ -57,6 +60,7 @@
 
         <service id="imagine.cache.path.resolver" class="%imagine.cache.path.resolver.class%">
             <argument>%imagine.web_root%</argument>
+            <argument>%imagine.source_root%</argument>
             <argument type="service" id="router" />
         </service>
 
@@ -67,6 +71,7 @@
             <argument type="service" id="filesystem" />
             <argument>%imagine.web_root%</argument>
             <argument>%imagine.source_root%</argument>
+            <argument>%imagine.permissions%</argument>
         </service>
 
         <service id="imagine.filter.manager" class="%imagine.filter.manager.class%">
@@ -82,6 +87,9 @@
 			<call method="setRequest">
 				<argument type="service" id="request" on-invalid="null" strict="false" />
 			</call>
+            <call method="setRequestStack">
+                <argument type="service" id="request_stack" on-invalid="null" strict="false" />
+            </call>
         </service>
 
         <!-- Route Loader -->
@@ -137,6 +145,10 @@
             <argument type="service" id="imagine.filter.manager" />
             <tag name="imagine.filter.loader" filter="chain" />
         </service>
+
+        <service id="imagine.filter.loader.crop" class="%imagine.filter.loader.crop.class%">
+            <tag name="imagine.filter.loader" filter="crop" />
+        </service>
 
     </services>
 </container>

Templating/ImagineExtension.php

@@ -29,7 +29,7 @@ public function __construct(CachePathResolver $cachePathResolver)
     public function getFilters()
     {
         return array(
-            'apply_filter' => new \Twig_Filter_Method($this, 'applyFilter'),
+            new \Twig_SimpleFilter('apply_filter', array($this, 'applyFilter')),
         );
     }
 

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "avalanche123/imagine-bundle",
+    "name": "i-storm/avalanche-imagine-bundle",
     "description": "Image manipulation using Imagine and Twig Filters.",
     "keywords": ["image manipulation", "imagine"],
     "homepage": "https://github.com/avalanche123/AvalancheImagineBundle",
@@ -20,8 +20,8 @@
         }
     ],
     "require": {
-        "symfony/framework-bundle": "2.*",
-        "imagine/Imagine": "v0.4.1"
+        "symfony/framework-bundle": "2.*|3.*",
+        "imagine/Imagine": "^1.3"
     },
     "require-dev": {
         "makasim/temp-file": "dev-master"
@@ -33,4 +33,4 @@
         "psr-0": { "Avalanche\\Bundle\\ImagineBundle": "" }
     },
     "target-dir": "Avalanche/Bundle/ImagineBundle"
-}
+}