Skip to content

Commit 1319ba5

Browse files
author
Andrei
committed
Merge pull request #184 from nicola/deprecating-parse
Deprecating parse
2 parents db328de + af1f537 commit 1319ba5

3 files changed

Lines changed: 80 additions & 78 deletions

File tree

‎lib/create-app.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ var LdpMiddleware = require('./ldp-middleware')
99
var proxy = require('./handlers/proxy')
1010
var IdentityProvider = require('./identity-provider')
1111
var vhost = require('vhost')
12+
1213
var corsSettings = cors({
1314
methods: [
1415
'OPTIONS', 'HEAD', 'GET',

‎lib/ldp-middleware.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ var express = require('express')
44
var getRawBody = require('raw-body')
55
var responseTime = require('response-time')
66
var header = require('./header')
7-
var parse = require('./parse')
87
var acl = require('./acl')
98
var login = require('./login')
109
var getHandler = require('./handlers/get.js')
@@ -47,7 +46,8 @@ function LdpMiddleware (corsSettings) {
4746
router.delete('/*', acl.allow('Write'))
4847

4948
// Convert json-ld and nquads to turtle
50-
router.use('/*', parse.parseHandler)
49+
// TODO: in the process of being deprecated
50+
// router.use('/*', parse.parseHandler)
5151

5252
// Add response time
5353
router.use(responseTime())

‎lib/parse.js‎

Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,85 @@
1-
exports.parseHandler = parseHandler
2-
exports.convertToTurtle = convertToTurtle
1+
// TODO: in the process of being deprecated
2+
// exports.parseHandler = parseHandler
3+
// exports.convertToTurtle = convertToTurtle
34

4-
var N3 = require('n3')
5-
var jsonld = require('jsonld')
6-
var debug = require('./debug').parse
5+
// var N3 = require('n3')
6+
// var jsonld = require('jsonld')
7+
// var debug = require('./debug').parse
78

8-
function parseHandler (req, res, next) {
9-
convertToTurtle(req.text, req, function (err, result) {
10-
if (!err) {
11-
req.convertedText = result
12-
} else {
13-
debug('Error parsing request: ' + err)
14-
}
15-
return next()
16-
})
17-
}
9+
// function parseHandler (req, res, next) {
10+
// convertToTurtle(req.text, req, function (err, result) {
11+
// if (!err) {
12+
// req.convertedText = result
13+
// } else {
14+
// debug('Error parsing request: ' + err)
15+
// }
16+
// return next()
17+
// })
18+
// }
1819

19-
function convertToTurtle (rawDocument, req, convertCallback) {
20-
if (req.is('application/ld+json') ||
21-
req.is('application/nquads') || req.is('application/n-quads')) {
22-
var contentType = req.get('content-type').split(';')[0].trim()
23-
parse(rawDocument, contentType, convertCallback)
24-
} else {
25-
convertCallback(null, rawDocument)
26-
}
27-
}
20+
// function convertToTurtle (rawDocument, req, convertCallback) {
21+
// if (req.is('application/ld+json') ||
22+
// req.is('application/nquads') || req.is('application/n-quads')) {
23+
// var contentType = req.get('content-type').split(';')[0].trim()
24+
// parse(rawDocument, contentType, convertCallback)
25+
// } else {
26+
// convertCallback(null, rawDocument)
27+
// }
28+
// }
2829

29-
function parse (rawDocument, contentType, convertCallback) {
30-
var n3Parser = N3.Parser()
31-
var n3Writer
32-
var triples = []
33-
var prefixes = {}
30+
// function parse (rawDocument, contentType, convertCallback) {
31+
// var n3Parser = N3.Parser()
32+
// var n3Writer
33+
// var triples = []
34+
// var prefixes = {}
3435

35-
if (contentType === 'application/ld+json') {
36-
var jsonDocument
37-
try {
38-
jsonDocument = JSON.parse(rawDocument)
39-
} catch (err) {
40-
convertCallback(err, null)
41-
}
42-
jsonld.toRDF(jsonDocument, {
43-
format: 'application/nquads'
44-
}, nquadCallback)
45-
} else if (contentType === 'application/nquads' ||
46-
contentType === 'application/n-quads') {
47-
nquadCallback(null, rawDocument)
48-
} else {
49-
convertCallback(new Error('Wrong content type'), null)
50-
}
36+
// if (contentType === 'application/ld+json') {
37+
// var jsonDocument
38+
// try {
39+
// jsonDocument = JSON.parse(rawDocument)
40+
// } catch (err) {
41+
// convertCallback(err, null)
42+
// }
43+
// jsonld.toRDF(jsonDocument, {
44+
// format: 'application/nquads'
45+
// }, nquadCallback)
46+
// } else if (contentType === 'application/nquads' ||
47+
// contentType === 'application/n-quads') {
48+
// nquadCallback(null, rawDocument)
49+
// } else {
50+
// convertCallback(new Error('Wrong content type'), null)
51+
// }
5152

52-
function nquadCallback (err, nquads) {
53-
if (err) {
54-
debug('Error parsing nquads: ' + err)
55-
convertCallback(err, null)
56-
}
57-
try {
58-
n3Parser.parse(nquads, tripleCallback, prefixCallback)
59-
} catch (err) {
60-
convertCallback(err, null)
61-
}
62-
}
53+
// function nquadCallback (err, nquads) {
54+
// if (err) {
55+
// debug('Error parsing nquads: ' + err)
56+
// convertCallback(err, null)
57+
// }
58+
// try {
59+
// n3Parser.parse(nquads, tripleCallback, prefixCallback)
60+
// } catch (err) {
61+
// convertCallback(err, null)
62+
// }
63+
// }
6364

64-
function tripleCallback (err, triple, prefixes) {
65-
if (err) {
66-
convertCallback(err, null)
67-
}
68-
if (triple) {
69-
triples.push(triple)
70-
} else {
71-
n3Writer = N3.Writer({
72-
prefixes: prefixes
73-
})
74-
for (var i = 0; i < triples.length; i++) {
75-
n3Writer.addTriple(triples[i])
76-
}
77-
n3Writer.end(convertCallback)
78-
}
79-
}
65+
// function tripleCallback (err, triple, prefixes) {
66+
// if (err) {
67+
// convertCallback(err, null)
68+
// }
69+
// if (triple) {
70+
// triples.push(triple)
71+
// } else {
72+
// n3Writer = N3.Writer({
73+
// prefixes: prefixes
74+
// })
75+
// for (var i = 0; i < triples.length; i++) {
76+
// n3Writer.addTriple(triples[i])
77+
// }
78+
// n3Writer.end(convertCallback)
79+
// }
80+
// }
8081

81-
function prefixCallback (prefix, iri) {
82-
prefixes[prefix] = iri
83-
}
84-
}
82+
// function prefixCallback (prefix, iri) {
83+
// prefixes[prefix] = iri
84+
// }
85+
// }

0 commit comments

Comments
 (0)