Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/generate to writer #19

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject clj-json "0.5.0"
(defproject clj-json "0.5.1"
:description "Fast JSON encoding and decoding for Clojure via the Jackson library."
:url "http://github.com/mmcgrana/clj-json"
:source-path "src/clj"
Expand Down
15 changes: 10 additions & 5 deletions src/clj/clj_json/core.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns clj-json.core
(:import (clj_json JsonExt)
(org.codehaus.jackson JsonFactory JsonParser JsonParser$Feature)
(java.io StringWriter StringReader BufferedReader))
(java.io Writer StringWriter StringReader BufferedReader))
(:use (clojure [walk :only (postwalk)]
[string :only (join)])))

Expand All @@ -11,14 +11,19 @@

(def ^{:dynamic true} *coercions* nil)

(defn generate-to-writer
"Attempts to write a json-encoded string for the given Object directly to the given writer."
[obj #^Writer writer]
(let [generator (.createJsonGenerator factory writer)]
(JsonExt/generate generator *coercions* obj)
(.flush generator)))

(defn generate-string
"Returns a JSON-encoding String for the given Clojure object."
{:tag String}
[obj]
(let [sw (StringWriter.)
generator (.createJsonGenerator factory sw)]
(JsonExt/generate generator *coercions* obj)
(.flush generator)
(let [sw (StringWriter.)]
(generate-to-writer obj sw)
(.toString sw)))

(defn parse-string
Expand Down
13 changes: 11 additions & 2 deletions test/clj_json/core_test.clj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns clj-json.core-test
(:use clojure.test)
(:require [clj-json.core :as json])
(:import (java.io StringReader BufferedReader)
(:import (java.io StringReader BufferedReader File FileWriter)
(java.util HashMap)))

(deftest test-string-round-trip
Expand All @@ -18,7 +18,16 @@
(is (= {"foo" "bar" "1" "bat" "2" "bang" "3" "biz"}
(json/parse-string
(json/generate-string
{:foo "bar" 1 "bat" (long 2) "bang" (bigint 3) "biz"})))))
{:foo "bar" 1 "bat" (long 2) "bang" (bigint 3) "biz"})))))

(deftest test-write-to-tmp
(let [f (File/createTempFile "clj-json-test" "dat")
writer (FileWriter. f)
test-object {"a" "cow" "jumped" "over" "the" 88}]
(try
(json/generate-to-writer test-object writer)
(is (= (slurp f) (json/generate-string test-object)))
(finally (.close writer)))))

(deftest test-keywords
(is (= {:foo "bar" :bat 1}
Expand Down