frameworks/foundation/fixtures/malformed.json @@ -133,14 +133,24 @@ SC.Response = SC.Object.extend( encodedBody: null, /** - Response body. If isJSON was set, will be parsed automatically. + Response body. If isJSON was set, will be parsed automatically. - @property {Hash|String} + @response {Hash|String|SC.Error} the response body or the parsed JSON. + Returns a SC.Error instance if there is a JSON parsing error. */ body: function() { // TODO: support XML var ret = this.get('encodedBody'); - if (ret && this.get('isJSON') && !ret.match(/^\s*$/)) ret = SC.json.decode(ret); + if (ret && this.get('isJSON')) { + try { + ret = SC.json.decode(ret); + } catch(e) { + return SC.Error.create({ + message: e.name + ': ' + e.message, + label: 'Response', + errorValue: this }); + } + } return ret; }.property('encodedBody').cacheable(), frameworks/foundation/system/response.js @@ -83,6 +83,33 @@ test("Test Asynchronous GET Request, auto-deserializing JSON", function() { }); +test("Test auto-deserializing malformed JSON", function() { + request = SC.Request.getUrl(sc_static('malformed.json')).set('isJSON', YES); + + var timer = setTimeout(function() { + ok(false, 'response did not invoke notify()'); + window.start(); + }, 1000); + + request.notify(this, function(response) { + ok(SC.ok(response), 'response should not be error'); + + try { + var body = response.get('body'); + ok(!SC.ok(body), 'body should be an error'); + } catch(e) { + ok(false, 'getting the body should not throw an exception'); + } + + clearTimeout(timer); + window.start(); + }); + + request.send(); + + stop(); +}); + test("Test Synchronous GET Request, auto-deserializing JSON", function() { request.set("isAsynchronous", false); request.set("isJSON", true); frameworks/foundation/tests/system/request.js 7c9b0d8d2dadebb410a20221c6f16b01d4d3cefe Martin Ottenwaelter martin.ottenwaelter@gmail.com http://github.com/sproutit/sproutcore/commit/d380ed008e0cd42b6b05e21a179a4de390550c1d d380ed008e0cd42b6b05e21a179a4de390550c1d 2009-11-06T01:12:55-08:00 2009-11-06T01:12:55-08:00 response.get('body') should not throw an exception when it tries to decode malformed JSON. Return a SC.Error instance instead. 14511c95d0344a8636fae65c12278d97c54c6239 Martin Ottenwaelter martin.ottenwaelter@gmail.com