adding ldp.suffixMeta, fix nodeSolidServer#89

nicola · nicola · commit 8e3e1bff3067 · 2015-07-27T04:20:08.000+02:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -64,6 +64,11 @@ var argv = require('nomnom')
     help: 'Suffix for acl files (default: \'.acl\')',
     abbr: 'sA'
   })
+  .option('suffixMeta', {
+    full: 'suffix-meta',
+    help: 'Suffix for metadata files (default: \'.meta\')',
+    abbr: 'sM'
+  })
   .option('suffixChanges', {
     full: 'suffix-changes',
     help: 'Suffix for acl files (default: \'.changes\')',
diff --git a/handlers/get.js b/handlers/get.js
@@ -18,17 +18,17 @@ var file = require('../fileStore.js');
 var subscription = require('../subscription.js');
 
 var ldpVocab = require('../vocab/ldp.js');
-var metaExtension = '.meta';
 var turtleExtension = '.ttl';
 
 function get(req, res, includeBody) {
     var ldp = req.app.locals.ldp;
     var uri = file.uriBase(req);
+    var filename = file.uriToFilename(req.path, ldp.root);
 
     // Add request to subscription service
     if (req.path.slice(-ldp.suffixChanges.length) ===
         ldp.suffixChanges) {
-        debug("GET -- Subscribed to ", req.originalUrl);
+        debug("GET -- Subscribed to " + req.originalUrl);
         return subscription.subscribeToChanges(req, res);
     }
 
@@ -51,16 +51,15 @@ function get(req, res, includeBody) {
         debug('HEAD -- ' + req.originalUrl);
     }
 
-    var filename = file.uriToFilename(req.path, ldp.root);
-
+    // Add ACL and Meta Link in header
     var aclLink = file.getResourceLink(
         filename, uri,
         ldp.root, ldp.suffixAcl,
-        metaExtension);
+        ldp.suffixMeta);
 
     var metaLink = file.getResourceLink(
         filename, uri,
-        ldp.root, metaExtension,
+        ldp.root, ldp.suffixMeta,
         ldp.suffixAcl);
 
     header.addLink(res, aclLink, 'acl');
@@ -98,7 +97,7 @@ function get(req, res, includeBody) {
             // Consider acl and meta files text/turtle
             if (path.extname(filename) === ldp.suffixAcl ||
                 path.basename(filename) === turtleExtension ||
-                path.basename(filename) === metaExtension) {
+                path.basename(filename) === ldp.suffixMeta) {
                 contentType = 'text/turtle';
             }
 
diff --git a/ldp.js b/ldp.js
@@ -15,7 +15,6 @@ var debug = require('./logging');
 
 var utils = require('./fileStore.js');
 var ns = require('./vocab/ns.js').ns;
-var metaExtension = '.meta';
 var turtleExtension = '.ttl';
 
 module.exports = LDP;
@@ -45,6 +44,7 @@ function LDP(argv) {
   // Processed
   ldp.leavePatchConnectionOpen = false;
   ldp.suffixAcl = argv.suffixAcl || ".acl";
+  ldp.suffixMeta = argv.suffixMeta || ".meta";
   ldp.suffixChanges = argv.suffixChanges || '.changes';
   ldp.suffixSSE = argv.suffixSSE || '.events';
 
@@ -87,7 +87,7 @@ LDP.prototype.readFile = function (filename, callback) {
 };
 
 LDP.prototype.readContainerMeta = function (directory, callback) {
-  fs.readFile(directory + metaExtension, {
+  fs.readFile(directory + this.suffixMeta, {
     'encoding': 'utf8'
   }, function(err, data) {
     if (err) {
@@ -144,7 +144,7 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
     function (files, next) {
 
       async.each(files, function(file, cb) {
-        if (S(file).endsWith(metaExtension) || S(file).endsWith(ldp.suffixAcl)) {
+        if (S(file).endsWith(ldp.suffixMeta) || S(file).endsWith(ldp.suffixAcl)) {
           return cb(null);
         }
           
@@ -165,12 +165,12 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
           var fileSubject = file;
 
           if (stats.isDirectory()) {
-              metaFile = filename + file + '/' + metaExtension;
+              metaFile = filename + file + '/' + ldp.suffixMeta;
               fileSubject += '/';
           } else if (stats.isFile() && S(file).endsWith(turtleExtension)) {
               metaFile = filename + file;
           } else {
-              metaFile = filename + file + metaExtension;
+              metaFile = filename + file + ldp.suffixMeta;
           }
           fileBaseUri = utils.filenameToBaseUri(file, uri, ldp.root);
 
@@ -322,7 +322,7 @@ LDP.prototype.delete = function(filename, callback) {
 };
 
 LDP.prototype.deleteContainerMetadata = function(directory, callback) {
-    return fs.unlink(directory + metaExtension, function(err, data) {
+    return fs.unlink(directory + this.suffixMeta, function(err, data) {
         if (err) {
             debug.container("DELETE -- unlink() error: " + err);
             return callback({status:404, message: "Can't delete container: " + err });
@@ -447,15 +447,15 @@ LDP.prototype.createNewContainer = function (uri, containerPath, containerGraph,
 };
 
 LDP.prototype.writeContainerMetadata = function (directory, container, callback) {
-    fs.writeFile(directory + metaExtension, container, callback);
+    fs.writeFile(directory + this.suffixMeta, container, callback);
 };
 
 LDP.prototype.isMetadataFile = function (filename) {
-    if (path.extname(filename) === metaExtension)
+    if (path.extname(filename) === this.suffixMeta)
         return true;
     return false;
 };
 
 LDP.prototype.hasContainerMetadata = function(directory) {
-    return fs.existsSync(directory + metaExtension);
+    return fs.existsSync(directory + this.suffixMeta);
 };
diff --git a/test/params.js b/test/params.js
@@ -25,6 +25,24 @@ function write (text, file) {
 
 describe('params', function () {
 
+  describe('suffixMeta', function () {
+    describe('not passed', function() {
+      it('should fallback on .meta', function() {
+        var ldp = ldnode();
+        assert.equal(ldp.locals.ldp.suffixMeta, '.meta');
+      });
+    });
+  });
+
+  describe('suffixAcl', function () {
+    describe('not passed', function() {
+      it('should fallback on .acl', function() {
+        var ldp = ldnode();
+        assert.equal(ldp.locals.ldp.suffixAcl, '.acl');
+      });
+    });
+  });
+
   describe('mount', function () {
 
     describe('not passed', function () {
