Merge branch 'master' of git://github.com/nicjansma/versionator

Conflicts: test/map-path.test.js
serby · Aug 1, 2013 · 2a33c21 · 2a33c21
2 parents 92ee669 + 74e0163
commit 2a33c21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/map-path.js b/lib/map-path.js
@@ -25,6 +25,11 @@ module.exports = function(dirPath, params, callback) {
     return callback(new Error('Path is required'))
   }
 
+  // trim trailing slash
+  if (dirPath.substring(dirPath.length - 1) === '/') {
+    dirPath = dirPath.slice(0, -1);
+  }
+
   function hash(filename, callback) {
     var
       md5sum = crypto.createHash('md5'),

diff --git a/test/map-path.test.js b/test/map-path.test.js
@@ -113,4 +113,4 @@ describe('versionator', function() {
   after(function(done) {
     removeFiles(tmpPath, files, done);
   });
-});
+});