Moving code around, to handle streams correctly

And make old tests pass

Author: megoth

lib/handlers/put.js

@@ -1,5 +1,6 @@
 module.exports = handler
 
+const bodyParser = require('body-parser')
 const debug = require('debug')('solid:put')
 const getContentType = require('../utils').getContentType
 
@@ -20,3 +21,45 @@ async function handler (req, res, next) {
     return next(err)
   }
 }
+
+// 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 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()
+//   }
+// }

lib/handlers/validate.js

@@ -10,7 +10,6 @@ const del = require('./handlers/delete')
 const patch = require('./handlers/patch')
 const index = require('./handlers/index')
 const copy = require('./handlers/copy')
-// const validate = require('./handlers/validate')
 
 function LdpMiddleware (corsSettings) {
   const router = express.Router('/')

lib/ldp-middleware.js

@@ -203,6 +203,17 @@ 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
+  // }
+
   async put (url, stream, contentType) {
     // PUT requests not supported on containers. Use POST instead
     if ((url.url || url).endsWith('/')) {
@@ -452,7 +463,7 @@ class LDP {
     return ensureNotExists(this, path.join(containerURI, filename))
   }
 
-  static mimetypeIsRdf (mimeType) {
+  mimetypeIsRdf (mimeType) {
     return RDF_MIME_TYPES.indexOf(mimeType) !== -1
   }
 }

lib/ldp.js

@@ -0,0 +1,59 @@
+const fs = require('fs')
+const path = require('path')
+const { setupSuperServer } = require('../utils')
+
+const server = setupSuperServer({
+  live: true,
+  dataBrowserPath: 'default',
+  root: path.join(__dirname, '../resources'),
+  auth: 'oidc',
+  webid: false
+})
+
+describe('Validate HTTP requests with Turtle syntax', function () {
+  describe('PUT API', function () {
+    const putRequestBody = fs.readFileSync(path.join(__dirname, '../resources/sampleContainer/invalid.ttl'), {
+      'encoding': 'utf8'
+    })
+    it('should return 400', function (done) {
+      server.put('/put-resource-1.ttl')
+        .send(putRequestBody)
+        .set('content-type', 'text/turtle')
+        .expect(400, done)
+    })
+  })
+
+  // describe('POST (multipart)', function () {
+  //   it('should create as many files as the ones passed in multipart',
+  //     function (done) {
+  //       server.post('/sampleContainer/')
+  //         .attach('timbl', path.join(__dirname, '../resources/timbl.jpg'))
+  //         .attach('nicola', path.join(__dirname, '../resources/nicola.jpg'))
+  //         .expect(200)
+  //         .end(function (err) {
+  //           if (err) return done(err)
+  //
+  //           var sizeNicola = fs.statSync(path.join(__dirname,
+  //             '../resources/nicola.jpg')).size
+  //           var sizeTim = fs.statSync(path.join(__dirname, '../resources/timbl.jpg')).size
+  //           var sizeNicolaLocal = fs.statSync(path.join(__dirname,
+  //             '../resources/sampleContainer/nicola.jpg')).size
+  //           var sizeTimLocal = fs.statSync(path.join(__dirname,
+  //             '../resources/sampleContainer/timbl.jpg')).size
+  //
+  //           if (sizeNicola === sizeNicolaLocal && sizeTim === sizeTimLocal) {
+  //             return done()
+  //           } else {
+  //             return done(new Error('Either the size (remote/local) don\'t match or files are not stored'))
+  //           }
+  //         })
+  //     })
+  //   after(function () {
+  //     // Clean up after POST (multipart) API tests
+  //     return Promise.all([
+  //       rm('/sampleContainer/nicola.jpg'),
+  //       rm('/sampleContainer/timbl.jpg')
+  //     ])
+  //   })
+  // })
+})

test/integration/validate-tts.js

@@ -0,0 +1,13 @@
+@prefix ldp: <http://www.w3.org/ns/ldp#>.
+@prefix o: <http://example.org/ontology#>.
+
+<http://example.org/netWorth/nw1/>
+   test o:NetWorth;
+   o:netWorthOf <http://example.org/users/JohnZSmith>;
+   o:asset
+      <assets/a1>,
+      <assets/a2>;
+   o:liability
+      <liabilities/l1>,
+      <liabilities/l2>,
+      <liabilities/l3>.