From: Jason Woofenden <jason@jasonwoof.com>
Date: Mon, 11 Feb 2013 21:01:20 +0000 (-0500)
Subject: allow any json_request to return plain text
X-Git-Url: https://jasonwoof.com/gitweb/?p=af-coffee.git;a=commitdiff_plain;h=5741a5de7ce618c1956cc13060e166d702c1610c

allow any json_request to return plain text
---

diff --git a/api.coffee b/api.coffee
index 3108f4f..318531f 100644
--- a/api.coffee
+++ b/api.coffee
@@ -135,6 +135,8 @@ request = (method, path, content_type, data, token, callback) ->
 				req.end()
 		], callback
 
+# send json
+# try parsing result as json, and fall back to returning string
 json_request = (method, path, data, token, callback) ->
 	if data?
 		data = JSON.stringify data
@@ -145,7 +147,8 @@ json_request = (method, path, data, token, callback) ->
 		try
 			callback null, JSON.parse(response)
 		catch error
-			callback "Error: AF server returned invalid JSON for #{method} to #{path}: \"#{response}\""
+			# some api calls return plain text
+			callback null, response
 
 json_get = (path, token, callback) ->
 	json_request 'GET', path, null, token, callback