adding macro support to loaders

Author: dmolsen

src/PatternLab/PatternEngine/Twig/Loaders/FilesystemLoader.php

@@ -12,7 +12,9 @@
 
 namespace PatternLab\PatternEngine\Twig\Loaders;
 
+use \PatternLab\Config;
 use \PatternLab\PatternEngine\Loader;
+use \PatternLab\PatternEngine\Twig\TwigUtil;
 
 class FilesystemLoader extends Loader {
 
@@ -23,6 +25,7 @@ public function __construct($options = array()) {
 
 		$twigLoader     = new \Twig_Loader_Filesystem(array($options["templatePath"],$options["partialsPath"]));
 		$this->instance = new \Twig_Environment($twigLoader);
+		$this->instance = TwigUtil::loadMacros($this->instance, "filesystem");
 
 	}
 
@@ -34,7 +37,7 @@ public function __construct($options = array()) {
 	*/
 	public function render($options = array()) {
 
-		return $this->instance->render($options["template"].".twig", $options["data"]);
+		return $this->instance->render($options["template"].".".Config::getOption("patternExtension"), $options["data"]);
 
 	}
 

src/PatternLab/PatternEngine/Twig/Loaders/PatternLoader.php

@@ -17,6 +17,7 @@
 use \PatternLab\PatternEngine\Twig\Loaders\Twig\PatternPartialLoader as Twig_Loader_PatternPartialLoader;
 use \PatternLab\PatternEngine\Twig\Loaders\Twig\PatternStringLoader as Twig_Loader_PatternStringLoader;
 use \PatternLab\PatternEngine\Loader;
+use \PatternLab\PatternEngine\Twig\TwigUtil;
 
 class PatternLoader extends Loader {
 
@@ -31,6 +32,7 @@ public function __construct($options = array()) {
 		$patternStringLoader  = new \Twig_Loader_String();
 		$twigLoader           = new \Twig_Loader_Chain(array($patternPartialLoader, $patternStringLoader));
 		$this->instance       = new \Twig_Environment($twigLoader);
+		$this->instance       = TwigUtil::loadMacros($this->instance, "pattern");
 
 	}
 

src/PatternLab/PatternEngine/Twig/Loaders/StringLoader.php

@@ -13,6 +13,7 @@
 namespace PatternLab\PatternEngine\Twig\Loaders;
 
 use \PatternLab\PatternEngine\Loader;
+use \PatternLab\PatternEngine\Twig\TwigUtil;
 
 class StringLoader extends Loader {
 
@@ -23,6 +24,7 @@ public function __construct($options = array()) {
 
 		$twigLoader     = new \Twig_Loader_String();
 		$this->instance = new \Twig_Environment($twigLoader);
+		$this->instance = TwigUtil::loadMacros($this->instance, "string");
 
 	}