Changes to code based on feedback

Author: megoth

lib/handlers/get.js

@@ -15,6 +15,8 @@ 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()
 
 async function handler (req, res, next) {
   const ldp = req.app.locals.ldp

lib/ldp.js

@@ -17,6 +17,7 @@ const parse = require('./utils').parse
 const fetch = require('node-fetch')
 const { promisify } = require('util')
 
+// TODO: apply new Set
 const RDF_MIME_TYPES = [
   'text/turtle',            // .ttl
   'text/n3',                // .n3
@@ -28,7 +29,7 @@ const RDF_MIME_TYPES = [
   'application/rdf+xml',    // .rdf
   'application/ld+json',    // .jsonld
   'application/x-turtle'
-]
+])
 
 class LDP {
   constructor (argv = {}) {
@@ -463,9 +464,12 @@ class LDP {
     return ensureNotExists(this, path.join(containerURI, filename))
   }
 
-  mimetypeIsRdf (mimeType) {
-    return RDF_MIME_TYPES.indexOf(mimeType) !== -1
+  static mimeTypeIsRdf (mimeType) {
+    return RDF_MIME_TYPES.has(mimeType)
+  }
+
+  static mimeTypesAsArray () {
+    return Array.from(RDF_MIME_TYPES)
   }
 }
 module.exports = LDP
-module.exports.RDF_MIME_TYPES = RDF_MIME_TYPES

lib/models/account-template.js

@@ -5,8 +5,8 @@ const mime = require('mime-types')
 const recursiveRead = require('recursive-readdir')
 const fsUtils = require('../common/fs-utils')
 const templateUtils = require('../common/template-utils')
+const LDP = require('../ldp')
 
-const RDF_MIME_TYPES = require('../ldp').RDF_MIME_TYPES
 const TEMPLATE_EXTENSIONS = [ '.acl', '.meta', '.json', '.hbs', '.handlebars' ]
 const TEMPLATE_FILES = [ 'card' ]
 
@@ -31,7 +31,6 @@ class AccountTemplate {
    */
   constructor (options = {}) {
     this.substitutions = options.substitutions || {}
-    this.rdfMimeTypes = options.rdfMimeTypes || RDF_MIME_TYPES
     this.templateExtensions = options.templateExtensions || TEMPLATE_EXTENSIONS
     this.templateFiles = options.templateFiles || TEMPLATE_FILES
   }
@@ -136,11 +135,12 @@ class AccountTemplate {
    * @return {boolean}
    */
   isTemplate (filePath) {
-    let parsed = path.parse(filePath)
+    const parsed = path.parse(filePath)
 
-    let isRdf = this.rdfMimeTypes.includes(mime.lookup(filePath))
-    let isTemplateExtension = this.templateExtensions.includes(parsed.ext)
-    let isTemplateFile = this.templateFiles.includes(parsed.base) ||
+    const mimeType = mime.lookup(filePath)
+    const isRdf = LDP.mimeTypeIsRdf(mimeType)
+    const isTemplateExtension = this.templateExtensions.includes(parsed.ext)
+    const isTemplateFile = this.templateFiles.includes(parsed.base) ||
         this.templateExtensions.includes(parsed.base)  // the '/.acl' case
 
     return isRdf || isTemplateExtension || isTemplateFile

test/integration/http-test.js

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