Merge branch 'dev'

Author: dmolsen

composer.json

@@ -1,5 +1,5 @@
 {
-	"name":             "pattern-lab/patternengine-php-twig",
+	"name":             "pattern-lab/patternengine-twig",
 	"description":      "Twig-based Pattern Engine for the PHP version of Pattern Lab",
 	"keywords":         ["twig", "pattern lab", "pattern engine"],
 	"homepage":         "http://patternlab.io",
@@ -20,7 +20,7 @@
 	},
 	"autoload": {
 		"psr-0": {
-			"PatternLab\\TwigPatternEngine": "src/"
+			"PatternLab\\PatternEngine\\Twig": "src/"
 		}
 	},
 	"require": {

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

@@ -0,0 +1,41 @@
+<?php
+
+/*!
+ * Twig Pattern Engine Loader Class - Filesystem
+ *
+ * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
+ * Licensed under the MIT license
+ *
+ * Sets an instance of Twig to deal with rendering of templates that aren't patterns
+ *
+ */
+
+namespace PatternLab\PatternEngine\Twig\Loaders;
+
+use \PatternLab\PatternEngine\Loader;
+
+class FilesystemLoader extends Loader {
+	
+	/**
+	* Load a new Twig instance that uses the File System Loader
+	*/
+	public function __construct($options = array()) {
+		
+		$twigLoader     = new \Twig_Loader_Filesystem(array($options["templatePath"],$options["partialsPath"]));
+		$this->instance = new \Twig_Environment($twigLoader);
+		
+	}
+	
+	/**
+	* Render a template
+	* @param  {Array}        the options to be rendered by Twig
+	*
+	* @return {String}       the rendered result
+	*/
+	public function render($options = array()) {
+		
+		return $this->instance->render($options["template"], $options["data"]);
+		
+	}
+	
+}

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

@@ -0,0 +1,45 @@
+<?php
+
+/*!
+ * Mustache 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
+ *
+ */
+
+namespace PatternLab\PatternEngine\Twig\Loaders;
+
+use \PatternLab\Config;
+use \PatternLab\PatternEngine\Twig\Loaders\Twig\PatternLoader as Twig_Loader_PatternLoader;
+use \PatternLab\PatternEngine\Loader;
+
+class PatternLoader extends Loader {
+	
+	/**
+	* Load a new Twig instance that uses the Pattern 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);
+		
+	}
+	
+	/**
+	* Render a pattern
+	* @param  {Array}        the options to be rendered by Twig
+	*
+	* @return {String}       the rendered result
+	*/
+	public function render($options = array()) {
+		
+		return $this->instance->render($options["pattern"], $options["data"]);
+		
+	}
+	
+}

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

@@ -0,0 +1,41 @@
+<?php
+
+/*!
+ * Twig Pattern Engine Loader Class - String
+ *
+ * Copyright (c) 2014 Dave Olsen, http://dmolsen.com
+ * Licensed under the MIT license
+ *
+ * Sets an instance of Twig to deal with rendering of strings
+ *
+ */
+
+namespace PatternLab\PatternEngine\Twig\Loaders;
+
+use \PatternLab\PatternEngine\Loader;
+
+class StringLoader extends Loader {
+	
+	/**
+	* Load a new Twig instance that is just a vanilla Twig rendering engine for strings
+	*/
+	public function __construct($options = array()) {
+		
+		$twigLoader     = new \Twig_Loader_String();
+		$this->instance = new \Twig_Environment($twigLoader);
+		
+	}
+	
+	/**
+	* Render a string
+	* @param  {Array}        the options to be rendered by Twig
+	*
+	* @return {String}       the rendered result
+	*/
+	public function render($options = array()) {
+		
+		return $this->instance->render($options["string"], $options["data"]);
+		
+	}
+	
+}

…Lab/PatternEngine/Twig/PatternLoader.php …gine/Twig/Loaders/Twig/PatternLoader.phpsrc/PatternLab/PatternEngine/Twig/PatternLoader.php renamed to src/PatternLab/PatternEngine/Twig/Loaders/Twig/PatternLoader.php src/PatternLab/PatternEngine/Twig/PatternLoader.php renamed to src/PatternLab/PatternEngine/Twig/Loaders/Twig/PatternLoader.php

@@ -12,8 +12,6 @@
 
 namespace PatternLab\PatternEngine\Twig;
 
-use \PatternLab\Config;
-use \PatternLab\PatternEngine\Twig\PatternLoader;
 use \PatternLab\PatternEngine\Rule;
 
 class PatternEngineRule extends Rule {
@@ -23,48 +21,8 @@ public function __construct() {
 		parent::__construct();
 
 		$this->engineProp = "twig";
+		$this->basePath   = "\PatternLab\PatternEngine\Twig";
 
 	}
 
-	/**
-	* Load a new Twig instance that uses the Pattern Loader
-	*
-	* @return {Object}       an instance of the Twig engine
-	*/
-	public function getPatternLoader($options = array()) {
-		
-		//default var
-		$patternSourceDir = Config::getOption("patternSourceDir");
-		
-		$twigLoader = new PatternLoader($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(array($options["templatePath"],$options["partialsPath"]));
-		
-		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);
-		
-	}
 }