Load previously precompiled assets. Fixed bug in new file scanning. F…

…ixed string based dieter config options

dieter-core/src/dieter/asset.clj

@@ -37,7 +37,7 @@ Contents can be a String, StringBuilder, or byte[]"))
       (let [new-content (f file)]
         (dosync
          (swap! memoized assoc filename {:content new-content
-                                         :timestamp (time/now)}))
+                                         :timestamp current-timestamp}))
         new-content))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;

dieter-core/src/dieter/core.clj

@@ -62,6 +62,7 @@
   (settings/with-options options
     (if (settings/production?)
       (-> app
+          (precompile/load-precompiled-assets)
           (wrap-file (settings/cache-root))
           (asset-builder options)
           (wrap-file-expires-never (settings/cache-root))

dieter-core/src/dieter/precompile.clj

@@ -15,6 +15,7 @@
   "Load any assets already in the cache directory"
   []
   (->> (settings/cache-root)
+       io/file
        file-seq
        flatten
        (remove #(.isDirectory %))

lein-dieter-precompile/src/leiningen/dieter_precompile.clj

@@ -3,30 +3,19 @@
   (:require [clojure.string :as string]
             [leiningen.core.eval :as eval]))
 
-(defn ns-resolve-string
-  "Given a string "
-  [ns-string]
-  `(let [pair# (map symbol (string/split ~ns-string #"/"))
-         ns# (first pair#)
-         sym# (second pair#)]
-     (require ns#)
-     @(ns-resolve ns# sym#)))
+(defn eval-opt [project opt]
+  (eval/eval-in-project project `(var-get (resolve (symbol ~opt))) `(require (symbol (namespace (symbol ~opt))))))
 
-(defn resolve-dieter-options [opt]
-  `(let [opt# ~opt]
-     (cond
-      (map? opt#) opt#
-      (string? opt#) (let [val# ~(ns-resolve-string opt)]
-                       (cond
-                        (map? val#) val#
-                        (fn? val#) (val#))))))
+(defn resolve-dieter-options [project opt]
+  (cond
+   (map? opt) opt
+   (string? opt) (eval-opt project opt)))
 
 (defn dieter-precompile
   [project]
-  (let [options (:dieter-options project)
-        options (->> project
-                     :dieter-options
-                     resolve-dieter-options)]
+  (let [option-param (:dieter-options project)
+        options (resolve-dieter-options project option-param)]
+    (println (nil? options))
     (println "options=" options)
     (eval/eval-in-project
      project