serialize to jsonld

Author: bourgeoa

lib/handlers/patch.js

@@ -177,23 +177,34 @@ function writeGraph (graph, resource, root, serverUri) {
   debug('PATCH -- Writing patched file')
   return new Promise((resolve, reject) => {
     const resourceSym = graph.sym(resource.url)
-    const serialized = $rdf.serialize(resourceSym, graph, resource.url, resource.contentType)
 
-    // First check if we are above quota
-    overQuota(root, serverUri).then((isOverQuota) => {
-      if (isOverQuota) {
-        return reject(error(413,
-          'User has exceeded their storage quota'))
-      }
-
-      fs.writeFile(resource.path, serialized, { encoding: 'utf8' }, function (err) {
-        if (err) {
-          return reject(error(500, `Failed to write file after patch: ${err}`))
+    function doWrite (serialized) {
+      // First check if we are above quota
+      overQuota(root, serverUri).then((isOverQuota) => {
+        if (isOverQuota) {
+          return reject(error(413,
+            'User has exceeded their storage quota'))
         }
-        debug('PATCH -- applied successfully')
-        resolve('Patch applied successfully.\n')
+
+        fs.writeFile(resource.path, serialized, { encoding: 'utf8' }, function (err) {
+          if (err) {
+            return reject(error(500, `Failed to write file after patch: ${err}`))
+          }
+          debug('PATCH -- applied successfully')
+          resolve('Patch applied successfully.\n')
+        })
+      }).catch(() => reject(error(500, 'Error finding user quota')))
+    }
+
+    if (resource.contentType === 'application/ld+json') {
+      $rdf.serialize(resourceSym, graph, resource.url, resource.contentType, function (err, result) {
+        if (err) return reject(error(500, `Failed to serialize after patch: ${err}`))
+        doWrite(result)
       })
-    }).catch(() => reject(error(500, 'Error finding user quota')))
+    } else {
+      const serialized = $rdf.serialize(resourceSym, graph, resource.url, resource.contentType)
+      doWrite(serialized)
+    }
   })
 }
 

lib/resource-mapper.js

@@ -149,7 +149,7 @@ class ResourceMapper {
 
   // encode/decode path except slash (/) / %encodedSlash (%2F|%2f) /ntimes%encodedSlash (%2525...2F|%2525...2f)
   // see https://github.com/solid/node-solid-server/issues/1666
-  _exceptSlash () { return /(\/|%(?:25)*(?:2[Ff]))/g }
+  _exceptSlash () { return /(\/|%(?:25)*(?:2f))/gi }
 
   _encodePath (pathname) {
     return pathname.split(this._exceptSlash())