Merge pull request #36 from gushphp/kalypso63-master

Adds support for variable path on twig tag inlinecss

Author: cordoval

README.md

@@ -98,6 +98,26 @@ Paths relative to bundle are supported as well:
 </div>
 {% endinlinecss %}
 ```
+Dynamic variable is supported (Use absolute path with variable with asset or directly with full path to file)
+
+``` html
+{% set path = asset('css/email.css', null, true) %}
+{% inlinecss path %}
+<div class="foo">
+...
+</div>
+{% endinlinecss %}
+```
+Dynamic variable is supported (Use absolute path with variable with asset or directly with full path to file)
+
+``` html
+{% set path = asset('css/email.css', null, true) %}
+{% inlinecss path %}
+<div class="foo">
+...
+</div>
+{% endinlinecss %}
+```
 
 Read the docs in the files for further details on the usage of the service.
 

Twig/InlineCssNode.php

@@ -25,16 +25,29 @@ public function __construct(\Twig_Node $body, $css, $lineno = 0, $debug, $tag =
 
     public function compile(Twig_Compiler $compiler)
     {
-        if ($this->debug) {
-            $css = sprintf("file_get_contents('%s')", $this->getAttribute('css'));
+        if (is_string($this->getAttribute('css'))) {
+            if ($this->debug) {
+                $css = sprintf("file_get_contents('%s')", $this->getAttribute('css'));
+            } else {
+                $css = '"' . addslashes(file_get_contents($this->getAttribute('css'))) . '"';
+            }
+            $compiler->addDebugInfo($this)
+                ->write("ob_start();\n")
+                ->subcompile($this->getNode('body'))
+                ->write(sprintf('echo $context["inlinecss"]->inlineCSS(ob_get_clean(), %s);' . "\n", $css))
+            ;
         } else {
-            $css = '"' . addslashes(file_get_contents($this->getAttribute('css'))) . '"';
+            //get path of css
+            $compiler
+                ->addDebugInfo($this)
+                ->write("ob_start();\n")
+                ->write('$css = addslashes(file_get_contents(')
+                ->subcompile($this->getAttribute('css'))
+                ->raw('));')
+                ->subcompile($this->getNode('body'))
+                ->write('echo $context["inlinecss"]->inlineCSS(ob_get_clean(), $css);' . "\n")
+            ;
         }
 
-        $compiler->addDebugInfo($this)
-            ->write("ob_start();\n")
-            ->subcompile($this->getNode('body'))
-            ->write(sprintf('echo $context["inlinecss"]->inlineCSS(ob_get_clean(), %s);' . "\n", $css))
-        ;
     }
 }

Twig/InlineCssParser.php

@@ -56,12 +56,16 @@ public function parse(Twig_Token $token)
     {
         $lineNo = $token->getLine();
         $stream = $this->parser->getStream();
-        $path = $stream->expect(Twig_Token::STRING_TYPE)->getValue();
+        if ($stream->test(Twig_Token::STRING_TYPE)) {
+            $css = $this->resolvePath($stream->expect(Twig_Token::STRING_TYPE)->getValue());
+        } else {
+            $css = $this->parser->getExpressionParser()->parseExpression();
+        }
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
         $body = $this->parser->subparse(array($this, 'decideEnd'), true);
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
-        return new InlineCssNode($body, $this->resolvePath($path), $lineNo, $this->debug);
+        return new InlineCssNode($body, $css, $lineNo, $this->debug);
     }
 
     /**
@@ -90,7 +94,7 @@ private function resolvePath($path)
             return $this->locator->locate($path, $this->webRoot);
         } catch (\InvalidArgumentException $e) {
             // happens when path is not bundle relative
-            return $this->webRoot.'/'.$path;
+            return $this->webRoot . '/' . $path;
         }
     }
-}
+}