Skip to content

Commit e9cd209

Browse files
author
Andrei
committed
Merge pull request #183 from nicola/refactoring
Refactoring POST and code style
2 parents 58d9c95 + 29beef3 commit e9cd209

41 files changed

Lines changed: 3271 additions & 3680 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ default settings.
196196
mount: '/', // Where to mount Linked Data Platform
197197
webid: false, // Enable WebID+TLS authentication
198198
suffixAcl: '.acl', // Suffix for acl files
199-
suffixSSE: '.events', // Suffix for SSE files
200199
proxy: false, // Where to mount the proxy
201200
errorHandler: false, // function(err, req, res, next) to have a custom error handler
202201
errorPages: false // specify a path where the error pages are

‎bin/ldnode.js‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env node
22

3-
var fs = require('fs');
4-
var path = require('path');
3+
var fs = require('fs')
4+
var path = require('path')
55
var argv = require('nomnom')
66
.script('ldnode')
77
.option('verbose', {
@@ -13,14 +13,14 @@ var argv = require('nomnom')
1313
flag: true,
1414
help: 'Print current ldnode version',
1515
callback: function () {
16-
fs.readFile(path.resolve(__dirname, '../package.json'), 'utf-8', function(err, file) {
17-
console.log(JSON.parse(file).version);
18-
});
16+
fs.readFile(path.resolve(__dirname, '../package.json'), 'utf-8', function (_, file) {
17+
console.log(JSON.parse(file).version)
18+
})
1919
}
2020
})
2121
.option('mount', {
2222
abbr: 'm',
23-
help: 'Relative URL from which to serve the Linked Data Platform (default: \'/\')'
23+
help: "Relative URL from which to serve the Linked Data Platform (default: '/')"
2424
})
2525
.option('root', {
2626
abbr: 'r',
@@ -76,19 +76,14 @@ var argv = require('nomnom')
7676
})
7777
.option('suffixAcl', {
7878
full: 'suffix-acl',
79-
help: 'Suffix for acl files (default: \'.acl\')',
79+
help: "Suffix for acl files (default: '.acl')",
8080
abbr: 'sA'
8181
})
8282
.option('suffixMeta', {
8383
full: 'suffix-meta',
84-
help: 'Suffix for metadata files (default: \'.meta\')',
84+
help: "Suffix for metadata files (default: '.meta')",
8585
abbr: 'sM'
8686
})
87-
.option('suffixSSE', {
88-
full: 'suffix-sse',
89-
help: 'Suffix for SSE files (default: \'.events\')',
90-
abbr: 'sE'
91-
})
9287
.option('noErrorPages', {
9388
full: 'no-error-pages',
9489
flag: true,
@@ -102,42 +97,46 @@ var argv = require('nomnom')
10297
full: 'default-app',
10398
help: 'URI to use as a default app for resources (default: https://linkeddata.github.io/warp/#/list/)'
10499
})
105-
.parse();
100+
.parse()
106101

107-
// Print version and leave
108-
if (argv.version) {
109-
return;
110-
}
102+
function bin (argv) {
103+
// Print version and leave
104+
if (argv.version) {
105+
return 0
106+
}
111107

112-
// Set up --no-*
113-
argv.live = !argv.noLive;
108+
// Set up --no-*
109+
argv.live = !argv.noLive
114110

115-
// Set up debug environment
116-
process.env.DEBUG = argv.verbose ? 'ldnode:*' : false;
117-
var debug = require('../lib/debug').server;
111+
// Set up debug environment
112+
process.env.DEBUG = argv.verbose ? 'ldnode:*' : false
113+
var debug = require('../lib/debug').server
118114

119-
// Set up port
120-
argv.port = argv.port || 3456;
115+
// Set up port
116+
argv.port = argv.port || 3456
121117

122-
// Signal handling (e.g. CTRL+C)
123-
if (process.platform !== 'win32') {
118+
// Signal handling (e.g. CTRL+C)
119+
if (process.platform !== 'win32') {
124120
// Signal handlers don't work on Windows.
125-
process.on('SIGINT', function() {
126-
debug("LDP stopped.");
127-
process.exit();
128-
});
129-
}
121+
process.on('SIGINT', function () {
122+
debug('LDP stopped.')
123+
process.exit()
124+
})
125+
}
130126

131-
// Finally starting ldnode
132-
var ldnode = require('../');
133-
var app;
134-
try {
135-
app = ldnode.createServer(argv);
136-
} catch(e) {
137-
console.log(e.message);
138-
console.log(e.stack)
139-
return 1;
127+
// Finally starting ldnode
128+
var ldnode = require('../')
129+
var app
130+
try {
131+
app = ldnode.createServer(argv)
132+
} catch (e) {
133+
console.log(e.message)
134+
console.log(e.stack)
135+
return 1
136+
}
137+
app.listen(argv.port, function () {
138+
debug('LDP started on port ' + argv.port)
139+
})
140140
}
141-
app.listen(argv.port, function() {
142-
debug('LDP started on port ' + argv.port);
143-
});
141+
142+
bin(argv)

‎examples/custom-error-handling.js‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
var ldnode = require('../'); // or require('ldnode')
2-
var path = require('path');
1+
var ldnode = require('../')
2+
var path = require('path')
33

44
ldnode
55
.createServer({
66
webid: true,
77
cert: path.resolve('./test/keys/cert.pem'),
88
key: path.resolve('./test/keys/key.pem'),
9-
errorHandler: function(err, req, res, next) {
9+
errorHandler: function (err, req, res, next) {
1010
if (err.status !== 200) {
11-
console.log('Oh no! There is an error:' + err.message);
12-
res.status(err.status);
11+
console.log('Oh no! There is an error:' + err.message)
12+
res.status(err.status)
1313

1414
// Now you can send the error how you want
1515
// Maybe you want to render an error page
@@ -20,14 +20,12 @@ ldnode
2020
// Or you want to respond in JSON?
2121

2222
res.json({
23-
title: err.status + ": This is an error!",
23+
title: err.status + ': This is an error!',
2424
message: err.message
25-
});
25+
})
2626
}
27-
2827
}
2928
})
30-
.listen(3456, function() {
31-
console.log('started ldp with webid on port ' + 3456);
32-
});
33-
29+
.listen(3456, function () {
30+
console.log('started ldp with webid on port ' + 3456)
31+
})

‎examples/ldp-with-webid.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ldnode
77
cert: path.resolve('../test/keys/cert.pem'),
88
key: path.resolve('../test/keys/key.pem')
99
})
10-
.listen(3456, function() {
10+
.listen(3456, function () {
1111
console.log('started ldp with webid on port ' + 3456)
1212
})
13-

‎examples/simple-express-app.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ app.use('/ldp', ldp)
1818
app.listen(3000, function () {
1919
console.log('Server started on port 3000!')
2020
})
21-

‎examples/simple-ldp-server.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ var ldnode = require('../') // or require('ldnode')
22

33
// Startin ldnode server
44
var ldp = ldnode.createServer()
5-
ldp.listen(3456, function() {
5+
ldp.listen(3456, function () {
66
console.log('Starting server on port ' + 3456)
77
console.log('LDP will run on /')
88
})
9-

‎index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
module.exports = require('./lib/create-app');
2-
module.exports.createServer = require('./lib/create-server');
1+
module.exports = require('./lib/create-app')
2+
module.exports.createServer = require('./lib/create-server')

0 commit comments

Comments
 (0)