jest
Advanced tools
Comparing version 0.1.31 to 0.1.32
@@ -8,3 +8,3 @@ var _ = require('underscore'), | ||
? | ||
'/' | ||
'' | ||
: | ||
@@ -11,0 +11,0 @@ _.chain([]) |
{ | ||
"name":"jest", | ||
"description":"JavaScriptational State Transfer. JS restful API layer with Mongoose based resources. Inspired by python Tastypie", | ||
"version":"0.1.31", | ||
"version":"0.1.32", | ||
"author":"Ishai Jaffe <ishai@empeeric.com>", | ||
@@ -6,0 +6,0 @@ "contributors": [ |
@@ -315,5 +315,7 @@ var _ = require('underscore'), | ||
*/ | ||
internal_error:function (err, req, res) { | ||
console.trace("jest internal error: " + err.message || err ); | ||
res.send(err.message || err, 500); | ||
internal_error: function(err, req, res) { | ||
var message = (err.message || err); | ||
var code = (err.code || 500); | ||
console.trace("jest internal error: " + message); | ||
res.send(message, code); | ||
}, | ||
@@ -458,3 +460,23 @@ | ||
deserializeJsonp: function(req,res,object,status) { | ||
var callback = req.query.callback || req.body.callback; | ||
if(!callback){ | ||
res.send('you must specify callback function',400); | ||
return; | ||
} | ||
res.header('Cache-Control','no-cache'); | ||
res.header('Pragma','no-cache'); | ||
res.header('Expires','-1'); | ||
res.write(callback + '(' + JSON.stringify(object) + ')', status); | ||
}, | ||
deserializeJson : function(req,res,object,status) { | ||
res.header('Cache-Control','no-cache'); | ||
res.header('Pragma','no-cache'); | ||
res.header('Expires','-1'); | ||
res.json(object, status); | ||
}, | ||
/** | ||
@@ -468,8 +490,12 @@ * converts response basic types object to response string | ||
*/ | ||
deserialize:function (req, res, object, status) { | ||
deserialize:function (req, res, object, status,format) { | ||
// TODO negotiate response content type | ||
res.header('Cache-Control','no-cache'); | ||
res.header('Pragma','no-cache'); | ||
res.header('Expires','-1'); | ||
res.json(object, status); | ||
if(format == 'jsonp') { | ||
this.deserializeJsonp(req,res,object,status); | ||
return; | ||
} | ||
this.deserializeJson(req,res,object,status); | ||
}, | ||
@@ -486,2 +512,3 @@ | ||
var self = this; | ||
var format = req.query.format || req.body.format; | ||
// check if method is allowed | ||
@@ -571,10 +598,10 @@ var method = req.method.toLowerCase(); | ||
case 'put': | ||
status = 202; | ||
status = 201; | ||
break; | ||
case 'delete': | ||
status = 203; | ||
status = 204; | ||
break; | ||
} | ||
// send response | ||
self.deserialize(req, res, response_obj, status); | ||
self.deserialize(req, res, response_obj, status,format); | ||
}); | ||
@@ -581,0 +608,0 @@ }); |
Sorry, the diff of this file is not supported yet
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
66412
19
1767
0