From 5b46d7a958f8645e348e6cd3a7032d2c61a85422 Mon Sep 17 00:00:00 2001
From: Arpad Borsos <arpad.borsos@googlemail.com>
Date: Sun, 2 Oct 2011 19:13:00 +0200
Subject: [PATCH] Bug 28: Ability to use content-negotiation only for known
 formats

---
 index.js                                  |  9 +++-
 test/resource.content-negotiation.test.js | 50 ++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/index.js b/index.js
index 8cb167d..a389d4a 100644
--- a/index.js
+++ b/index.js
@@ -41,6 +41,10 @@ var Resource = module.exports = function Resource(name, actions, app) {
   this.base = actions.base || '/';
   if ('/' != this.base[this.base.length - 1]) this.base += '/';
   this.format = actions.format;
+  this.formats = actions.formats;
+  if (this.formats && this.formats.length) {
+    this.format = this.formats[0];
+  }
   this.id = actions.id || this.defaultId;
   this.param = ':' + this.id;
 
@@ -126,7 +130,10 @@ Resource.prototype.map = function(method, path, fn){
   var route = this.base + (this.name || '');
   if (this.name && path) route += '/';
   route += path;
-  route += '.:format?';
+  if (this.formats)
+    route += '.:format(' + this.formats.join('|') + ')?';
+  else
+    route += '.:format?';
 
   // register the route so we may later remove it
   (this.routes[method] = this.routes[method] || {})[route] = {
diff --git a/test/resource.content-negotiation.test.js b/test/resource.content-negotiation.test.js
index 0695423..8549a0b 100644
--- a/test/resource.content-negotiation.test.js
+++ b/test/resource.content-negotiation.test.js
@@ -69,6 +69,54 @@ module.exports = {
       { body: 'Unsupported format', status: 406 });
   },
   
+  'test content-negotiation for known formats': function(){
+    var app = express.createServer();
+  
+    app.resource('series', {
+      show: function(req, res){
+        res.send(req.format + ": " + req.params.series);
+      }
+    }, { formats: ['json', 'xml'] });
+  
+    assert.response(app,
+      { url: '/series/Dr.%20House.xml' },
+      { body: 'xml: Dr. House'
+      , headers: { 'Content-Type': 'application/xml' }});
+  
+    assert.response(app,
+      { url: '/series/Dr.%20House.json' },
+      { body: 'json: Dr. House'
+      , headers: { 'Content-Type': 'application/json' }});
+  
+    assert.response(app,
+      { url: '/series/Dr.%20House' },
+      { body: 'json: Dr. House'
+      , headers: { 'Content-Type': 'application/json' }});
+  
+    assert.response(app,
+      { url: '/series/Dr.%20House.html' },
+      { body: 'json: Dr. House.html'
+      , headers: { 'Content-Type': 'application/json' }});
+  },
+  
+  'test content-negotiation with no format': function(){
+    var app = express.createServer();
+  
+    app.resource('series', {
+      show: function(req, res){
+        res.send(req.params.series);
+      }
+    }, { formats: [] });
+  
+    assert.response(app,
+      { url: '/series/Dr.%20House' },
+      { body: 'Dr. House' });
+  
+    assert.response(app,
+      { url: '/series/Dr.%20House.html' },
+      { body: 'Dr. House.html' });
+  },
+  
   'test content-negotiation via format method without default': function(){
     var app = express.createServer();
   
@@ -155,4 +203,4 @@ module.exports = {
       { url: '/users/1/pets.json' },
       { body: '["tobi","jane","loki"]' });
   }
-};
\ No newline at end of file
+};