(serveStatic plugin) Add an option to not append req.path() to the file path (#41)

Author: rundef

lib/plugins/static.js

@@ -32,12 +32,18 @@ var ResourceNotFoundError = errors.ResourceNotFoundError;
  */
 function serveStatic(options) {
     var opts = options || {};
+
+    if (typeof opts.appendRequestPath === 'undefined') {
+        opts.appendRequestPath = true;
+    }
+
     assert.object(opts, 'options');
     assert.string(opts.directory, 'options.directory');
     assert.optionalNumber(opts.maxAge, 'options.maxAge');
     assert.optionalObject(opts.match, 'options.match');
     assert.optionalString(opts.charSet, 'options.charSet');
     assert.optionalString(opts.file, 'options.file');
+    assert.bool(opts.appendRequestPath, 'options.appendRequestPath');
 
     var p = path.normalize(opts.directory).replace(/\\/g, '/');
     var re = new RegExp('^' + escapeRE(p) + '/?.*');
@@ -114,8 +120,24 @@ function serveStatic(options) {
             file = path.join(opts.directory,
                 decodeURIComponent(opts.file));
         } else {
-            file = path.join(opts.directory,
-                decodeURIComponent(req.path()));
+            if (opts.appendRequestPath) {
+                file = path.join(opts.directory,
+                    decodeURIComponent(req.path()));
+            }
+            else {
+                var dirBasename = path.basename(opts.directory);
+                var reqpathBasename = path.basename(req.path());
+
+                if (path.extname(req.path()) === '' &&
+                    dirBasename === reqpathBasename) {
+
+                    file = opts.directory;
+                }
+                else {
+                    file = path.join(opts.directory,
+                        decodeURIComponent(path.basename(req.path())));
+                }
+            }
         }
 
         if (req.method !== 'GET' && req.method !== 'HEAD') {

test/static.test.js

@@ -100,7 +100,8 @@ describe('static resource plugin', function () {
                     }
 
                     if (testDefault) {
-                        opts.defaultFile = testFileName;
+                        p = '/' + testDir + '/';
+                        opts.default = testFileName;
                         routeName += ' with default';
                     }
                     var re = regex ||
@@ -121,7 +122,61 @@ describe('static resource plugin', function () {
                 });
             });
         });
+    }
+
+    function testNoAppendPath(done, testDefault, tmpDir, regex, staticFile) {
+        var staticContent = '{"content": "abcdefg"}';
+        var staticObj = JSON.parse(staticContent);
+        var testDir = 'public';
+        var testFileName = 'index.json';
+        var routeName = 'GET wildcard';
+        var tmpPath = path.join(__dirname, '../', tmpDir);
+
+        mkdirp(tmpPath, function (err) {
+            assert.ifError(err);
+            DIRS_TO_DELETE.push(tmpPath);
+            var folderPath = path.join(tmpPath, testDir);
+
+            mkdirp(folderPath, function (err2) {
+                assert.ifError(err2);
+
+                DIRS_TO_DELETE.push(folderPath);
+                var file = path.join(folderPath, testFileName);
+
+                fs.writeFile(file, staticContent, function (err3) {
+                    assert.ifError(err3);
+                    FILES_TO_DELETE.push(file);
+                    var p = '/' + testDir + '/' + testFileName;
+                    var opts = { directory: folderPath };
+                    opts.appendRequestPath = false;
+
+                    if (staticFile) {
+                        opts.file = testFileName;
+                    }
 
+                    if (testDefault) {
+                        p = '/' + testDir + '/';
+                        opts.default = testFileName;
+                        routeName += ' with default';
+                    }
+                    var re = regex ||
+                        new RegExp('/' + testDir + '/?.*');
+
+                    SERVER.get({
+                        path: re,
+                        name: routeName
+                    }, plugins.serveStatic(opts));
+
+                    CLIENT.get(p, function (err4, req, res, obj) {
+                        assert.ifError(err4);
+                        assert.equal(res.headers['cache-control'],
+                            'public, max-age=3600');
+                        assert.deepEqual(obj, staticObj);
+                        done();
+                    });
+                });
+            });
+        });
     }
 
     it('static serves static files', function (done) {
@@ -162,4 +217,18 @@ describe('static resource plugin', function () {
         serveStaticTest(done, false, '.tmp', null, true);
     });
 
+    it('static serves static file with appendRequestPath = false',
+        function (done) {
+        testNoAppendPath(done, false, '.tmp');
+    });
+
+    it('static serves default file with appendRequestPath = false',
+        function (done) {
+        testNoAppendPath(done, true, '.tmp');
+    });
+
+    it('restify serve a specific static file with appendRequestPath = false',
+        function (done) {
+        testNoAppendPath(done, false, '.tmp', null, true);
+    });
 });