Remove hardcoded default content types where unneeded

Author: rubensworks

lib/handlers/patch.js

@@ -16,7 +16,7 @@ const PATCH_PARSERS = {
   'text/n3': require('./patch/n3-patch-parser.js')
 }
 
-const DEFAULT_CONTENT_TYPE = 'text/turtle'
+const DEFAULT_PATCH_CONTENT_TYPE = 'text/turtle'
 
 // Handles a PATCH request
 async function patchHandler (req, res, next) {
@@ -32,7 +32,7 @@ async function patchHandler (req, res, next) {
     } catch (err) {
       // If the file doesn't exist, request one to be created with the default content type
       ({ path, contentType } = await ldp.resourceMapper.mapUrlToFile(
-        { url: req, createIfNotExists: true, contentType: DEFAULT_CONTENT_TYPE }))
+        { url: req, createIfNotExists: true, contentType: DEFAULT_PATCH_CONTENT_TYPE }))
     }
     const { url } = await ldp.resourceMapper.mapFileToUrl({ path, hostname: req.hostname })
     const resource = { path, contentType, url }

lib/ldp.js

@@ -16,7 +16,7 @@ const parse = require('./utils').parse
 const fetch = require('node-fetch')
 const { promisify } = require('util')
 
-const DEFAULT_CONTENT_TYPE = 'text/turtle'
+const DEFAULT_REMOTE_CONTENT_TYPE = 'text/turtle'
 
 const RDF_MIME_TYPES = [
   'text/turtle',            // .ttl
@@ -197,7 +197,7 @@ class LDP {
    *
    * @return {Promise<Graph>}
    */
-  async putGraph (graph, uri, contentType = DEFAULT_CONTENT_TYPE) {
+  async putGraph (graph, uri, contentType) {
     const { path } = url.parse(uri)
     const content = await serialize(graph, uri, contentType)
     let stream = stringToStream(content)
@@ -286,7 +286,7 @@ class LDP {
     }
     const body = await response.text()
 
-    const contentType = options.contentType || DEFAULT_CONTENT_TYPE
+    const contentType = options.contentType || DEFAULT_REMOTE_CONTENT_TYPE
 
     return promisify(parse)(body, uri, contentType)
   }
@@ -309,12 +309,15 @@ class LDP {
    *
    * @return {Promise<Graph>}
    */
-  getGraph (uri, contentType = DEFAULT_CONTENT_TYPE) {
+  getGraph (uri, contentType) {
     return this.graph(uri, uri, contentType)
   }
 
-  async graph (url, baseUri, contentType = DEFAULT_CONTENT_TYPE) {
+  async graph (url, baseUri, contentType) {
     const body = await this.readResource(url)
+    if (!contentType) {
+      ({ contentType } = await this.resourceMapper.mapUrlToFile({ url }))
+    }
     return new Promise((resolve, reject) => {
       const graph = $rdf.graph()
       $rdf.parse(body, graph, baseUri, contentType,