X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/575d559e5aea5e099ba7784547b1aa359d28fb8c..7b8322b01cb424edd623e0745df2e7b07792180d:/Twig/PackExtension.php

diff --git a/Twig/PackExtension.php b/Twig/PackExtension.php
index 3b4aa07..4baba52 100644
--- a/Twig/PackExtension.php
+++ b/Twig/PackExtension.php
@@ -6,8 +6,6 @@ use Symfony\Component\HttpKernel\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 class PackExtension extends \Twig_Extension {
-	#, $prefix = '@RapsysPackBundle/Resources/public/', $cpack = '/usr/local/bin/cpack', $jpack = '/usr/local/bin/jpack'
-	#$this->kernel = $kernel;
 	public function __construct(FileLocator $fileLocator, ContainerInterface $containerInterface) {
 		//Set file locator
 		$this->fileLocator = $fileLocator;
@@ -21,17 +19,23 @@ class PackExtension extends \Twig_Extension {
 		$this->coutput = 'css/*.pack.css';
 		//Set default joutput
 		$this->joutput = 'js/*.pack.js';
+		//Set default ioutput
+		$this->ioutput = 'img/*.pack.jpg';
 
-		//Set default cpack
-		$this->cpack = '/usr/local/bin/cpack';
-		//Set default jpack
-		$this->jpack = '/usr/local/bin/jpack';
+		//Set default cfilter
+		$this->cfilter = array('CPackFilter');
+		//Set default jfilter
+		$this->jfilter = array('JPackFilter');
+		//Set default ifilter
+		$this->ifilter = array('IPackFilter');
 
 		//Load configuration
 		if ($containerInterface->hasParameter('rapsys_pack')) {
-			foreach($containerInterface->getParameter('rapsys_pack') as $k => $v) {
-				if (isset($this->$k)) {
-					$this->$k = $v;
+			if ($parameters = $containerInterface->getParameter('rapsys_pack')) {
+				foreach($parameters as $k => $v) {
+					if (isset($this->$k) && !empty($v)) {
+						$this->$k = $v;
+					}
 				}
 			}
 		}
@@ -42,9 +46,9 @@ class PackExtension extends \Twig_Extension {
 
 	public function getTokenParsers() {
 		return array(
-			new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'stylesheets', $this->coutput, $this->cpack),
-			new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'javascripts', $this->joutput, $this->jpack),
-			#new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'image', '*.pack.{tld}'),
+			new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'stylesheet', $this->coutput, $this->cfilter),
+			new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'javascript', $this->joutput, $this->jfilter),
+			new PackTokenParser($this->fileLocator, $this->containerInterface, $this->prefix, 'image', $this->ioutput, $this->ifilter),
 		);
 	}
 }