From c36a0abe8c7e116610ef05b49d9ea7f25f3c03ea Mon Sep 17 00:00:00 2001 From: "Michael S. Klishin" Date: Thu, 26 Apr 2012 21:14:48 +0400 Subject: [PATCH] Use clojurewerkz.support 0.2.0 --- project.clj | 21 ++++++++++++--------- src/monger/joda_time.clj | 9 ++------- src/monger/json.clj | 3 ++- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/project.clj b/project.clj index d438275..86427cd 100644 --- a/project.clj +++ b/project.clj @@ -2,9 +2,10 @@ :description "Monger is an experimental idiomatic Clojure wrapper around MongoDB Java driver" :min-lein-version "2.0.0" :license {:name "Eclipse Public License"} - :dependencies [[org.clojure/clojure "1.3.0"] + :dependencies [[org.clojure/clojure "1.3.0"] [org.mongodb/mongo-java-driver "2.7.3"] - [com.novemberain/validateur "1.1.0-beta1"]] + [com.novemberain/validateur "1.1.0-beta1"] + [clojurewerkz/support "0.2.0"]] :test-selectors {:default (complement :performance) :focus :focus :indexing :indexing @@ -16,17 +17,19 @@ :mailing-list {:name "clojure-monger" :archive "https://groups.google.com/group/clojure-monger" :post "clojure-monger@googlegroups.com"} - :profiles {:1.4 {:resource-paths ["test/resources"] - :dependencies [[org.clojure/clojure "1.4.0"]]} + :profiles {:1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]} + :1.5 {:dependencies [[org.clojure/clojure "1.5.0-master-SNAPSHOT"]]} :dev {:resource-paths ["test/resources"] :dependencies [[clj-time "0.3.6" :exclusions [org.clojure/clojure]] [codox "0.3.4" :exclusions [org.clojure/clojure]] [org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]] [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]] [org.clojure/core.cache "0.5.0" :exclusions [org.clojure/clojure]]]}} - :aliases { "all" ["with-profile" "dev:dev,1.4"] } - :repositories {"clojure-releases" "http://build.clojure.org/releases" - "sonatype" {:url "http://oss.sonatype.org/content/repositories/releases" + :aliases {"all" ["with-profile" "dev:dev,1.4:dev,1.5"]} + :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases" :snapshots false, - :releases {:checksum :fail :update :always}}} - :warn-on-reflection true) \ No newline at end of file + :releases {:checksum :fail :update :always}} + "sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots" + :snapshots true + :releases {:checksum :fail :update :always}}} + :warn-on-reflection true) diff --git a/src/monger/joda_time.clj b/src/monger/joda_time.clj index e8dd565..5ca4f5b 100644 --- a/src/monger/joda_time.clj +++ b/src/monger/joda_time.clj @@ -11,7 +11,8 @@ (:import [org.joda.time DateTime DateTimeZone ReadableInstant] [org.joda.time.format ISODateTimeFormat]) (:use [monger.conversion]) - (:require [clojure.data.json :as json])) + (:require [clojure.data.json :as json] + clojurewerkz.support.json)) ;; ;; API @@ -26,9 +27,3 @@ java.util.Date (from-db-object [^java.util.Date input keywordize] (org.joda.time.DateTime. input))) - - -(extend-protocol json/Write-JSON - org.joda.time.DateTime - (write-json [^DateTime object out escape-unicode?] - (json/write-json (.print (ISODateTimeFormat/dateTime) ^ReadableInstant object) out escape-unicode?))) diff --git a/src/monger/json.clj b/src/monger/json.clj index fb92f94..def7409 100644 --- a/src/monger/json.clj +++ b/src/monger/json.clj @@ -9,7 +9,8 @@ (ns monger.json (:import (org.bson.types ObjectId)) - (:require [clojure.data.json :as json])) + (:require [clojure.data.json :as json] + clojurewerkz.support.json)) ;; ;; API