Use ResourceMapper in ldp#readResource.

Author: RubenVerborgh

lib/handlers/allow.js

@@ -1,7 +1,6 @@
 module.exports = allow
 
 const ACL = require('../acl-checker')
-const $rdf = require('rdflib')
 const utils = require('../utils')
 const debug = require('../debug.js').ACL
 const LegacyResourceMapper = require('../legacy-resource-mapper')
@@ -72,19 +71,6 @@ function allow (mode) {
  */
 function fetchFromLdp (mapper, ldp) {
   return function fetch (url, callback) {
-    // Convert the URL into a filename
-    mapper.mapUrlToFile({ url })
-    // Read the file from disk
-    .then(({ path }) => new Promise((resolve, reject) => {
-      ldp.readFile(path, (e, c) => e ? reject(e) : resolve(c))
-    }))
-    // Parse the file as Turtle
-    .then(body => {
-      const graph = $rdf.graph()
-      $rdf.parse(body, graph, url, 'text/turtle')
-      return graph
-    })
-    // Return the ACL graph
-    .then(graph => callback(null, graph), callback)
+    ldp.getGraph(url).then(g => callback(null, g), callback)
   }
 }

lib/ldp-container.js

@@ -1,7 +1,6 @@
 module.exports.addContainerStats = addContainerStats
 module.exports.addFile = addFile
 module.exports.addStats = addStats
-module.exports.getMetadataGraph = getMetadataGraph
 module.exports.readdir = readdir
 
 const $rdf = require('rdflib')
@@ -61,7 +60,7 @@ function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file
     // Set up a metaFile path
     // Earlier code used a .ttl file as its own meta file, which
     // caused massive data files to parsed as part of deirectory listings just looking for type triples
-    const metaFile = container + file + ldp.suffixMeta
+    const metaFile = containerUri + file + ldp.suffixMeta
 
     getMetadataGraph(ldp, metaFile, memberUri, function (err, metadataGraph) {
       if (err) {
@@ -160,25 +159,11 @@ function getMetadataGraph (ldp, metaFile, fileBaseUri, callback) {
     }
 
     if (metaStats && metaStats.isFile()) {
-      ldp.readFile(metaFile, function (err, rawMetadata) {
-        if (err) {
-          return callback(err)
-        }
-
-        const metadataGraph = $rdf.graph()
-        try {
-          $rdf.parse(
-            rawMetadata,
-            metadataGraph,
-            fileBaseUri,
-            'text/turtle')
-        } catch (dirErr) {
-          return callback(error(err, 'Can\'t parse container metadata'))
-        }
-        return callback(null, metadataGraph)
-      })
+      ldp.getGraph(metaFile)
+         .then(graph => callback(null, graph),
+           err => callback(error(err, 'Can\'t parse container metadata')))
     } else {
-      return callback(null, $rdf.graph())
+      callback(null, $rdf.graph())
     }
   })
 }

lib/ldp.js

@@ -109,31 +109,24 @@ class LDP {
     }
   }
 
-  readFile (filename, callback) {
-    fs.readFile(
-      filename,
-      { 'encoding': 'utf8' },
-      function (err, data) {
-        if (err) {
-          return callback(error(err, "Can't read file"))
-        }
-        return callback(null, data)
-      })
+  async readResource (url) {
+    const { path } = await this.resourceMapper.mapUrlToFile({ url })
+    return new Promise((resolve, reject) => {
+      fs.readFile(
+        path,
+        { 'encoding': 'utf8' },
+        (err, data) => {
+          if (err) return reject(error(err, "Can't read file"))
+          resolve(data)
+        })
+    })
   }
 
   async readContainerMeta (url, callback) {
     if (url[ url.length - 1 ] !== '/') {
       url += '/'
     }
-    url += this.suffixMeta
-
-    const { path } = await this.resourceMapper.mapUrlToFile({ url })
-    return new Promise((resolve, reject) => {
-      this.readFile(path, function (err, data) {
-        if (err) return reject(error(err, "Can't read meta file"))
-        resolve(data)
-      })
-    })
+    return this.readResource(url + this.suffixMeta)
   }
 
   listContainer (filename, reqUri, uri, containerData, contentType, callback) {
@@ -360,19 +353,15 @@ class LDP {
    * @return {Promise<Graph>}
    */
   getGraph (uri, contentType = DEFAULT_CONTENT_TYPE) {
-    const { path } = url.parse(uri)
-    return this.graph(path, uri, contentType)
+    return this.graph(uri, uri, contentType)
   }
 
   async graph (url, baseUri, contentType = 'text/turtle') {
-    const { path } = await this.resourceMapper.mapUrlToFile({ url })
+    const body = await this.readResource(url)
     return new Promise((resolve, reject) => {
-      this.readFile(path, (err, body) => {
-        if (err) return reject(err)
-        const graph = $rdf.graph()
-        $rdf.parse(body, graph, baseUri, contentType,
-          err => err ? reject(err) : resolve(graph))
-      })
+      const graph = $rdf.graph()
+      $rdf.parse(body, graph, baseUri, contentType,
+        err => err ? reject(err) : resolve(graph))
     })
   }
 

test/integration/ldp-test.js

@@ -29,22 +29,19 @@ describe('LDP', function () {
     webid: false
   })
 
-  describe('readFile', function () {
-    it('return 404 if file does not exist', function (done) {
-      ldp.readFile('resources/unexistent.ttl', function (err) {
+  describe('readResource', function () {
+    it('return 404 if file does not exist', () => {
+      return ldp.readResource('/resources/unexistent.ttl').catch(err => {
         assert.equal(err.status, 404)
-        done()
       })
     })
 
-    it('return file if file exists', function (done) {
+    it('return file if file exists', () => {
       // file can be empty as well
       write('hello world', 'fileExists.txt')
-      ldp.readFile(path.join(__dirname, '../resources/fileExists.txt'), function (err, file) {
+      return ldp.readResource('/resources/fileExists.txt').then(file => {
         rm('fileExists.txt')
-        assert.notOk(err)
         assert.equal(file, 'hello world')
-        done()
       })
     })
   })