Refactor memoization for easier benchmarking

edgecase · Jan 4, 2013 · a6ac981 · a6ac981
1 parent 6e32fce
commit a6ac981
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/dieter-core/src/dieter/asset.clj b/dieter-core/src/dieter/asset.clj
@@ -34,7 +34,7 @@ Contents can be a String, StringBuilder, or byte[]"))
       saved-content
 
       ;; compute new value and save it
-      (let [new-content (f)]
+      (let [new-content (f file)]
         (dosync
          (swap! memoized assoc filename {:content new-content
                                          :timestamp (time/now)}))

diff --git a/dieter-core/src/dieter/asset/coffeescript.clj b/dieter-core/src/dieter/asset/coffeescript.clj
@@ -6,12 +6,14 @@
 
 (def pool (pools/make-pool))
 
+(defn compile-coffeescript [file]
+  (run-compiler pool
+                ["coffee-script.js" "coffee-wrapper.js"]
+                "compileCoffeeScript"
+                file))
+
 (defn preprocess-coffeescript [file]
-  (asset/memoize-file file
-                      #(run-compiler pool
-                                     ["coffee-script.js" "coffee-wrapper.js"]
-                                     "compileCoffeeScript"
-                                     file)))
+  (asset/memoize-file file compile-coffeescript))
 
 (defrecord Coffee [file]
   dieter.asset.Asset

diff --git a/dieter-core/src/dieter/asset/hamlcoffee.clj b/dieter-core/src/dieter/asset/hamlcoffee.clj
@@ -6,18 +6,20 @@
 
 (def pool (pools/make-pool))
 
+(defn compile-coffeescript [file]
+  (run-compiler pool
+                ["coffee-script.js"
+                 ;; imported direct from https://raw.github.com/netzpirat/haml-coffee/master/dist/compiler/hamlcoffee.js
+                 "hamlcoffee.js"
+                 "haml_coffee_assets-rhino-fix.js"
+                 ;; imported direct from https://raw.github.com/netzpirat/haml_coffee_assets/master/lib/js/haml_coffee_assets.js
+                 "haml_coffee_assets.js"
+                 "hamlcoffee-wrapper.js"]
+                "compileHamlCoffee"
+                file))
+
 (defn preprocess-hamlcoffee [file]
-  (asset/memoize-file file
-                #(run-compiler pool
-                               ["coffee-script.js"
-                                ;; imported direct from https://raw.github.com/netzpirat/haml-coffee/master/dist/compiler/hamlcoffee.js
-                                "hamlcoffee.js"
-                                "haml_coffee_assets-rhino-fix.js"
-                                ;; imported direct from https://raw.github.com/netzpirat/haml_coffee_assets/master/lib/js/haml_coffee_assets.js
-                                "haml_coffee_assets.js"
-                                "hamlcoffee-wrapper.js"]
-                               "compileHamlCoffee"
-                               file)))
+  (asset/memoize-file file compile-coffeescript))
 
 (defrecord HamlCoffee [file]
   dieter.asset.Asset