From 296cf7f51ee589618b7e8f51d5aa2e916974db10 Mon Sep 17 00:00:00 2001 From: Pradnyesh Sawant Date: Mon, 25 Aug 2014 17:58:26 +0530 Subject: [PATCH 1/2] upgraded monger from 1.7.0 to 2.0.0 --- src/leiningen/new/luminus.clj | 2 +- src/leiningen/new/luminus/dbs/mongodb.clj | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/leiningen/new/luminus.clj b/src/leiningen/new/luminus.clj index d4f24fb7..d278c23a 100644 --- a/src/leiningen/new/luminus.clj +++ b/src/leiningen/new/luminus.clj @@ -110,7 +110,7 @@ (defmethod post-process :+mongodb [_ project-file] (add-mongo-dependencies project-file - ['com.novemberain/monger "1.7.0"]) + ['com.novemberain/monger "2.0.0"]) (let [docs-filename (str *name* "/resources/public/md/docs.md")] (spit docs-filename (str (*render* "dbs/mongo_instructions.html") (slurp docs-filename))))) diff --git a/src/leiningen/new/luminus/dbs/mongodb.clj b/src/leiningen/new/luminus/dbs/mongodb.clj index 18f97d12..45d915a4 100644 --- a/src/leiningen/new/luminus/dbs/mongodb.clj +++ b/src/leiningen/new/luminus/dbs/mongodb.clj @@ -5,17 +5,17 @@ ;; Tries to get the Mongo URI from the environment variable ;; MONGOHQ_URL, otherwise default it to localhost -(let [uri (get (System/getenv) "MONGOHQ_URL" "mongodb://127.0.0.1/{{name}}")] - (mg/connect-via-uri! uri)) +(let [uri (get (System/getenv) "MONGOHQ_URL" "mongodb://127.0.0.1/{{name}}") + {:keys [conn db]} (mg/connect-via-uri uri)] -(defn create-user [user] - (mc/insert "users" user)) + (defn create-user [user] + (mc/insert db "users" user)) -(defn update-user [id first-name last-name email] - (mc/update "users" {:id id} - {$set {:first_name first-name - :last_name last-name - :email email}})) + (defn update-user [id first-name last-name email] + (mc/update db "users" {:id id} + {$set {:first_name first-name + :last_name last-name + :email email}})) -(defn get-user [id] - (mc/find-one-as-map "users" {:id id})) + (defn get-user [id] + (mc/find-one-as-map db "users" {:id id}))) From 10eac87fcd4878bf2a0b412f0f5df95db8b1048f Mon Sep 17 00:00:00 2001 From: Pradnyesh Sawant Date: Mon, 25 Aug 2014 18:41:26 +0530 Subject: [PATCH 2/2] made db into a def var because defn should be a top level form --- src/leiningen/new/luminus/dbs/mongodb.clj | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/leiningen/new/luminus/dbs/mongodb.clj b/src/leiningen/new/luminus/dbs/mongodb.clj index 45d915a4..57fcfc53 100644 --- a/src/leiningen/new/luminus/dbs/mongodb.clj +++ b/src/leiningen/new/luminus/dbs/mongodb.clj @@ -5,17 +5,18 @@ ;; Tries to get the Mongo URI from the environment variable ;; MONGOHQ_URL, otherwise default it to localhost -(let [uri (get (System/getenv) "MONGOHQ_URL" "mongodb://127.0.0.1/{{name}}") - {:keys [conn db]} (mg/connect-via-uri uri)] +(defonce db (let [uri (get (System/getenv) "MONGOHQ_URL" "mongodb://127.0.0.1/{{name}}") + {:keys [conn db]} (mg/connect-via-uri uri)] + db)) - (defn create-user [user] - (mc/insert db "users" user)) +(defn create-user [user] + (mc/insert db "users" user)) - (defn update-user [id first-name last-name email] - (mc/update db "users" {:id id} - {$set {:first_name first-name - :last_name last-name - :email email}})) +(defn update-user [id first-name last-name email] + (mc/update db "users" {:id id} + {$set {:first_name first-name + :last_name last-name + :email email}})) - (defn get-user [id] - (mc/find-one-as-map db "users" {:id id}))) +(defn get-user [id] + (mc/find-one-as-map db "users" {:id id}))