solving and cleaning little TODOs

nicola · nicola · commit 182e90d1a293 · 2015-07-27T04:05:32.000+02:00
diff --git a/acl.js b/acl.js
@@ -1,8 +1,6 @@
 /*jslint node: true*/
 /*jshint loopfunc:true */
 "use strict";
-
-var fs = require('fs');
 var glob = require('glob');
 var path = require('path');
 var $rdf = require('rdflib');
@@ -154,12 +152,15 @@ ACL.prototype.findACL = function(mode, address, userId, callback) {
                         return done(true);
                     }
 
-                    // Set the new path for the next loop iteration
-                    accessType = "defaultForNew";
+                    // if we have iterated through all the relativePaths
+                    // and it is not the first iteration
                     if (relativePath.length === 0 && i !== 0) {
-                        // TODO handle this error
                         return done(true);
-                    } else if (path.dirname(path.dirname(relativePath)) === '.') {
+                    }
+
+                    // Set the new path for the next loop iteration
+                    accessType = "defaultForNew";
+                    if (path.dirname(path.dirname(relativePath)) === '.') {
                         filepath = ldp.root;
                     } else {
                         filepath = ldp.root + path.dirname(relativePath);
@@ -382,13 +383,12 @@ ACL.prototype.fetchDocument = function(uri, callback) {
                     return cb(null, '');
                 }
                 
-                return fs.readFile(documentPath, {encoding: 'utf8'}, cb);
+                return ldp.readFile(documentPath, cb);
             });
         },
         function (body, cb) {
             try {
                 $rdf.parse(body, graph, uri, 'text/turtle');
-                // TODO, check what to return
                 return cb(null, graph);
             } catch(err) {
                 return cb(err, graph);
diff --git a/handlers/get.js b/handlers/get.js
@@ -52,21 +52,21 @@ function get(req, res, includeBody) {
     }
 
     var filename = file.uriToFilename(req.path, ldp.root);
-    var baseUri = file.uriBase(req);
 
     var aclLink = file.getResourceLink(
-        filename, baseUri,
+        filename, uri,
         ldp.root, ldp.suffixAcl,
         metaExtension);
 
     var metaLink = file.getResourceLink(
-        filename, baseUri,
+        filename, uri,
         ldp.root, metaExtension,
         ldp.suffixAcl);
 
     header.addLink(res, aclLink, 'acl');
     header.addLink(res, metaLink, 'describedBy');
 
+    // Get resource or container
     ldp.get(filename, uri, includeBody, function(err, data, container) {
 
         // This should be implemented in LDP.prototype.get
@@ -75,6 +75,7 @@ function get(req, res, includeBody) {
             return globHandler(req, res);
         }
 
+
         if (err) {
             debug('GET/HEAD -- Read error: ' + err);
             return res
@@ -112,9 +113,7 @@ function get(req, res, includeBody) {
         // TODO this should be added as a middleware in the routes
         res.locals.turtleData = data;
         return parseLinkedData(req, res);
-
     });
-
 }
 
 function globHandler(req, res) {
@@ -180,8 +179,6 @@ function aclAllow(match, req, res, callback) {
     }
 
     var relativePath = '/' + path.relative(ldp.root, match);
-
-    // TODO find a better hack, maybe pass as a param?
     res.locals.path = relativePath;
     acl.allow("Read", req, res, function(err) {
         callback(!err);
@@ -218,6 +215,7 @@ function parseLinkedData(req, res) {
             .send(err);
     }
 
+    // Graph to `accept` type
     $rdf.serialize(undefined, resourceGraph, null, accept, function(err, result) {
         if (result === undefined || err) {
             debug("GET/HEAD -- Serialization error: " + err);
diff --git a/ldp.js b/ldp.js
@@ -56,7 +56,7 @@ function LDP(argv) {
   ldp.xssProxy = argv.xssProxy;
   ldp.proxyFilter = regexp().start(ldp.xssProxy).toRegExp();
 
-  // TODO this should be an attribute of an object
+  // Cache of usedURIs
   ldp.usedURIs = {};
 
   debug.settings("mount: " + ldp.mount);
@@ -225,19 +225,18 @@ LDP.prototype.listContainer = function (filename, uri, containerData, callback)
     }
   ],
   function (err, data) {
+    var turtleData;
     try {
-      var turtleData = $rdf.serialize(
+      turtleData = $rdf.serialize(
         undefined,
         resourceGraph,
         null,
         'text/turtle');
-
-      // TODO dont forget to parseLinkedData
-      return callback(null, turtleData);
     } catch (parseErr) {
       debug.handlers("GET/HEAD -- Error serializing container: " + parseErr);
       return callback({status: 500, message: parseErr});
     }
+    return callback(null, turtleData);
   });
 };
 
@@ -383,7 +382,6 @@ LDP.prototype.releaseResourceUri = function (uri) {
 LDP.prototype.createNewResource = function(uri, resourcePath, resourceGraph, callback) {
     var ldp = this;
     var resourceURI = path.relative(ldp.root, resourcePath);
-    //TODO write files with relative URIS.
     var rawResource = $rdf.serialize(
         undefined,
         resourceGraph,
