Skip to content

Commit 655648f

Browse files
author
Tim Berners-Lee
committed
Merge branch 'master' of https://github.com/linkeddata/ldnode
2 parents 0813552 + 460dd59 commit 655648f

4 files changed

Lines changed: 27 additions & 10 deletions

File tree

‎lib/handlers/get.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ var subscription = require('../subscription.js');
1919
var HttpError = require('../http-error');
2020

2121
var ldpVocab = require('../vocab/ldp.js');
22-
var turtleExtension = '.ttl';
2322

2423
function get(req, res, next, includeBody) {
2524
var ldp = req.app.locals.ldp;
@@ -82,10 +81,7 @@ function get(req, res, next, includeBody) {
8281
res.set('content-type', contentType);
8382
debug('GET/HEAD -- content-type: ' + contentType);
8483

85-
// Consider acl and meta files text/turtle
86-
if (path.extname(filename) === ldp.suffixAcl ||
87-
path.basename(filename) === turtleExtension ||
88-
path.basename(filename) === ldp.suffixMeta) {
84+
if (utils.hasSuffix(filename, ldp.turtleExtensions)) {
8985
contentType = 'text/turtle';
9086
}
9187

‎lib/ldp.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ var debug = require('./logging');
1616
var utils = require('./utils.js');
1717
var ns = require('./vocab/ns.js').ns;
1818
var HttpError = require('./http-error');
19-
20-
var turtleExtension = '.ttl';
19+
var turtleExtension = '.ttl'
2120

2221
module.exports = LDP;
2322

@@ -53,6 +52,7 @@ function LDP(argv) {
5352
ldp.suffixMeta = argv.suffixMeta || ".meta";
5453
ldp.suffixChanges = argv.suffixChanges || '.changes';
5554
ldp.suffixSSE = argv.suffixSSE || '.events';
55+
ldp.turtleExtensions = ['.ttl', ldp.suffixAcl, ldp.suffixMeta, ldp.suffixChanges, ldp.suffixSSE]
5656

5757
ldp.pathFilter = regexp().start(ldp.mount).toRegExp();
5858
ldp.proxy = argv.proxy;

‎lib/utils.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
var fs = require('fs');
55
var path = require('path');
66
var S = require('string');
7-
var turtleExtension = ".ttl";
87

98
function uriToFilename(uri, base) {
109
var filename = path.join(base, uri);
@@ -50,6 +49,15 @@ function pathBasename(fullpath) {
5049
return bname;
5150
}
5251

52+
function hasSuffix(path, suffixes) {
53+
for (var i in suffixes) {
54+
if (path.indexOf(suffixes[i], path.length - suffixes[i].length) !== -1) {
55+
return true;
56+
}
57+
}
58+
return false;
59+
}
60+
5361
function getResourceLink(filename, uri, base, suffix, otherSuffix) {
5462
var link = filenameToBaseUri(filename, uri, base);
5563
if (S(link).endsWith(suffix)) {
@@ -86,7 +94,8 @@ exports.filenameToBaseUri = filenameToBaseUri;
8694
exports.uriAbs = uriAbs;
8795
exports.pathBasename = pathBasename;
8896
exports.uriBase = uriBase;
97+
exports.hasSuffix = hasSuffix;
8998
exports.getResourceLink = getResourceLink;
9099
exports.formatDateTime = formatDateTime;
91100
exports.timestamp = timestamp;
92-
exports.shortTime = shortTime;
101+
exports.shortTime = shortTime;

‎test/acl.js‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,18 @@ describe('ACL HTTP', function() {
125125
done();
126126
});
127127
});
128+
it("Should return text/turtle for the acl file", function(done) {
129+
var options = createOptions(testDirAclFile, 'user1');
130+
options.headers = {
131+
accept: 'text/turtle'
132+
};
133+
request.get(options, function(error, response, body) {
134+
assert.equal(error, null);
135+
assert.equal(response.statusCode, 200);
136+
assert.match(response.headers['content-type'], /text\/turtle/);
137+
done();
138+
});
139+
});
128140
it("Should create test file", function(done) {
129141
var options = createOptions(abcFile, 'user1');
130142
options.headers = {
@@ -980,7 +992,7 @@ describe('ACL HTTP', function() {
980992
// });
981993
// });
982994
});
983-
995+
984996
describe("Cleaup", function() {
985997
it("should remove all files and dirs created", function(done) {
986998
try {

0 commit comments

Comments
 (0)