Added a setLoader method

PebbleTemplates · Dec 18, 2013 · 1e3f09b · 1e3f09b
1 parent be00e2f
commit 1e3f09b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/com/mitchellbosecke/pebble/PebbleEngine.java b/src/main/java/com/mitchellbosecke/pebble/PebbleEngine.java
@@ -45,7 +45,7 @@ public class PebbleEngine {
 	/*
 	 * Major components
 	 */
-	private final Loader loader;
+	private Loader loader;
 	private final Parser parser;
 	private final Lexer lexer;
 	private final Compiler compiler;
@@ -83,8 +83,8 @@ public class PebbleEngine {
 	private Map<String, Operator> binaryOperators;
 	private Map<String, Filter> filters;
 	private Map<String, Test> tests;
-
-	public PebbleEngine() {
+	
+	public PebbleEngine(){
 		this(null);
 	}
 
@@ -118,6 +118,11 @@ public PebbleEngine(Loader loader) {
 	 * @throws LoaderException
 	 */
 	public PebbleTemplate loadTemplate(String templateName) throws SyntaxException, LoaderException, PebbleException {
+
+		if(this.loader == null){
+			throw new LoaderException("Loader has not yet been specified.");
+		}
+
 		String className = this.getTemplateClassName(templateName);
 		PebbleTemplate instance;
 
@@ -185,6 +190,10 @@ private String compile(Node node) {
 		return getCompiler().compile(node).getSource();
 	}
 
+	public void setLoader(Loader loader){
+		this.loader = loader;
+	}
+
 	public Loader getLoader() {
 		return loader;
 	}

diff --git a/src/main/java/com/mitchellbosecke/pebble/loader/PebbleDefaultLoader.java b/src/main/java/com/mitchellbosecke/pebble/loader/PebbleDefaultLoader.java
@@ -52,7 +52,7 @@ public String getSource(String templateName) throws LoaderException {
 		return source;
 	}
 
-	private Reader getReader(String templateName) throws LoaderException {
+	protected Reader getReader(String templateName) throws LoaderException {
 
 		Reader reader = readerCache.containsKey(templateName) ? readerCache.get(templateName) : null;