From 5a644a92d2df7e146cf6fbd50ad9a078a232c134 Mon Sep 17 00:00:00 2001 From: gered Date: Fri, 20 Jun 2014 09:45:02 -0400 Subject: [PATCH] update the way JtwigTemplates are created so the JtwigConfiguration object can be passed in for each case --- src/clojure/clj_jtwig/core.clj | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/clojure/clj_jtwig/core.clj b/src/clojure/clj_jtwig/core.clj index 87a892e..cfc3870 100644 --- a/src/clojure/clj_jtwig/core.clj +++ b/src/clojure/clj_jtwig/core.clj @@ -5,7 +5,7 @@ (com.lyncode.jtwig.configuration JtwigConfiguration) (com.lyncode.jtwig.render RenderContext) (com.lyncode.jtwig.render.config RenderConfiguration) - (com.lyncode.jtwig.resource ClasspathJtwigResource) + (com.lyncode.jtwig.resource ClasspathJtwigResource StringJtwigResource FileJtwigResource) (java.io File FileNotFoundException ByteArrayOutputStream) (java.net URL)) (:require [clojure.walk :refer [stringify-keys]]) @@ -41,20 +41,22 @@ (defonce compiled-templates (atom {})) (defn- compile-template-string [^String contents] - (->> contents - (new JtwigTemplate) - (.compile))) + (-> contents + (StringJtwigResource.) + (JtwigTemplate. configuration) + (.compile))) (defn- compile-template-file [^File file] (if (inside-jar? file) - (->> (.getPath file) - (get-jar-resource-filename) - (new ClasspathJtwigResource) - (new JtwigTemplate) - (.compile)) - (->> file - (new JtwigTemplate) - (.compile)))) + (-> (.getPath file) + (get-jar-resource-filename) + (ClasspathJtwigResource.) + (JtwigTemplate. configuration) + (.compile)) + (-> file + (FileJtwigResource.) + (JtwigTemplate. configuration) + (.compile)))) (defn- newer? [^File file other-timestamp] (let [file-last-modified (get-file-last-modified file)]