Compare commits

...

8 commits

Author SHA1 Message Date
Michael Klishin
23d86a13ec 3.0.0 2015-07-16 21:54:57 +03:00
Michael Klishin
542427c4de Bump Cheshire to 5.5.0 2015-07-16 21:54:42 +03:00
Michael Klishin
8bc0017f95 Master is now 1.8.0-master-SNAPSHOT 2015-07-16 21:31:51 +03:00
Michael Klishin
38391efe12 Make this test order independent 2015-07-16 21:31:32 +03:00
Michael Klishin
edb7c8d4a8 Bump clojure.data.json to 0.2.6 2015-07-16 21:21:24 +03:00
Michael Klishin
909350990b Don't test against clojure.data.json 0.1.x 2015-07-16 21:21:14 +03:00
Michael Klishin
b4ba76753a Test against 1.6 via a profile, drop 1.5 support 2015-07-16 21:18:13 +03:00
Michael Klishin
0a5e2fe58e Depend on Clojure 1.7 2015-07-16 21:17:37 +03:00
2 changed files with 8 additions and 10 deletions

View file

@ -1,10 +1,10 @@
(defproject com.novemberain/monger "3.0.0-rc3-SNAPSHOT" (defproject com.novemberain/monger "3.0.0"
:description "Monger is a Clojure MongoDB client for a more civilized age: friendly, flexible and with batteries included" :description "Monger is a Clojure MongoDB client for a more civilized age: friendly, flexible and with batteries included"
:url "http://clojuremongodb.info" :url "http://clojuremongodb.info"
:min-lein-version "2.5.1" :min-lein-version "2.5.1"
:license {:name "Eclipse Public License" :license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"} :url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[org.clojure/clojure "1.6.0"] :dependencies [[org.clojure/clojure "1.7.0"]
[org.mongodb/mongodb-driver "3.0.2"] [org.mongodb/mongodb-driver "3.0.2"]
[clojurewerkz/support "1.1.0"]] [clojurewerkz/support "1.1.0"]]
:test-selectors {:default (fn [m] :test-selectors {:default (fn [m]
@ -31,14 +31,12 @@
:mailing-list {:name "clojure-mongodb" :mailing-list {:name "clojure-mongodb"
:archive "https://groups.google.com/group/clojure-mongodb" :archive "https://groups.google.com/group/clojure-mongodb"
:post "clojure-mongodb@googlegroups.com"} :post "clojure-mongodb@googlegroups.com"}
:profiles {:dj01x {:dependencies [[org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]]]} :profiles {:dj02x {:dependencies [[org.clojure/data.json "0.2.6" :exclusions [org.clojure/clojure]]]}
:dj02x {:dependencies [[org.clojure/data.json "0.2.4" :exclusions [org.clojure/clojure]]]} :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
:1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]} :master {:dependencies [[org.clojure/clojure "1.8.0-master-SNAPSHOT"]]}
:1.7 {:dependencies [[org.clojure/clojure "1.7.0-RC2"]]}
:master {:dependencies [[org.clojure/clojure "1.7.0-master-SNAPSHOT"]]}
:dev {:resource-paths ["test/resources"] :dev {:resource-paths ["test/resources"]
:dependencies [[clj-time "0.8.0" :exclusions [org.clojure/clojure]] :dependencies [[clj-time "0.8.0" :exclusions [org.clojure/clojure]]
[cheshire "5.3.1" :exclusions [org.clojure/clojure]] [cheshire "5.5.0" :exclusions [org.clojure/clojure]]
[org.clojure/data.json "0.2.5" :exclusions [org.clojure/clojure]] [org.clojure/data.json "0.2.5" :exclusions [org.clojure/clojure]]
[org.clojure/tools.cli "0.3.1" :exclusions [org.clojure/clojure]] [org.clojure/tools.cli "0.3.1" :exclusions [org.clojure/clojure]]
[org.clojure/core.cache "0.6.3" :exclusions [org.clojure/clojure]] [org.clojure/core.cache "0.6.3" :exclusions [org.clojure/clojure]]
@ -58,7 +56,7 @@
;; only clj-time/JodaTime available, used to test monger.joda-time w/o clojure.data.json ;; only clj-time/JodaTime available, used to test monger.joda-time w/o clojure.data.json
:dev2 {:resource-paths ["test/resources"] :dev2 {:resource-paths ["test/resources"]
:dependencies [[clj-time "0.8.0" :exclusions [org.clojure/clojure]]]}} :dependencies [[clj-time "0.8.0" :exclusions [org.clojure/clojure]]]}}
:aliases {"all" ["with-profile" "dev:dev,1.5:dev,dj01x:dev,dj02x:dev,1.7"]} :aliases {"all" ["with-profile" "dev:dev,1.6:dev,dj02x"]}
:repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases" :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
:snapshots false :snapshots false
:releases {:checksum :fail :update :always}} :releases {:checksum :fail :update :always}}

View file

@ -232,7 +232,7 @@
(let [collection "libraries" (let [collection "libraries"
_ (mc/insert db collection { :language "Clojure", :name "monger" }) _ (mc/insert db collection { :language "Clojure", :name "monger" })
result (mc/find db collection { :language "Clojure"} [:language])] result (mc/find db collection { :language "Clojure"} [:language])]
(is (= (seq [:_id :language]) (keys (mgcnv/from-db-object (.next result) true)))))) (is (= (set [:_id :language]) (-> (mgcnv/from-db-object (.next result) true) keys set)))))
(deftest find-and-iterate-over-multiple-documents-the-hard-way (deftest find-and-iterate-over-multiple-documents-the-hard-way
(let [collection "libraries"] (let [collection "libraries"]