Use ResourceMapper in ldp#readContainerMeta.

Author: RubenVerborgh

lib/ldp.js

@@ -121,19 +121,18 @@ class LDP {
       })
   }
 
-  readContainerMeta (directory, callback) {
-    const ldp = this
-
-    if (directory[ directory.length - 1 ] !== '/') {
-      directory += '/'
+  async readContainerMeta (url, callback) {
+    if (url[ url.length - 1 ] !== '/') {
+      url += '/'
     }
+    url += this.suffixMeta
 
-    ldp.readFile(directory + ldp.suffixMeta, function (err, data) {
-      if (err) {
-        return callback(error(err, "Can't read meta file"))
-      }
-
-      return callback(null, data)
+    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)
+      })
     })
   }
 
@@ -409,10 +408,9 @@ class LDP {
 
       // Found a container
       if (stats.isDirectory()) {
-        return ldp.readContainerMeta(filename, function (err, metaFile) {
-          if (err) {
-            metaFile = ''
-          }
+        return ldp.readContainerMeta(reqPath)
+        .catch(() => '')
+        .then(metaFile => {
           const absContainerUri = baseUri + reqPath
           ldp.listContainer(filename, absContainerUri, baseUri, metaFile, contentType,
             function (err, data) {

test/integration/ldp-test.js

@@ -49,33 +49,28 @@ describe('LDP', function () {
     })
   })
 
-  describe('readContainerMeta', function () {
-    it('should return 404 if .meta is not found', function (done) {
-      ldp.readContainerMeta('resources/', function (err) {
+  describe('readContainerMeta', () => {
+    it('should return 404 if .meta is not found', () => {
+      return ldp.readContainerMeta('/resources/').catch(err => {
         assert.equal(err.status, 404)
-        done()
       })
     })
 
-    it('should return content if metaFile exists', function (done) {
+    it('should return content if metaFile exists', () => {
       // file can be empty as well
       write('This function just reads this, does not parse it', '.meta')
-      ldp.readContainerMeta(path.join(__dirname, '../resources/'), function (err, metaFile) {
+      return ldp.readContainerMeta('/resources/').then(metaFile => {
         rm('.meta')
-        assert.notOk(err)
         assert.equal(metaFile, 'This function just reads this, does not parse it')
-        done()
       })
     })
 
-    it('should work also if trailing `/` is not passed', function (done) {
+    it('should work also if trailing `/` is not passed', () => {
       // file can be empty as well
       write('This function just reads this, does not parse it', '.meta')
-      ldp.readContainerMeta(path.join(__dirname, '../resources'), function (err, metaFile) {
+      return ldp.readContainerMeta('/resources').then(metaFile => {
         rm('.meta')
-        assert.notOk(err)
         assert.equal(metaFile, 'This function just reads this, does not parse it')
-        done()
       })
     })
   })