Merge branch 'feature-patternloadersplit' into dev

Author: dmolsen

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

@@ -1,19 +1,21 @@
 <?php
 
 /*!
- * Mustache Pattern Engine Loader Class - Patterns
+ * Twig Pattern Engine Loader Class - Patterns
  *
  * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
  *
- * Sets an instance of Mustache to deal with rendering of patterns
+ * Sets an instance of Twig to deal with patterns. Tries to find
+ * files on system first. If not tries to load them as strings.
  *
  */
 
 namespace PatternLab\PatternEngine\Twig\Loaders;
 
 use \PatternLab\Config;
-use \PatternLab\PatternEngine\Twig\Loaders\Twig\PatternLoader as Twig_Loader_PatternLoader;
+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;
 
 class PatternLoader extends Loader {
@@ -24,9 +26,11 @@ class PatternLoader extends Loader {
 	public function __construct($options = array()) {
 
 		//default var
-		$patternSourceDir = Config::getOption("patternSourceDir");
-		$twigLoader       = new Twig_Loader_PatternLoader($patternSourceDir,array("patternPaths" => $options["patternPaths"]));
-		$this->instance   = new \Twig_Environment($twigLoader);
+		$patternSourceDir     = Config::getOption("patternSourceDir");
+		$patternPartialLoader = new Twig_Loader_PatternPartialLoader($patternSourceDir,array("patternPaths" => $options["patternPaths"]));
+		$patternStringLoader  = new \Twig_Loader_String();
+		$twigLoader           = new \Twig_Loader_Chain(array($patternPartialLoader, $patternStringLoader));
+		$this->instance       = new \Twig_Environment($twigLoader);
 
 	}
 

src/PatternLab/PatternEngine/Twig/Loaders/Twig/PatternLoader.php renamed to src/PatternLab/PatternEngine/Twig/Loaders/Twig/PatternPartialLoader.php

@@ -15,7 +15,7 @@
 
 use \PatternLab\PatternEngine\Util;
 
-class PatternLoader implements \Twig_LoaderInterface, \Twig_ExistsLoaderInterface {
+class PatternPartialLoader implements \Twig_LoaderInterface, \Twig_ExistsLoaderInterface {
 
 	/** Identifier of the main namespace. */
 	const MAIN_NAMESPACE = '__main__';