clj-facebook-graph now uses the clojure.contrib.json/Read-JSON-From p…

…rotocol to parse JSON, which resides inside a byte array. Before there was an explicit function for this purpose, which is now unnecessary.

src/clj_facebook_graph/error_handling.clj

@@ -7,7 +7,7 @@
 ; You must not remove this notice, or any other, from this software.
 
 (ns clj-facebook-graph.error-handling
-  (:use [clj-facebook-graph.helper :only [read-json-body]])
+  (:use [clojure.contrib.json])
   (:import clj_facebook_graph.FacebookGraphException))
 
 (def
@@ -47,6 +47,6 @@
       (if (or (not (clojure.core/get req :throw-exceptions true))
               (not= status 400))
         resp
-        (throw (let [resp (assoc resp :body (read-json-body resp))]
+        (throw (let [resp (assoc resp :body (read-json (:body resp)))]
                  (FacebookGraphException. (identify-facebook-error resp))))))))
 

src/clj_facebook_graph/helper.clj

@@ -8,12 +8,14 @@
 
 (ns clj-facebook-graph.helper
   "Some helper functions."
-  (:use [clojure.contrib.json :only [read-json]]
+  (:use [clojure.contrib.json :only [read-json read-json-from Read-JSON-From]]
         [clojure.java.io :only [reader]]
         [clj-http.client :only [generate-query-string]]
         [clj-http.client :only [unexceptional-status?]]
-        [clojure.string :only [blank?]])
-  (:use ring.middleware.params))
+        [clojure.string :only [blank?]]
+        ring.middleware.params)
+  (:import
+   (java.io PushbackReader ByteArrayInputStream InputStreamReader)))
 
 (def facebook-base-url "https://graph.facebook.com")
 
@@ -23,11 +25,12 @@
   (let [f (ns-resolve 'ring.middleware.params 'parse-params)]
     (f params "UTF-8")))
 
-(defn read-json-body
-  "Reads a JSON document from a request body."
-  [request]
-  (let [body (:body request)]
-    (read-json (if (string? body) body (reader body)))))
+(extend-type (Class/forName "[B")
+  Read-JSON-From
+   (read-json-from [input keywordize? eof-error? eof-value]
+                   (read-json-from (PushbackReader. (InputStreamReader.
+                                                      (ByteArrayInputStream. input)))
+                    keywordize? eof-error? eof-value)))
 
 (defn build-url [request]
   "Builds a URL string which corresponds to the information of the request."