diff --git a/README.md b/README.md index 284d003..137567d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ As a [Connect](http://github.com/extjs/Connect) filter: quip = require('quip'), Connect.createServer( - quip.filter(), + quip(), function(req, res, next){ res.ok('test'); } diff --git a/lib/quip.js b/lib/quip.js index 6102567..179790b 100644 --- a/lib/quip.js +++ b/lib/quip.js @@ -1,3 +1,11 @@ +// filter for use with Connect +var exports = module.exports = function(){ + return function(req, res, next){ + exports.update(res); + next(); + }; +}; + exports.update = function(res){ ///// default response settings ///// @@ -104,11 +112,3 @@ exports.update = function(res){ return res; }; - -// filter for use with Connect -exports.filter = function(){ - return function(req, res, next){ - exports.update(res); - next(); - }; -}; diff --git a/test/test-response.js b/test/test-response.js index 0956b20..9762697 100644 --- a/test/test-response.js +++ b/test/test-response.js @@ -126,6 +126,22 @@ exports.rss = mimeTypeTest('application/rss+xml', 'rss'); exports.javascript = mimeTypeTest('text/javascript', 'javascript'); exports.json = mimeTypeTest('application/json', 'json'); +exports.jsonp = function(test){ + test.expect(7); + var res = quip.update({}); + res.send = function(data){ + test.equals(data, 'mycallback({"some":"data"});'); + test.equals(res._status, 200); + test.same(res._headers, {'Content-Type':'text/javascript'}); + }; + var r = res.jsonp('mycallback', {'some':'data'}); + test.equals(r, null); //should not allow further chaining + + // status code should be overridden + res.error().jsonp('mycallback', {'some':'data'}); + test.done(); +}; + exports.send = function(test){ test.expect(4); var res = quip.update({ @@ -208,26 +224,10 @@ exports.filter = function(test){ quip.update = function(r){ test.equals(r, res); }; - quip.filter()(null, res, function(){ + quip()(null, res, function(){ test.ok(true, 'next called'); }); quip.update = _update; test.done(); }; - -exports.jsonp = function(test){ - test.expect(7); - var res = quip.update({}); - res.send = function(data){ - test.equals(data, 'mycallback({"some":"data"});'); - test.equals(res._status, 200); - test.same(res._headers, {'Content-Type':'text/javascript'}); - }; - var r = res.jsonp('mycallback', {'some':'data'}); - test.equals(r, null); //should not allow further chaining - - // status code should be overridden - res.error().jsonp('mycallback', {'some':'data'}); - test.done(); -};