diff --git a/src/cryogen_core/compiler.clj b/src/cryogen_core/compiler.clj index c73dbf7..9bb7d89 100644 --- a/src/cryogen_core/compiler.clj +++ b/src/cryogen_core/compiler.clj @@ -44,17 +44,10 @@ looking under the implemented protocol's subdirectory, but fallsback to look at the templates directory." [root mu ignored-files] - ; TODO: Find assets in overlay location / move to new-io - (let [assets (cryogen-io/find-assets - (new-io/path "templates" (m/dir mu) root) - (m/ext mu) - ignored-files)] + (let [assets (new-io/find-assets (str "templates/" (m/dir mu)) [root] (m/ext mu) ignored-files)] (if (seq assets) assets - (cryogen-io/find-assets - (new-io/path "templates" root) - (m/ext mu) - ignored-files)))) + (new-io/find-assets "templates" [root] (m/ext mu) ignored-files)))) (defn find-posts "Returns a list of markdown files representing posts under the post root." diff --git a/test/cryogen_core/compiler_test.clj b/test/cryogen_core/compiler_test.clj index 0442b5f..c59257a 100644 --- a/test/cryogen_core/compiler_test.clj +++ b/test/cryogen_core/compiler_test.clj @@ -68,7 +68,7 @@ and more content. (let [entries (check-fn mu)] (is (= 1 (count entries))) (is (= (.getAbsolutePath (File. (str dir File/separator file))) - (.getAbsolutePath (first entries))))) + (.toString (.toAbsolutePath (:java-path (first entries))))))) (reset-resources))))))) (defmacro with-markup [mu & body]