gered/clj-jtwig
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into java6

Browse source 
Conflicts:
	project.clj
This commit is contained in:
Gered 2014-03-04 16:56:44 -05:00
parent 5f54d25c41 17caf40f2a
commit 9400b70bdc
5 changed files with 50 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.clj
View file

@ -1,4 +1,4 @@
(defproject clj-jtwig-java6 "0.2"
(defproject clj-jtwig-java6 "0.2.1"
:description "Clojure wrapper for JTwig (Java 6 dependencies)"
:url "https://github.com/gered/clj-jtwig/tree/java6"
:license {:name "Apache License, Version 2.0"

16
src/clj_jtwig/core.clj
View file

@ -2,7 +2,8 @@
"wrapper functions for working with JTwig from clojure"
(:import (com.lyncode.jtwig JtwigTemplate JtwigContext JtwigModelMap)
(com.lyncode.jtwig.tree.api Content)
(java.io File FileNotFoundException ByteArrayOutputStream))
(java.io File FileNotFoundException ByteArrayOutputStream)
(java.net URL))
(:require [clojure.walk :refer [stringify-keys]])
(:use [clj-jtwig.functions]))
@ -128,10 +129,11 @@
[]
(reset! compiled-templates {}))
(defn- get-resource-path [filename]
(-> (Thread/currentThread)
(.getContextClassLoader)
(.getResource filename)))
(defn- get-resource-path
(^URL [^String filename]
(-> (Thread/currentThread)
(.getContextClassLoader)
(.getResource filename))))
(defn- make-model-map [model-map-values {:keys [skip-model-map-stringify?] :as options}]
(let [model-map-obj (new JtwigModelMap)
@ -165,7 +167,7 @@
(defn render-file
"renders a template from a file, using the values in model-map as the model for the template"
[filename model-map & [options]]
[^String filename model-map & [options]]
(let [file (new File filename)
compiled-template (compile-template! file)]
(render-compiled-template compiled-template model-map options)))
@ -173,6 +175,6 @@
(defn render-resource
"renders a template from a resource file, using the values in the model-map as the model for
the template."
[filename model-map & [options]]
[^String filename model-map & [options]]
(if-let [resource-filename (get-resource-path filename)]
(render-file (.getPath resource-filename) model-map options)))

9
src/clj_jtwig/functions.clj
View file

@ -1,6 +1,5 @@
(ns clj-jtwig.functions
"standard functions added to jtwig contexts by default. these are in addition to the
functions added by default in all jtwig function repository objects"
"custom template function/filter support functions."
(:import (com.lyncode.jtwig.functions JtwigFunction)
(com.lyncode.jtwig.functions.repository DefaultFunctionRepository)
(com.lyncode.jtwig.functions.exceptions FunctionNotFoundException FunctionException))
@ -41,7 +40,7 @@
[]
(reset! functions (create-function-repository)))
(defn function-exists? [name]
(defn function-exists? [^String name]
(try
(.retrieve @functions name)
true
@ -52,9 +51,9 @@
"adds a new template function under the name specified. templates can call the function by the
name specified (or one of the aliases specified) and passing in the same number of arguments
accepted by f. the return value of f is returned to the template."
([name f]
([^String name f]
(add-function! name nil f))
([name aliases f]
([^String name aliases f]
(let [handler (make-function-handler f)]
(.add @functions handler name (make-aliased-array aliases))
(.retrieve @functions name))))

3
src/clj_jtwig/standard_functions.clj
View file

@ -13,7 +13,8 @@
(defonce standard-functions
{"blankIfNull"
{:fn (fn [x]
(if (nil? x) "" x))}
(if (nil? x) "" x))
:aliases ["nonull"]}
"butlast"
{:fn (fn [sequence]

41
test/clj_jtwig/functions_test.clj
View file

@ -18,14 +18,14 @@
(is (valid-function-handler?
(deftwigfn "add" [a b]
(+ a b))))
(+ a b))))
(is (true? (function-exists? "add")))
(is (false? (function-exists? "foobar")))
(is (valid-function-handler?
(deftwigfn "add" [a b]
(+ a b))))
(+ a b))))
(is (= (render "{{add(1, 2)}}" nil)
"3")
@ -39,17 +39,42 @@
(reset-functions!)))
(testing "Custom template function aliases"
(do
(reset-functions!)
(is (valid-function-handler?
(defaliasedtwigfn "add" [a b]
["plus" "myAddFn"]
(+ a b))))
(is (true? (function-exists? "add")))
(is (true? (function-exists? "plus")))
(is (true? (function-exists? "myAddFn")))
(is (= (render "{{add(1, 2)}}" nil)
"3")
"calling a custom function by name")
(is (= (render "{{plus(1, 2)}}" nil)
"3")
"calling a custom function by alias")
(is (= (render "{{myAddFn(1, 2)}}" nil)
"3")
"calling a custom function by another alias")
(reset-functions!)))
(testing "Fixed and variable number of template function arguments"
(do
(reset-functions!)
(is (valid-function-handler?
(deftwigfn "add2" [a b]
(+ a b))))
(+ a b))))
(is (true? (function-exists? "add2")))
(is (valid-function-handler?
(deftwigfn "addAll" [& numbers]
(apply + numbers))))
(apply + numbers))))
(is (true? (function-exists? "addAll")))
(is (= (render "{{add2(1, 2)}}" nil)
@ -74,11 +99,11 @@
(is (valid-function-handler?
(deftwigfn "identity" [x]
x)))
x)))
(is (true? (function-exists? "identity")))
(is (valid-function-handler?
(deftwigfn "typename" [x]
(.getName (type x)))))
(.getName (type x)))))
(is (true? (function-exists? "typename")))
; verify that the clojure function recognizes the correct types when the variable is passed via the model-map
@ -250,7 +275,9 @@
(is (= (render "{{ a|blankIfNull }}" {:a nil})
""))
(is (= (render "{{ a|blankIfNull }}" {:a "foo"})
"foo")))
"foo"))
(is (= (render "{{ a|nonull }}" nil)
"")))
(testing "butlast"
(is (= (render "{{ [1, 2, 3, 4, 5]|butlast }}" nil)