add defaults to ENV macro

Author: niquola

README.md

@@ -160,7 +160,10 @@ or system env variables should be set - `export MY_VAR='value'`.
   :sym    #env-symbol ESYM
   :key    #env-keyword EKEY
   :num    #env-number ENUM}
-  :bool   #env-boolean BOOL}
+  :bool   #env-boolean BOOL
+  ;; or with defaults
+  :string #env [ESTR "Default"]
+  }
 ```
 
 ## Schema

src/zen/store.clj

@@ -263,35 +263,50 @@
   (:file (find-file&path ctx pth)))
 
 (defn get-env [env env-name]
-  (or (get env (keyword env-name))
-      (System/getenv (str env-name))))
+  (let [[env-name default] (if (vector? env-name)
+                             env-name
+                             [env-name nil])]
+    (or (get env (keyword env-name))
+        (System/getenv (str env-name))
+        default)))
 
 (defn env-string [env env-name]
   (when-let [v (get-env env env-name)]
     v))
 
 (defn env-integer [env env-name]
   (when-let [v (get-env env env-name)]
-    (Integer/parseInt v)))
+    (if (number? v)
+      v
+      (Integer/parseInt v))))
 
 (defn env-symbol [env env-name]
   (when-let [v (get-env env env-name)]
-    (symbol v)))
+    (if (symbol? v)
+      v
+      (symbol v))))
 
 (defn env-keyword [env env-name]
   (when-let [v (get-env env env-name)]
-    (keyword v)))
+    (if (keyword? v)
+      v
+      (keyword v))))
 
 (defn env-number [env env-name]
   (when-let [v (get-env env env-name)]
-    (Double/parseDouble v)))
+    (if (number? v)
+      v
+      (Double/parseDouble v))))
 
 (defn env-boolean [env env-name]
-  (when-let [v (get-env env env-name)]
-    (cond
-      (= "true" v) true
-      (= "false" v) false
-      :else (throw (ex-info (str "Expected true or false in " env-name ", got " v) {})))))
+  (let [v (get-env env env-name)]
+    (when (not (nil? v))
+      (if (boolean? v)
+        v
+        (cond
+          (= "true" v) true
+          (= "false" v) false
+          :else (throw (ex-info (str "Expected true or false in " env-name ", got " v) {})))))))
 
 (defn zen-quote [d]
   (with-meta d {:zen/quote true}))

test/test-env.edn

@@ -22,6 +22,15 @@
   :num    #env-number ENUM
   :bool-true #env-boolean BOOL_TRUE
   :bool-false #env-boolean BOOL_FALSE
+
+  :dstring     #env [UPS "DS"]
+  :dhome       #env [UPS "DH"]
+  :dint        #env-integer [UPS 4]
+  :dsym        #env-symbol [UPS sym]
+  :dkey        #env-keyword [UPS :key]
+  :dnum        #env-number [UPS 4.0]
+  :dbool-true  #env-boolean [UPS true]
+  :dbool-false #env-boolean [UPS false]
   }
 
 

test/zen/env_test.clj

@@ -18,12 +18,21 @@
 
   (matcho/match
    (zen.core/get-symbol ztx 'test-env/model)
-    {:zen/tags #{'test-env/schema}
-     :home string?
-     :string "extr"
-     :int 99
-     :key :some/key
-     :num 0.02
-     :bool-true true
-     :bool-false false
-     :sym 'test-env/schema}))
+   {:zen/tags #{'test-env/schema}
+    :home string?
+    :string "extr"
+    :int 99
+    :key :some/key
+    :num 0.02
+    :bool-true true
+    :bool-false false
+    :sym 'test-env/schema
+
+    :dstring "DS"
+    :dint 4
+    :dkey :key
+    :dbool-false false
+    :dbool-true true
+    :dnum 4.0
+    :dsym 'test-env/sym
+    :dhome "DH"}))