Merge pull request #19 from hden/get-params

allow default values in get-params

project.clj

@@ -1,4 +1,4 @@
-(defproject hden/duct.module.datomic "0.4.1"
+(defproject hden/duct.module.datomic "0.5.0"
   :description "A Duct module that adds Integrant keys for a Datomic database connection and Ragtime migrations to a configuration."
   :url "https://github.com/hden/duct.module.datomic"
   :license {:name "EPL-2.0"

src/duct/reader/ion.clj

@@ -4,12 +4,15 @@
             [uritemplate-clj.core :as templ]))
 
 (def get-params
-  (memoize (fn
-             ([s] (get-params s {}))
-             ([s m]
-              (let [vars {:app-name (get (ion/get-app-info) :app-name)
-                          :env      (get (ion/get-env) :env)}]
-                (ion/get-params {:path (templ/uritemplate s (merge vars m))}))))))
+  (memoize (fn [{:keys [template variables default]
+                 :or {variables {}
+                      default {}}}]
+             (let [vars {:app-name (get (ion/get-app-info) :app-name)
+                         :env      (get (ion/get-env) :env)}
+                   params (ion/get-params {:path (templ/uritemplate template (merge vars variables))})]
+               (if (= {} params)
+                 default
+                 params)))))
 
-(defmethod ig/init-key ::get-params [_ {:keys [template variables]}]
-  (get-params template (or variables {})))
+(defmethod ig/init-key ::get-params [_ opts]
+  (get-params opts))