Release 3.4.0

Updated Util.isAbsolute(path) to return true for Azure absolute paths

History.md

@@ -1,4 +1,10 @@
 
+3.4.0 / 2013-09-07 
+==================
+
+ * add res.vary(). Closes #1682
+ * update connect
+
 3.3.8 / 2013-09-02 
 ==================
 

lib/response.js

@@ -237,7 +237,7 @@ res.jsonp = function(obj){
 
   // jsonp
   if (callback) {
-    if (callback instanceof Array) callback = callback[0];
+    if (Array.isArray(callback)) callback = callback[0];
     this.set('Content-Type', 'text/javascript');
     var cb = callback.replace(/[^\[\]\w$.]/g, '');
     body = cb + ' && ' + cb + '(' + body + ');';
@@ -463,7 +463,7 @@ res.format = function(obj){
 
   var key = req.accepts(keys);
 
-  this.set('Vary', 'Accept');
+  this.vary("Accept");
 
   if (key) {
     this.set('Content-Type', normalizeType(key).value);
@@ -720,6 +720,44 @@ res.redirect = function(url){
   this.end(head ? null : body);
 };
 
+/**
+ * Add `field` to Vary. If already present in the Vary set, then
+ * this call is simply ignored.
+ *
+ * @param {Array|String} field
+ * @param {ServerResponse} for chaining
+ * @api public
+ */
+
+res.vary = function(field){
+  var self = this;
+
+  // nothing
+  if (!field) return this;
+
+  // array
+  if (Array.isArray(field)) {
+    field.forEach(function(field){
+      self.vary(field);
+    });
+    return;
+  }
+
+  var vary = this.get('Vary');
+
+  // append  
+  if (vary) {
+    vary = vary.split(/ *, */);
+    if (!~vary.indexOf(field)) vary.push(field);
+    this.set('Vary', vary.join(', '));
+    return this;
+  }
+
+  // set
+  this.set('Vary', field);
+  return this;
+};
+
 /**
  * Render `view` with the given `options` and optional callback `fn`.
  * When a callback function is given a response will _not_ be made

lib/utils.js

@@ -54,6 +54,7 @@ exports.locals = function(obj){
 exports.isAbsolute = function(path){
   if ('/' == path[0]) return true;
   if (':' == path[1] && '\\' == path[2]) return true;
+  if ('\\\\' == path.substring(0, 2)) return true; // Microsoft Azure absolute path
 };
 
 /**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "express",
   "description": "Sinatra inspired web development framework",
-  "version": "3.3.8",
+  "version": "3.4.0",
   "author": "TJ Holowaychuk <tj@vision-media.ca>",
   "contributors": [
     {
@@ -22,7 +22,7 @@
     }
   ],
   "dependencies": {
-    "connect": "2.8.8",
+    "connect": "2.9.0",
     "commander": "1.2.0",
     "range-parser": "0.0.4",
     "mkdirp": "0.3.5",

test/res.jsonp.js

@@ -21,6 +21,22 @@ describe('res', function(){
       })
     })
 
+    it('should use first callback parameter with jsonp', function(done){
+      var app = express();
+
+      app.use(function(req, res){
+        res.jsonp({ count: 1 });
+      });
+
+      request(app)
+          .get('/?callback=something&callback=somethingelse')
+          .end(function(err, res){
+            res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
+            res.text.should.equal('something && something({"count":1});');
+            done();
+          })
+    })
+
     it('should allow renaming callback', function(done){
       var app = express();
 

test/res.vary.js

@@ -0,0 +1,55 @@
+
+var express = require('../')
+  , should = require('should');
+
+function response() {
+  var res = Object.create(express.response);
+  res._headers = {};
+  return res;
+}
+
+describe('res.vary()', function(){
+  describe('with no arguments', function(){
+    it('should not set Vary', function(){
+      var res = response();
+      res.vary();
+      should.not.exist(res.get('Vary'));
+    })
+  })
+
+  describe('with an empty array', function(){
+    it('should not set Vary', function(){
+      var res = response();
+      res.vary([]);
+      should.not.exist(res.get('Vary'));
+    })
+  })
+
+  describe('with an array', function(){
+    it('should set the values', function(){
+      var res = response();
+      res.vary(['Accept', 'Accept-Language', 'Accept-Encoding']);
+      res.get('Vary').should.equal('Accept, Accept-Language, Accept-Encoding');
+    })
+  })
+
+  describe('with a string', function(){
+    it('should set the value', function(){
+      var res = response();
+      res.vary('Accept');
+      res.get('Vary').should.equal('Accept');
+    })
+  })
+
+  describe('when the value is present', function(){
+    it('should not add it again', function(){
+      var res = response();
+      res.vary('Accept');
+      res.vary('Accept-Encoding');
+      res.vary('Accept-Encoding');
+      res.vary('Accept-Encoding');
+      res.vary('Accept');
+      res.get('Vary').should.equal('Accept, Accept-Encoding');
+    })
+  })
+})