merge

nicola · nicola · commit c85975160fb1 · 2015-09-18T12:10:07.000-04:00
diff --git a/lib/handlers/get.js b/lib/handlers/get.js
@@ -19,17 +19,12 @@ var subscription = require('../subscription.js');
 var HttpError = require('../http-error');
 
 var ldpVocab = require('../vocab/ldp.js');
-var turtleExtensions = ['.ttl'];
 
 function get(req, res, next, includeBody) {
     var ldp = req.app.locals.ldp;
     var uri = utils.uriBase(req);
     var filename = utils.uriToFilename(req.path, ldp.root);
 
-    // Register acl and meta suffixes as turtle extensions
-    utils.pushIfNotExist(turtleExtensions, ldp.suffixAcl);
-    utils.pushIfNotExist(turtleExtensions, ldp.suffixMeta);
-
     // Add request to subscription service
     if (req.path.slice(-ldp.suffixChanges.length) ===
         ldp.suffixChanges) {
@@ -86,7 +81,7 @@ function get(req, res, next, includeBody) {
             res.set('content-type', contentType);
             debug('GET/HEAD -- content-type: ' + contentType);
 
-            if (utils.hasSuffix(filename, turtleExtensions)) {
+            if (utils.hasSuffix(filename, ldp.turtleExtensions)) {
                 contentType = 'text/turtle';
             }
 
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -16,8 +16,7 @@ var debug = require('./debug');
 var utils = require('./utils.js');
 var ns = require('./vocab/ns.js').ns;
 var HttpError = require('./http-error');
-
-var turtleExtension = '.ttl';
+var turtleExtension = '.ttl'
 
 module.exports = LDP;
 
@@ -46,6 +45,7 @@ function LDP(argv) {
   ldp.suffixMeta = argv.suffixMeta || ".meta";
   ldp.suffixChanges = argv.suffixChanges || '.changes';
   ldp.suffixSSE = argv.suffixSSE || '.events';
+  ldp.turtleExtensions = ['.ttl', ldp.suffixAcl, ldp.suffixMeta, ldp.suffixChanges, ldp.suffixSSE]
 
   ldp.proxy = argv.proxy;
 
diff --git a/lib/utils.js b/lib/utils.js
@@ -4,7 +4,6 @@
 var fs = require('fs');
 var path = require('path');
 var S = require('string');
-var turtleExtension = ".ttl";
 
 function uriToFilename(uri, base) {
     var filename = path.join(base, uri);
@@ -89,14 +88,6 @@ function shortTime() {
         '{Hours}:{Minutes}:{Seconds}.{Milliseconds}');
 }
 
-function pushIfNotExist (arr, item) {
-    if (arr.indexOf(item) == -1) {
-        arr.push(item);
-        return true;
-    }
-    return false;
-}
-
 exports.uriToFilename = uriToFilename;
 exports.uriToRelativeFilename = uriToRelativeFilename;
 exports.filenameToBaseUri = filenameToBaseUri;
@@ -108,4 +99,3 @@ exports.getResourceLink = getResourceLink;
 exports.formatDateTime = formatDateTime;
 exports.timestamp = timestamp;
 exports.shortTime = shortTime;
-exports.pushIfNotExist = pushIfNotExist;
