Use ResourceMapper in ldp#graph.

Author: RubenVerborgh

lib/ldp.js

@@ -361,42 +361,22 @@ class LDP {
    * @return {Promise<Graph>}
    */
   getGraph (uri, contentType = DEFAULT_CONTENT_TYPE) {
-    const parsedUri = url.parse(uri)
-    const path = parsedUri.pathname
-    const hostname = parsedUri.hostname
+    const { path } = url.parse(uri)
+    return this.graph(path, uri, contentType)
+  }
 
+  async graph (url, baseUri, contentType = 'text/turtle') {
+    const { path } = await this.resourceMapper.mapUrlToFile({ url })
     return new Promise((resolve, reject) => {
-      this.graph(hostname, path, uri, contentType, (error, graph) => {
-        if (error) { return reject(error) }
-
-        resolve(graph)
+      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))
       })
     })
   }
 
-  graph (host, reqPath, baseUri, contentType, callback) {
-    const ldp = this
-
-    // overloading
-    if (typeof contentType === 'function') {
-      callback = contentType
-      contentType = 'text/turtle'
-    }
-
-    if (typeof baseUri === 'function') {
-      callback = baseUri
-      baseUri = undefined
-    }
-
-    const root = ldp.multiuser ? ldp.root + host + '/' : ldp.root
-    const filename = utils.uriToFilename(reqPath, root)
-
-    ldp.readFile(filename, (err, body) => {
-      if (err) return callback(err)
-      parse(body, baseUri, contentType, callback)
-    })
-  }
-
   get (options, callback) {
     let host
     let reqPath

lib/utils.js

@@ -4,7 +4,6 @@ module.exports.getBaseUri = getBaseUri
 module.exports.pathBasename = pathBasename
 module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
-module.exports.parse = parse
 module.exports.serialize = serialize
 module.exports.translate = translate
 module.exports.stringToStream = stringToStream
@@ -144,15 +143,6 @@ function hasSuffix (path, suffixes) {
   return false
 }
 
-function parse (data, baseUri, contentType, callback) {
-  const graph = $rdf.graph()
-  try {
-    return $rdf.parse(data, graph, baseUri, contentType, callback)
-  } catch (err) {
-    return callback(err)
-  }
-}
-
 function serialize (graph, baseUri, contentType, callback) {
   try {
     // target, kb, base, contentType, callback
@@ -189,7 +179,8 @@ function translate (stream, baseUri, from, to, callback) {
       data += chunk
     })
     .on('end', function () {
-      parse(data, baseUri, from, function (err, graph) {
+      const graph = $rdf.graph()
+      $rdf.parse(data, graph, baseUri, from, function (err) {
         if (err) return callback(err)
         serialize(graph, baseUri, to, function (err, data) {
           if (err) return callback(err)