Skip to content

trim incoming data before trying to parse it as json to make sure there ... #208

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.

Sign up for GitHub

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

Open
prusik wants to merge 4 commits into
base: master
Choose a base branch
from
Open

trim incoming data before trying to parse it as json to make sure there ... #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7b115a
trim incoming data before trying to parse it as json to make sure the…
Apr 14, 2015
893d3ed
updated package definition
Apr 14, 2015
b95b68d
Update package.json
prusik Jul 9, 2015
9bb5f10
Update package.json
prusik Jul 9, 2015
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 lib/restler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ var parsers = {
}
},
json: function(data, callback) {
if (data && data.length) {
if (data && data.trim().length) {
var parsedData;
try {
parsedData = JSON.parse(data);
Expand Down
18 changes: 18 additions & 0 deletions test/restler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,10 @@ function dataResponse(request, response) {
response.writeHead(200, { 'content-type': 'application/yaml' });
response.end('{Чебурашка');
break;
case '/empty-json-trim':
response.writeHead(200, { 'content-type': 'application/json' });
response.end(' ');
break;
case '/abort':
setTimeout(function() {
response.writeHead(200);
Expand Down Expand Up @@ -592,6 +596,20 @@ module.exports['Deserialization'] = {
});
},

'Should treat trimmed empty data as a valid response': function(test) {
test.expect(2);
rest.get(host + '/empty-json-trim').on('complete', function(err, response) {
test.equal(response.raw, ' ', 'should be " ", got: ' + util.inspect(response.raw));
test.done();
}).on('error', function(err) {
test.ok(false, 'should not have triggered an error');
}).on('fail', function() {
test.ok(false, 'should not have triggered a fail');
}).on('success', function() {
test.ok(true, 'should have triggered a success');
});
},

'Should correctly handle malformed XML': function(test) {
test.expect(4);
rest.get(host + '/mal-xml').on('complete', function(data, response) {
Expand Down