Promisify ldp#post

Author: rubensworks

lib/handlers/post.js

@@ -86,16 +86,14 @@ function handler (req, res, next) {
     const extension = mimeType in extensions ? `.${extensions[mimeType][0]}` : ''
 
     ldp.post(req.hostname, containerPath, req,
-      { slug, extension, container: links.isBasicContainer },
-      function (err, resourcePath) {
-        if (err) {
-          return next(err)
-        }
+      { slug, extension, container: links.isBasicContainer }).then(
+      resourcePath => {
         debug('File stored in ' + resourcePath)
         header.addLinks(res, links)
         res.set('Location', resourcePath)
         res.sendStatus(201)
         next()
-      })
+      },
+      err => next(err))
   }
 }

lib/ldp.js

@@ -163,39 +163,35 @@ class LDP {
     }
   }
 
-  post (host, containerPath, stream, { container, slug, extension }, callback) {
+  async post (host, containerPath, stream, { container, slug, extension }) {
     const ldp = this
     debug.handlers('POST -- On parent: ' + containerPath)
     // prepare slug
     if (slug) {
       slug = decodeURIComponent(slug)
       if (slug.match(/\/|\||:/)) {
-        callback(error(400, 'The name of new file POSTed may not contain : | or /'))
-        return
+        throw error(400, 'The name of new file POSTed may not contain : | or /')
       }
     }
     // Containers should not receive an extension
     if (container) {
       extension = ''
     }
     // TODO: possibly package this in ldp.post
-    ldp.getAvailablePath(host, containerPath, { slug, extension })
-      .then(async resourcePath => {
-        debug.handlers('POST -- Will create at: ' + resourcePath)
-        let originalPath = resourcePath
-        if (container) {
-          // Create directory by an LDP PUT to the container's .meta resource
-          resourcePath = path.join(originalPath, ldp.suffixMeta)
-          if (originalPath && !originalPath.endsWith('/')) {
-            originalPath += '/'
-          }
-        }
-        const { url: putUrl } = await this.resourceMapper.mapFileToUrl(
-          { path: this.resourceMapper._rootPath + resourcePath, hostname: host })
-        await ldp.put(putUrl, stream)
-        callback(null, originalPath)
-      })
-      .catch((err) => callback(err))
+    let resourcePath = await ldp.getAvailablePath(host, containerPath, { slug, extension })
+    debug.handlers('POST -- Will create at: ' + resourcePath)
+    let originalPath = resourcePath
+    if (container) {
+      // Create directory by an LDP PUT to the container's .meta resource
+      resourcePath = path.join(originalPath, ldp.suffixMeta)
+      if (originalPath && !originalPath.endsWith('/')) {
+        originalPath += '/'
+      }
+    }
+    const { url: putUrl } = await this.resourceMapper.mapFileToUrl(
+      { path: this.resourceMapper._rootPath + resourcePath, hostname: host })
+    await ldp.put(putUrl, stream)
+    return originalPath
   }
 
   /**