X-Git-Url: https://git.rapsys.eu/packbundle/blobdiff_plain/575d559e5aea5e099ba7784547b1aa359d28fb8c..6e85bf686f4707fdda22509e695d6fd833024fdc:/Twig/PackTokenParser.php

diff --git a/Twig/PackTokenParser.php b/Twig/PackTokenParser.php
index 8218ee1..54133cf 100644
--- a/Twig/PackTokenParser.php
+++ b/Twig/PackTokenParser.php
@@ -3,7 +3,7 @@
 namespace Rapsys\PackBundle\Twig;
 
 use Symfony\Component\HttpKernel\Config\FileLocator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Asset\Packages;
 
 class PackTokenParser extends \Twig_TokenParser {
 	private $tag;
@@ -13,18 +13,41 @@ class PackTokenParser extends \Twig_TokenParser {
 	 *
 	 * @param class		$fileLocator		The FileLocator instance
 	 * @param class		$assetsPackages		The Assets Packages instance
-	 * @param string	$prefix			The prefix path
+	 * @param string	$config			The config path
 	 * @param string	$tag			The tag name
 	 * @param string	$output			The default output string
-	 * @param string	$tool			The tool path
+	 * @param array		$filters		The default filters array
 	 */
-	public function __construct(FileLocator $fileLocator, ContainerInterface $containerInterface, $prefix, $tag, $output, $tool = null) {
+	public function __construct(FileLocator $fileLocator, Packages $assetsPackages, $config, $tag, $output, $filters) {
 		$this->fileLocator		= $fileLocator;
-		$this->containerInterface	= $containerInterface;
-		$this->prefix			= $prefix;
+		$this->assetsPackages		= $assetsPackages;
+
+		//Set prefix
+		$this->prefix			= $config['prefix'];
+
+		//Set name
+		$this->name			= $config['name'];
+
+		//Set scheme
+		$this->scheme			= $config['scheme'];
+
+		//Set timeout
+		$this->timeout			= $config['timeout'];
+
+		//Set agent
+		$this->agent			= $config['agent'];
+
+		//Set redirect
+		$this->redirect			= $config['redirect'];
+
+		//Set tag
 		$this->tag			= $tag;
+
+		//Set output
 		$this->output			= $output;
-		$this->tool			= $tool;
+
+		//Set filters
+		$this->filters			= $filters;
 	}
 
 	public function getTag() {
@@ -36,9 +59,9 @@ class PackTokenParser extends \Twig_TokenParser {
 		$stream = $this->parser->getStream();
 
 		$inputs = array();
-		$filters = array();
-		$name = 'asset_url';
+		$name = $this->name;
 		$output = $this->output;
+		$filters = $this->filters;
 
 		$content = '';
 
@@ -46,7 +69,7 @@ class PackTokenParser extends \Twig_TokenParser {
 			if ($stream->test(\Twig_Token::STRING_TYPE)) {
 				// '@jquery', 'js/src/core/*', 'js/src/extra.js'
 				$inputs[] = $stream->next()->getValue();
-			} elseif ($stream->test(\Twig_Token::NAME_TYPE, 'filter')) {
+			} elseif ($stream->test(\Twig_Token::NAME_TYPE, 'filters')) {
 				// filter='yui_js'
 				$stream->next();
 				$stream->expect(\Twig_Token::OPERATOR_TYPE, '=');
@@ -63,7 +86,7 @@ class PackTokenParser extends \Twig_TokenParser {
 				$name = $stream->expect(\Twig_Token::STRING_TYPE)->getValue();
 			} else {
 				$token = $stream->getCurrent();
-				throw new \Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', \Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $stream->getFilename());
+				throw new \Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', \Twig_Token::typeToEnglish($token->getType()), $token->getValue()), $token->getLine(), $stream->getSourceContext());
 			}
 		}
 
@@ -75,7 +98,7 @@ class PackTokenParser extends \Twig_TokenParser {
 
 		//Replace star with sha1
 		if (($pos = strpos($output, '*')) !== false) {
-			#XXX: assetic code : substr(sha1(serialize($inputs).serialize($filters).serialize($options)), 0, 7)
+			#XXX: assetic code: substr(sha1(serialize($inputs).serialize($filters).serialize($options)), 0, 7)
 			$output = substr($output, 0, $pos).sha1(serialize($inputs).serialize($filters)).substr($output, $pos + 1);
 		}
 
@@ -83,17 +106,23 @@ class PackTokenParser extends \Twig_TokenParser {
 		for($k = 0; $k < count($inputs); $k++) {
 			//Deal with generic url
 			if (strpos($inputs[$k], '//') === 0) {
-				//TODO: set this as a parameter (scheme)
-				$inputs[$k] = 'https:'.$inputs[$k];
+				//Fix url
+				$inputs[$k] = $this->scheme.substr($inputs[$k], 2);
 			//Deal with non url path
 			} elseif (strpos($inputs[$k], '://') === false) {
 				//Check if we have a bundle path
 				if ($inputs[$k][0] == '@') {
+					//Check that we don't have only a path
 					if (($pos = strpos($inputs[$k], '/')) === false) {
-						throw new \Twig_Error_Syntax(sprintf('Invalid input path "%s"', $inputs[$k]), $token->getLine(), $stream->getFilename());
+						#TODO: @jquery support (if we really want it)
+						#header('Content-Type: text/plain');
+						#var_dump($inputs);
+						#if ($inputs[0] == '@jquery') {
+						#	exit;
+						#}
+						throw new \Twig_Error_Syntax(sprintf('Invalid input path "%s"', $inputs[$k]), $token->getLine(), $stream->getSourceContext());
 					}
-					//Extract prefix
-					#$inputs[$k] = $this->kernel->locateResource(substr($inputs[$k], 0, $pos)).substr($inputs[$k], $pos + 1);
+					//Resolve bundle prefix
 					$inputs[$k] = $this->fileLocator->locate(substr($inputs[$k], 0, $pos)).substr($inputs[$k], $pos + 1);
 				}
 				//Deal with globs
@@ -103,7 +132,7 @@ class PackTokenParser extends \Twig_TokenParser {
 					//Check that these are working files
 					foreach($replacement as $input) {
 						if (!is_file($input)) {
-							throw new \Twig_Error_Syntax(sprintf('Input path "%s" from "%s" is not a file', $input, $inputs[$k]), $token->getLine(), $stream->getFilename());
+							throw new \Twig_Error_Syntax(sprintf('Input path "%s" from "%s" is not a file', $input, $inputs[$k]), $token->getLine(), $stream->getSourceContext());
 						}
 					}
 					//Replace with glob path
@@ -112,89 +141,93 @@ class PackTokenParser extends \Twig_TokenParser {
 					$k += count($replacement) - 1;
 				//Check that it's a file
 				} elseif (!is_file($inputs[$k])) {
-					throw new \Twig_Error_Syntax(sprintf('Input path "%s" is not a file', $inputs[$k]), $token->getLine(), $stream->getFilename());
+					throw new \Twig_Error_Syntax(sprintf('Input path "%s" is not a file', $inputs[$k]), $token->getLine(), $stream->getSourceContext());
 				}
 			}
 		}
 
-		//Retrieve files content
-		foreach($inputs as $input) {
-			//Set timeout
-			$ctx = stream_context_create(
-				array(
-					'http' => array(
-						'timeout' => 5
-					)
+		//Init context
+		$ctx = stream_context_create(
+			array(
+				'http' => array(
+					'timeout' => $this->timeout,
+					'user_agent' => $this->agent,
+					'redirect' => $this->redirect,
 				)
-			);
-			//Try to retrieve content
-			if (($data = file_get_contents($input, false, $ctx)) === false) {
-				throw new \Twig_Error_Syntax(sprintf('Unable to retrieve input path "%s"', $input), $token->getLine(), $stream->getFilename());
+			)
+		);
+
+		//Check inputs
+		if (!empty($inputs)) {
+			//Retrieve files content
+			foreach($inputs as $input) {
+				//Try to retrieve content
+				if (($data = file_get_contents($input, false, $ctx)) === false) {
+					throw new \Twig_Error_Syntax(sprintf('Unable to retrieve input path "%s"', $input), $token->getLine(), $stream->getSourceContext());
+				}
+				//Append content
+				$content .= $data;
 			}
-			//Append content
-			$content .= $data;
+		} else {
+			#TODO: trigger error about empty inputs ?
 		}
 
-		//Use tool
-		if (!empty($this->tool) && is_executable($this->tool)) {
-			$descriptorSpec = array(
-				0 => array('pipe', 'r'),
-				1 => array('pipe', 'w'),
-				2 => array('pipe', 'w')
-			);
-			if (is_resource($proc = proc_open($this->tool, $descriptorSpec, $pipes))) {
-				//Set stderr as non blocking
-				stream_set_blocking($pipes[2], 0);
-				//Send content to stdin
-				fwrite($pipes[0], $content);
-				//Close stdin
-				fclose($pipes[0]);
-				//Read content from stdout
-				if ($stdout = stream_get_contents($pipes[1])) {
-					$content = $stdout;
-				}
-				//Close stdout
-				fclose($pipes[1]);
-				//Read content from stderr
-				if ($stderr = stream_get_contents($pipes[2])) {
-					throw new \Twig_Error_Syntax(sprintf('Got unexpected strerr for %s: %s', $this->tool, $stderr), $token->getLine(), $stream->getFilename());
-				}
-				//Close stderr
-				fclose($pipes[2]);
-				//Close process
-				if ($ret = proc_close($proc)) {
-					throw new \Twig_Error_Syntax(sprintf('Got unexpected non zero return code %s: %d', $this->tool, $ret), $token->getLine(), $stream->getFilename());
+		//Check filters
+		if (!empty($filters)) {
+			//Apply all filters
+			foreach($filters as $filter) {
+				//Init args
+				$args = array($stream->getSourceContext(), $token->getLine());
+				//Check if args is available
+				if (!empty($filter['args'])) {
+					//Append args if provided
+					$args += $filter['args'];
 				}
+				//Init reflection
+				$reflection = new \ReflectionClass($filter['class']);
+				//Set instance args
+				$tool = $reflection->newInstanceArgs($args);
+				//Process content
+				$content = $tool->process($content);
+				//Remove object
+				unset($tool, $reflection);
 			}
+		} else {
+			#TODO: trigger error about empty filters ?
 		}
 
 		//Create output dir on demand
 		if (!is_dir($parent = $dir = dirname($this->prefix.$output))) {
-			//XXX: set as 0777, symfony umask (0022) will reduce rights (0755)
-			mkdir($dir, 0777, true);
+			try {
+				//XXX: set as 0777, symfony umask (0022) will reduce rights (0755)
+				mkdir($dir, 0777, true);
+			} catch (\Exception $e) {
+				throw new \Twig_Error_Syntax(sprintf('Unable to create directory: %s', $dir), $token->getLine(), $stream->getSourceContext());
+			}
 		}
 
 		//Send file content
-		//TODO: see if atomic rotation is really necessary ?
-		//XXX: version management is done via rapsys_pack configuration atomic should be useless
-		//TODO: implement asset versionning or re-use internal functions
+		//XXX: atomic rotation is required to avoid partial content in reverse cache
 		if (file_put_contents($this->prefix.$output.'.new', $content) === false) {
-			throw new \Twig_Error_Syntax(sprintf('Unable to write to: %s', $prefix.$output.'.new'), $token->getLine(), $stream->getFilename());
+			throw new \Twig_Error_Syntax(sprintf('Unable to write to: %s', $prefix.$output.'.new'), $token->getLine(), $stream->getSourceContext());
 		}
 
 		//Remove old file
 		if (is_file($this->prefix.$output) && unlink($this->prefix.$output) === false) {
-			throw new \Twig_Error_Syntax(sprintf('Unable to unlink: %s', $prefix.$output), $token->getLine(), $stream->getFilename());
+			throw new \Twig_Error_Syntax(sprintf('Unable to unlink: %s', $prefix.$output), $token->getLine(), $stream->getSourceContext());
 		}
 
 		//Rename it
 		if (rename($this->prefix.$output.'.new', $this->prefix.$output) === false) {
-			throw new \Twig_Error_Syntax(sprintf('Unable to rename: %s to %s', $prefix.$output.'.new', $prefix.$output), $token->getLine(), $stream->getFilename());
+			throw new \Twig_Error_Syntax(sprintf('Unable to rename: %s to %s', $prefix.$output.'.new', $prefix.$output), $token->getLine(), $stream->getSourceContext());
 		}
 
 		//Retrieve asset uri
-		if (($output = $this->containerInterface->get('assets.packages')->getUrl($output, 'rapsys_pack')) === false) {
-			throw new \Twig_Error_Syntax(sprintf('Unable to get url for asset: %s with package %s', $output, 'rapsys_pack'), $token->getLine(), $stream->getFilename());
+		//XXX: was next line to support module specific asset configuration
+		#if (($output = $this->assetsPackages->getUrl($output, 'rapsys_pack')) === false) {
+		if (($output = $this->assetsPackages->getUrl($output)) === false) {
+			#throw new \Twig_Error_Syntax(sprintf('Unable to get url for asset: %s with package %s', $output, 'rapsys_pack'), $token->getLine(), $stream->getSourceContext());
+			throw new \Twig_Error_Syntax(sprintf('Unable to get url for asset: %s', $output), $token->getLine(), $stream->getSourceContext());
 		}
 
 		//Send pack node