reorganizing the twig pattern engine rule

Author: dmolsen

src/PatternLab/PatternEngine/Twig/PatternEngineRule.php

@@ -0,0 +1,67 @@
+<?php
+
+/*!
+ * Twig Pattern Engine Rule Class
+ *
+ * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
+ * Licensed under the MIT license
+ *
+ * If the test matches "twig" it will return an instance of the Twig Pattern Engine
+ *
+ */
+
+namespace PatternLab\PatternEngine\Twig;
+
+use \PatternLab\Config;
+use \PatternLab\PatternEngine\Twig\PatternLoader;
+use \PatternLab\PatternEngine\Rule;
+
+class PatternEngineRule extends Rule {
+	
+	public function __construct() {
+		
+		parent::__construct();
+		
+		$this->engineProp = "twig";
+		
+	}
+	
+	/**
+	* Load a new Twig instance that uses the Pattern Loader
+	*
+	* @return {Object}       an instance of the Twig engine
+	*/
+	public function getPatternLoader($options = array()) {
+		
+		$twigLoader = new PatternLoader(Config::$options["patternSourceDir"],array("patternPaths" => $options["patternPaths"]));
+		
+		return new \Twig_Environment($twigLoader);
+		
+	}
+	
+	/**
+	* Load a new Twig instance that uses the File System Loader
+	*
+	* @return {Object}       an instance of the Twig engine
+	*/
+	public function getFileSystemLoader($options = array()) {
+		
+		$twigLoader = new Twig_Loader_Filesystem($options["templatePath"]);
+		
+		return new \Twig_Environment($twigLoader);
+		
+	}
+	
+	/**
+	* Load a new Twig instance that is just a vanilla Twig string rendering engine
+	*
+	* @return {Object}       an instance of the Twig engine
+	*/
+	public function getVanillaLoader($options = array()) {
+		
+		$twigLoader = new \Twig_Loader_String();
+		
+		return new \Twig_Environment($twigLoader);
+		
+	}
+}

src/PatternLab/TwigPatternEngine/TwigLoader.php renamed to src/PatternLab/PatternEngine/Twig/PatternLoader.php

@@ -13,9 +13,9 @@
 
 namespace PatternLab\TwigPatternEngine;
 
-use \PatternLab\PatternEngine\Loader;
+use \PatternLab\PatternEngine\Util;
 
-class TwigLoader implements \Twig_LoaderInterface, \Twig_ExistsLoaderInterface {
+class PatternLoader implements \Twig_LoaderInterface, \Twig_ExistsLoaderInterface {
 
 	/** Identifier of the main namespace. */
 	const MAIN_NAMESPACE = '__main__';
@@ -35,7 +35,10 @@ public function __construct($paths = array(),$patternPaths = array()) {
 			$this->setPaths($paths);
 		}
 		$options['patternPaths'] = $patternPaths['patternPaths'];
-		$this->patternLoader = new Loader($options);
+		
+		// load some extra functions to help with manipulating pattern info
+		$this->patternUtil = new Util($options);
+		
 	}
 
 	/**
@@ -165,9 +168,9 @@ public function isFresh($name, $time) {
 
 	protected function findTemplate($name) {
 
-		list($partialName,$styleModifier,$parameters) = $this->patternLoader->getPartialInfo($name);
+		list($partialName,$styleModifier,$parameters) = $this->patternUtil->getPartialInfo($name);
 
-		$name = $this->patternLoader->getFileName($partialName,$this->extension);
+		$name = $this->patternUtil->getFileName($partialName,$this->extension);
 
 		$name = $this->normalizeName($name);