From 0f450b36b3b0e6b14da989466fc16dd39b67a1d9 Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 2 Mar 2014 11:14:24 -0500 Subject: [PATCH] split up JtwigModelMap creation from JtwigContext creation --- src/clj_jtwig/core.clj | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/clj_jtwig/core.clj b/src/clj_jtwig/core.clj index 9895c6f..832b637 100644 --- a/src/clj_jtwig/core.clj +++ b/src/clj_jtwig/core.clj @@ -54,13 +54,18 @@ (.getContextClassLoader) (.getResource filename))) -(defn- make-context [model-map {:keys [skip-model-map-stringify?] :as options}] - (let [context (new JtwigContext (new JtwigModelMap) @functions)] - (doseq [[k v] (if-not skip-model-map-stringify? - (stringify-keys model-map) - model-map)] - (.set context k v)) - context)) +(defn- make-model-map [model-map-values {:keys [skip-model-map-stringify?] :as options}] + (let [model-map-obj (new JtwigModelMap) + values (if-not skip-model-map-stringify? + (stringify-keys model-map-values) + model-map-values)] + (doseq [[k v] values] + (.add model-map-obj k v)) + model-map-obj)) + +(defn- make-context [model-map options] + (let [model-map-obj (make-model-map model-map options)] + (new JtwigContext model-map-obj @functions))) (defn- render-template [template model-map & [options]]