Rebased on v5.0.0

Author: megoth

lib/handlers/get.js

@@ -14,9 +14,7 @@ const allow = require('./allow')
 const translate = require('../utils.js').translate
 const error = require('../http-error')
 
-const RDFs = require('../ldp').RDF_MIME_TYPES
-// const LDP = require('../ldp')
-// const RDFs = LDP.mimeTypesAsArray()
+const RDFs = require('../ldp').mimeTypesAsArray()
 
 async function handler (req, res, next) {
   const ldp = req.app.locals.ldp

lib/handlers/put.js

@@ -3,14 +3,25 @@ module.exports = handler
 const bodyParser = require('body-parser')
 const debug = require('debug')('solid:put')
 const getContentType = require('../utils').getContentType
+const HTTPError = require('../http-error')
+const { stringToStream } = require('../utils')
+const LDP = require('../ldp')
 
 async function handler (req, res, next) {
-  const ldp = req.app.locals.ldp
   debug(req.originalUrl)
   res.header('MS-Author-Via', 'SPARQL')
 
+  const contentType = req.get('content-type')
+  if (LDP.mimeTypeIsRdf(contentType) && isAclFile(req)) {
+    return bodyParser.text({ type: () => true })(req, res, () => putAcl(req, res, next))
+  }
+  return putStream(req, res, next)
+}
+
+async function putStream (req, res, next, stream = req) {
+  const ldp = req.app.locals.ldp
   try {
-    await ldp.put(req, req, getContentType(req.headers))
+    await ldp.put(req, stream, getContentType(req.headers))
     debug('succeded putting the file')
 
     res.sendStatus(201)
@@ -22,51 +33,18 @@ async function handler (req, res, next) {
   }
 }
 
-// function handler (req, res, next) {
-//   const ldp = req.app.locals.ldp
-//   debug(req.originalUrl)
-//   res.header('MS-Author-Via', 'SPARQL')
-// 
-//   const contentType = req.get('content-type')
-//   if (ldp.mimetypeIsRdf(contentType)) {
-//     return bodyParser.text({ type: () => true })(req, res, () => putText(req, res, next))
-//   }
-//   return putStream(req, res, next)
-// }
-//
-//}
-//
-//function isAclFile (req) {
-//  const originalUrlParts = req.originalUrl.split('.')
-//  return originalUrlParts[originalUrlParts.length - 1] === 'acl'
-//}
-// 
-// function putText (req, res, next) {
-//   const ldp = req.app.locals.ldp
-//   const contentType = req.get('content-type')
-//   const requestUri = `${req.protocol}//${req.get('host')}${req.originalUrl}`
-//   if (ldp.isValidRdf(req.body, requestUri, contentType)) {
-//     return ldp.putText(req.hostname, req.path, req.body, handleCallback(res, next))
-//   }
-//   next(error(400, 'RDF file contains invalid syntax'))
-// }
-// 
-// function putStream (req, res, next) {
-//   const ldp = req.app.locals.ldp
-//   ldp.putStream(req.hostname, req.path, req, handleCallback(res, next))
-// }
-// 
-// function handleCallback (res, next) {
-//   return function (err) {
-//     if (err) {
-//       debug('error putting the file:' + err.message)
-//       err.message = 'Can\'t write file: ' + err.message
-//       return next(err)
-//     }
-// 
-//     debug('succeded putting the file')
-// 
-//     res.sendStatus(201)
-//     return next()
-//   }
-// }
+async function putAcl (req, res, next) {
+  const ldp = req.app.locals.ldp
+  const contentType = req.get('content-type')
+  const requestUri = `${req.protocol}//${req.get('host')}${req.originalUrl}`
+  if (ldp.isValidRdf(req.body, requestUri, contentType)) {
+    const stream = stringToStream(req.body)
+    return putStream(req, res, next, stream)
+  }
+  next(new HTTPError(400, 'RDF file contains invalid syntax'))
+}
+
+function isAclFile (req) {
+  const originalUrlParts = req.originalUrl.split('.')
+  return originalUrlParts[originalUrlParts.length - 1] === 'acl'
+}

lib/ldp.js

@@ -17,8 +17,7 @@ const parse = require('./utils').parse
 const fetch = require('node-fetch')
 const { promisify } = require('util')
 
-// TODO: apply new Set
-const RDF_MIME_TYPES = [
+const RDF_MIME_TYPES = new Set([
   'text/turtle',            // .ttl
   'text/n3',                // .n3
   'text/html',              // RDFa
@@ -204,16 +203,16 @@ class LDP {
     return await this.put(path, stream, contentType)
   }
 
-  // isValidRdf (body, requestUri, contentType) {
-  //   const resourceGraph = $rdf.graph()
-  //     try {
-  //       $rdf.parse(body, resourceGraph, requestUri, contentType)
-  //     } catch (err) {
-  //       debug.handlers('VALIDATE -- Error parsing data: ' + err)
-  //       return false
-  //     }
-  //     return true
-  // }
+  isValidRdf (body, requestUri, contentType) {
+    const resourceGraph = $rdf.graph()
+    try {
+      $rdf.parse(body, resourceGraph, requestUri, contentType)
+    } catch (err) {
+      debug.ldp('VALIDATE -- Error parsing data: ' + err)
+      return false
+    }
+    return true
+  }
 
   async put (url, stream, contentType) {
     // PUT requests not supported on containers. Use POST instead

test/integration/http-test.js

@@ -473,10 +473,10 @@ describe('HTTP APIs', function () {
         .expect(hasHeader('acl', 'baz.ttl' + suffixAcl))
         .expect(201, done)
     })
-    it('should fail when trying to put to a container',
+    it('should return 409 code when trying to put to a container',
       function (done) {
         server.put('/')
-          .expect(405, done)
+          .expect(409, done)
       }
     )
     // Cleanup