fixes issue where requesting a different format (e.g. text/turtle) of a jsonld resource crashed the server (nodeSolidServer#474)

ryankeener · dmitrizagidulin · commit b6e6d9e05504 · 2016-12-22T11:19:30.000-05:00
diff --git a/lib/utils.js b/lib/utils.js
@@ -100,11 +100,10 @@ function getResourceLink (filename, uri, base, suffix, otherSuffix) {
 function parse (data, baseUri, contentType, callback) {
   var graph = $rdf.graph()
   try {
-    $rdf.parse(data, graph, baseUri, contentType)
+    return $rdf.parse(data, graph, baseUri, contentType, callback)
   } catch (err) {
     return callback(err)
   }
-  return callback(null, graph)
 }
 
 function serialize (graph, baseUri, contentType, callback) {
diff --git a/test/formats.js b/test/formats.js
@@ -83,6 +83,13 @@ describe('formats', function () {
         .expect(200, done)
     })
 
+    it('should return turtle document if Accept is set to turtle', function (done) {
+      server.get('/lennon.jsonld')
+        .set('accept', 'text/turtle')
+        .expect('content-type', /text\/turtle/)
+        .expect(200, done)
+    })
+
     it('should return turtle when listing container', function (done) {
       server.get('/sampleContainer/')
         .set('accept', 'application/rdf+xml;q=0.4, application/xhtml+xml;q=0.3, text/xml;q=0.2, application/xml;q=0.2, text/html;q=0.3, text/plain;q=0.1, text/turtle;q=1.0, application/n3;q=1')
diff --git a/test/resources/lennon.jsonld b/test/resources/lennon.jsonld
@@ -0,0 +1,7 @@
+{
+  "@context": "http://json-ld.org/contexts/person.jsonld",
+  "@id": "http://dbpedia.org/resource/John_Lennon",
+  "name": "John Lennon",
+  "born": "1940-10-09",
+  "spouse": "http://dbpedia.org/resource/Cynthia_Lennon"
+}

Original file line number	Diff line number	Diff line change
`@@ -100,11 +100,10 @@ function getResourceLink (filename, uri, base, suffix, otherSuffix) {`
`100`	`100`	`function parse (data, baseUri, contentType, callback) {`
`101`	`101`	`var graph = $rdf.graph()`
`102`	`102`	`try {`
`103`		`- $rdf.parse(data, graph, baseUri, contentType)`
	`103`	`+ return $rdf.parse(data, graph, baseUri, contentType, callback)`
`104`	`104`	`} catch (err) {`
`105`	`105`	`return callback(err)`
`106`	`106`	`}`
`107`		`- return callback(null, graph)`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`function serialize (graph, baseUri, contentType, callback) {`