Sigh. Better naming for pathBasename()

deiu · deiu · commit 4fba412ee64a · 2015-08-06T11:15:47.000-04:00
diff --git a/lib/header.js b/lib/header.js
@@ -49,8 +49,8 @@ function linksHandler(req, res, next) {
     }
 
     // Add ACL and Meta Link in header
-    addLink(res, utils.basePathName(req.path) + ldp.suffixAcl, 'acl');
-    addLink(res, utils.basePathName(req.path) + ldp.suffixMeta, 'describedBy');
+    addLink(res, utils.pathBasename(req.path) + ldp.suffixAcl, 'acl');
+    addLink(res, utils.pathBasename(req.path) + ldp.suffixMeta, 'describedBy');
     // Add other Link headers
     addLinks(res, fileMetadata);
     next();
diff --git a/lib/utils.js b/lib/utils.js
@@ -42,7 +42,7 @@ function uriBase(req) {
     return uriAbs(req) + (req.baseUrl || '');
 }
 
-function basePathName(fullpath) {
+function pathBasename(fullpath) {
     var bname = '';
     if (fullpath) {
         bname = (fullpath.lastIndexOf('/') === fullpath.length - 1)?'':path.basename(fullpath);
@@ -84,7 +84,7 @@ exports.uriToFilename = uriToFilename;
 exports.uriToRelativeFilename = uriToRelativeFilename;
 exports.filenameToBaseUri = filenameToBaseUri;
 exports.uriAbs = uriAbs;
-exports.basePathName = basePathName;
+exports.pathBasename = pathBasename;
 exports.uriBase = uriBase;
 exports.getResourceLink = getResourceLink;
 exports.formatDateTime = formatDateTime;
diff --git a/test/utils.js b/test/utils.js
@@ -4,21 +4,21 @@ var utils = require('../lib/utils');
 
 describe('Utility functions', function() {
 
-  describe('basename', function() {
+  describe('pathBasename', function() {
     it('should return bar as relative path for /foo/bar', function() {
-      assert.equal(utils.basePathName('/foo/bar'), 'bar');
+      assert.equal(utils.pathBasename('/foo/bar'), 'bar');
     });
     it('should return empty as relative path for /foo/', function() {
-      assert.equal(utils.basePathName('/foo/'), '');
+      assert.equal(utils.pathBasename('/foo/'), '');
     });
     it('should return empty as relative path for /', function() {
-      assert.equal(utils.basePathName('/'), '');
+      assert.equal(utils.pathBasename('/'), '');
     });
     it('should return empty as relative path for empty path', function() {
-      assert.equal(utils.basePathName(''), '');
+      assert.equal(utils.pathBasename(''), '');
     });
     it('should return empty as relative path for undefined path', function() {
-      assert.equal(utils.basePathName(undefined), '');
+      assert.equal(utils.pathBasename(undefined), '');
     });
   });
 });
