Skip to content

Allow attempts to load files that don't exist #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatthewDarling wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow attempts to load files that don't exist #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
614bd38
Add test for support of missing files
Mar 31, 2016
6e21272
Return nil for files that don't exist
Mar 31, 2016
149229b
New test case for mix of existing/missing files
Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/immuconf/config.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
(:require [clojure.walk :as w]
[clojure.edn :as edn]
[clojure.string :as s]
[clojure.java.io :as java.io]
[clojure.tools.logging :as log]))

(ns-unmap *ns* 'Override)
Expand Down Expand Up @@ -75,7 +76,9 @@
given filename and the resulting config "
[file]
(try
[file (edn/read-string {:readers *data-readers*} (slurp file))]
(let [file-as-file (java.io/as-file file)]
(when (.exists file-as-file)
[file (edn/read-string {:readers *data-readers*} (slurp file-as-file))]))
(catch Throwable t
(throw (ex-info (format "Error loading config file: %s" file)
{:file file} t)))))
Expand Down
9 changes: 9 additions & 0 deletions test/immuconf/config_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@
(System/setProperty "user.home" (str (System/getProperty "user.dir") "/test"))
(is (cfg/load "~/fixtures/test-a.edn")))

(deftest missing-files-are-allowed
(is (= (cfg/load "test/fixtures/test-a.edn"
"test/fixtures/this-file-does-not-exist.edn"
"test/fixtures/test-b.edn")
{:a {:b {:c 1 :d 2}}})
"Missing files are treated as empty maps")
(is (= {} (cfg/load "test/fixtures/this-file-does-not-exist.edn"
"test/fixtures/another-missing-file.edn"))
"If all files are missing, the config is an empty map"))