Refactoring code

killme2008 · Oct 25, 2012 · e24e662 · e24e662
1 parent 13b007d
commit e24e662
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/ring/velocity/core.clj b/src/ring/velocity/core.clj
@@ -7,27 +7,27 @@
         compojure.core)
   (:use [clojure.java.io :only [resource reader]]))
 
-(def ^{:dynamic true :private true} VELOCITY-PROPS "ring-velocity.properties")
+(def ^{:dynamic true :private true :constant true} velocity-props "ring-velocity.properties")
 
 (defn- ^{:tag Properties} get-default-properties []
   (let [props (Properties.)]
     (.load props (reader (resource "default/velocity.properties")))
     props))
 
 ;;initialize velocity
-(if-let [r (resource VELOCITY-PROPS)]
+(if-let [r (resource velocity-props)]
   (let [props (Properties.)]
     (do (.load props (reader r)) (Velocity/init props)))
   (Velocity/init (get-default-properties)))
 
 (defn- ^{:tag VelocityContext} ->context [kvs]
-    "Convert a map to a velocity context instance"
+  "Convert a vector of key/value pairs to a velocity context instance"
-    (let [^VelocityContext ctx (VelocityContext.)]
+  (let [^VelocityContext ctx (VelocityContext.)]
-      (loop [[k v & r] kvs]
+    (loop [[k v & r] kvs]
-        (.put ctx (name k) v)
+      (.put ctx (name k) v)
-        (when r
+      (when r
-          (recur r)))
+        (recur r)))
-      ctx))
+    ctx))
 
 (defprotocol ^{:doc "Template render protocol"}
   TemplateRender
@@ -44,7 +44,7 @@
                  (.toString sw))
                (throw (RuntimeException. (format "could not find template named `%s`" tname)))))))
 
-(def ^:private *velocity-render (VelocityRender.))
+(def ^{:private true :dynamic true} *render (VelocityRender.))
 
 (defn render
   [tname & kvs]
@@ -54,7 +54,7 @@
 
   :name and :age are the variables in template.
   "
-  (render-template *velocity-render tname kvs))
+  (render-template *render tname kvs))
 
 (defn- add-wildcard
   "Add a wildcard to the end of a route path."