Fixed resource id when multiple segments are present. Closes #36

visionmedia · Oct 15, 2011 · 60746f6 · pmlopes · Jan 3, 2012 · tj
1 parent 771af86
commit 60746f6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -97,7 +97,7 @@ Resource.prototype.load = function(fn){
 
 Resource.prototype.__defineGetter__('defaultId', function(){
   return this.name
-    ? en.singularize(this.name)
+    ? en.singularize(this.name.split('/').pop())
     : 'id';
 });
 
@@ -171,8 +171,9 @@ Resource.prototype.add = function(resource){
     , route;
 
   // relative base
-  resource.base = this.base + (this.name ? this.name + '/': '') +
-                  this.param + '/';
+  resource.base = this.base
+    + (this.name ? this.name + '/': '')
+    + this.param + '/';
 
   // re-define previous actions
   for (var method in resource.routes) {

diff --git a/test/fixtures/cat.js b/test/fixtures/cat.js
@@ -0,0 +1,8 @@
+
+exports.index = function(req, res){
+  res.send('list of cats');
+};
+
+exports.new = function(req, res){
+  res.send('new cat');
+};
diff --git a/test/resource.test.js b/test/resource.test.js
@@ -315,5 +315,18 @@ module.exports = {
     assert.response(app, 
       { url: '/users/logout' },
       { body: 'logout' });    
+  },
+
+  'test several segments': function(){
+    var app = express.createServer();
+    var cat = app.resource('api/cat', require('./fixtures/cat'));
+
+    assert.response(app,
+      { url: '/api/cat' },
+      { body: 'list of cats' });
+
+    assert.response(app,
+      { url: '/api/cat/new' },
+      { body: 'new cat' });
   }
 };