Skip to content

Commit 3d82b7c

Browse files
committed
Merge pull request #115 from deiu/master
Improved the function that makes Link URIs relative
2 parents cde19b9 + 4fba412 commit 3d82b7c

3 files changed

Lines changed: 34 additions & 18 deletions

File tree

‎lib/header.js‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,9 @@ function linksHandler(req, res, next) {
4949
}
5050

5151
// Add ACL and Meta Link in header
52-
var aclLink = utils.getResourceLink(
53-
filename, uri,
54-
ldp.root, ldp.suffixAcl,
55-
ldp.suffixMeta);
56-
57-
var metaLink = utils.getResourceLink(
58-
filename, uri,
59-
ldp.root, ldp.suffixMeta,
60-
ldp.suffixAcl);
61-
62-
addLink(res, utils.uriRelative(aclLink), 'acl');
63-
addLink(res, utils.uriRelative(metaLink), 'describedBy');
64-
65-
52+
addLink(res, utils.pathBasename(req.path) + ldp.suffixAcl, 'acl');
53+
addLink(res, utils.pathBasename(req.path) + ldp.suffixMeta, 'describedBy');
54+
// Add other Link headers
6655
addLinks(res, fileMetadata);
6756
next();
6857
}

‎lib/utils.js‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ function uriBase(req) {
4242
return uriAbs(req) + (req.baseUrl || '');
4343
}
4444

45-
function uriRelative(uri) {
46-
var relative = path.basename(uri);
47-
return relative;
45+
function pathBasename(fullpath) {
46+
var bname = '';
47+
if (fullpath) {
48+
bname = (fullpath.lastIndexOf('/') === fullpath.length - 1)?'':path.basename(fullpath);
49+
}
50+
return bname;
4851
}
4952

5053
function getResourceLink(filename, uri, base, suffix, otherSuffix) {
@@ -81,7 +84,7 @@ exports.uriToFilename = uriToFilename;
8184
exports.uriToRelativeFilename = uriToRelativeFilename;
8285
exports.filenameToBaseUri = filenameToBaseUri;
8386
exports.uriAbs = uriAbs;
84-
exports.uriRelative = uriRelative;
87+
exports.pathBasename = pathBasename;
8588
exports.uriBase = uriBase;
8689
exports.getResourceLink = getResourceLink;
8790
exports.formatDateTime = formatDateTime;

‎test/utils.js‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
var assert = require('chai').assert;
2+
3+
var utils = require('../lib/utils');
4+
5+
describe('Utility functions', function() {
6+
7+
describe('pathBasename', function() {
8+
it('should return bar as relative path for /foo/bar', function() {
9+
assert.equal(utils.pathBasename('/foo/bar'), 'bar');
10+
});
11+
it('should return empty as relative path for /foo/', function() {
12+
assert.equal(utils.pathBasename('/foo/'), '');
13+
});
14+
it('should return empty as relative path for /', function() {
15+
assert.equal(utils.pathBasename('/'), '');
16+
});
17+
it('should return empty as relative path for empty path', function() {
18+
assert.equal(utils.pathBasename(''), '');
19+
});
20+
it('should return empty as relative path for undefined path', function() {
21+
assert.equal(utils.pathBasename(undefined), '');
22+
});
23+
});
24+
});

0 commit comments

Comments
 (0)