Skip to content

Commit

Permalink
fix: folder and resouces are confused
Browse files Browse the repository at this point in the history
  • Loading branch information
shenfeng committed Dec 26, 2012
1 parent 9bb1bf8 commit bd124dc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/me/shenfeng/mustache.clj
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
(get-name f folder) (get-content f))) (get-name f folder) (get-content f)))
{} files)) {} files))


(defn- tmpls-from-rerouces [folder extentions] (defn- tmpls-from-folder [folder extentions]
(let [^File dir (if (instance? File folder) folder (File. ^String folder))] (let [^File dir (if (instance? File folder) folder (File. ^String folder))]
(get-tmpls (map str (get-tmpls (map str
(filter (filter
Expand All @@ -33,7 +33,7 @@
(file-seq dir))) (file-seq dir)))
(.getName dir)))) (.getName dir))))


(defn- tmpls-from-folder [folder extentions] (defn- tmpls-from-rerouces [folder extentions]
(get-tmpls (ResourceList/getResources folder extentions) folder)) (get-tmpls (ResourceList/getResources folder extentions) folder))


(defn- fn-name [n] ; app/search_result => app-search-result (defn- fn-name [n] ; app/search_result => app-search-result
Expand Down
2 changes: 1 addition & 1 deletion test/me/shenfeng/mustache_test.clj
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
(is (test2))) (is (test2)))


(deftest test-gen-tmpls-from-folder (deftest test-gen-tmpls-from-folder
(gen-tmpls-from-folder "mustache.clj" [".tpl"]) (gen-tmpls-from-folder "../mustache.clj" [".tpl"])
(is (test-test2 {})) ;; => test2.clj => test-test2 (is (test-test2 {})) ;; => test2.clj => test-test2
(is (test-test2)) (is (test-test2))
(is (test-test2))) (is (test-test2)))
Expand Down

0 comments on commit bd124dc

Please sign in to comment.