Skip to content

Commit 1813973

Browse files
nicolanicola
committed
moving files into /lib and merge fileStore.js and time.js into utils.js
1 parent 8807325 commit 1813973

24 files changed

Lines changed: 86 additions & 92 deletions

‎bin/ldnode.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ argv.live = !argv.noLive;
9191

9292
// Set up debug environment
9393
process.env.DEBUG = argv.verbose ? 'ldnode:*' : false;
94-
var debug = require('../logging').server;
94+
var debug = require('../lib/logging').server;
9595

9696
// Set up port
9797
argv.port = argv.port || 3456;

‎index.js‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,24 @@ var session = require('express-session');
1313
var http = require('http');
1414
var https = require('https');
1515
var request = require('request');
16-
var debug = require('./logging').settings;
17-
var debugSubscription = require('./logging').subscription;
18-
var debugServer = require('./logging').server;
1916
var uuid = require('node-uuid');
2017
var cors = require('cors');
2118

2219
// ldnode dependencies
23-
var acl = require('./acl.js');
24-
var metadata = require('./metadata.js');
25-
var header = require('./header.js');
26-
var LDP = require('./ldp.js');
27-
var login = require('./login.js');
28-
var parse = require('./parse.js');
20+
var acl = require('./lib/acl');
21+
var metadata = require('./lib/metadata');
22+
var header = require('./lib/header');
23+
var LDP = require('./lib/ldp');
24+
var login = require('./lib/login');
25+
var parse = require('./lib/parse');
26+
var debug = require('./lib/logging');
2927

3028
// Request handlers
31-
var getHandler = require('./handlers/get.js');
32-
var postHandler = require('./handlers/post.js');
33-
var putHandler = require('./handlers/put.js');
34-
var deleteHandler = require('./handlers/delete.js');
35-
var patchHandler = require('./handlers/patch.js');
36-
29+
var getHandler = require('./lib/handlers/get.js');
30+
var postHandler = require('./lib/handlers/post.js');
31+
var putHandler = require('./lib/handlers/put.js');
32+
var deleteHandler = require('./lib/handlers/delete.js');
33+
var patchHandler = require('./lib/handlers/patch.js');
3734

3835
function ldnode (argv) {
3936
var ldp = new LDP(argv);
@@ -62,7 +59,7 @@ function ldnode (argv) {
6259
ws(app);
6360
}
6461

65-
debugServer("Router attached to " + ldp.mount);
62+
debug.server("Router attached to " + ldp.mount);
6663

6764
return app;
6865
}
@@ -74,8 +71,8 @@ function createServer(argv) {
7471
app.use(ldp.mount, ldpApp);
7572

7673
if (ldp && (ldp.webid || ldp.key || ldp.cert) ) {
77-
debug("SSL Private Key path: " + ldp.key);
78-
debug("SSL Certificate path: " + ldp.cert);
74+
debug.settings("SSL Private Key path: " + ldp.key);
75+
debug.settings("SSL Certificate path: " + ldp.cert);
7976

8077
if (!ldp.cert && !ldp.key) {
8178
throw new Error("Missing SSL cert and SSL key to enable WebID");
@@ -109,8 +106,8 @@ function createServer(argv) {
109106
requestCert: true
110107
};
111108

112-
debug("Private Key: " + credentials.key);
113-
debug("Certificate: " + credentials.cert);
109+
debug.settings("Private Key: " + credentials.key);
110+
debug.settings("Certificate: " + credentials.cert);
114111

115112
return https.createServer(credentials, app);
116113
}
@@ -119,17 +116,17 @@ function createServer(argv) {
119116
}
120117

121118
function proxy (app, path) {
122-
debug('XSS Proxy listening to ' + path);
119+
debug.settings('XSS Proxy listening to ' + path);
123120
app.get(path, function (req, res) {
124-
debug('originalUrl: ' + req.originalUrl);
121+
debug.settings('originalUrl: ' + req.originalUrl);
125122
var uri = req.query.uri;
126123
if (!uri) {
127124
return res
128125
.status(400)
129126
.send("Proxy has no uri param ");
130127
}
131128

132-
debug('Proxy destination URI: ' + uri);
129+
debug.settings('Proxy destination URI: ' + uri);
133130
request.get(uri).pipe(res);
134131
});
135132
}
@@ -198,9 +195,9 @@ function ws (app) {
198195
app.mountpath = ''; // needs to be set for addSocketRoute aka .ws()
199196
// was options.pathFilter
200197
app.ws('/', function(socket, res) {
201-
debugSubscription("incoming on " + socket.path);
198+
debug.subscription("incoming on " + socket.path);
202199
socket.on('message', function(msg) {
203-
debugSubscription("message = " + msg);
200+
debug.subscription("message = " + msg);
204201
// subscribeToChanges(socket, res);
205202
});
206203
});

acl.js renamed to lib/acl.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var url = require('url');
1010
var async = require('async');
1111

1212
var debug = require('./logging').ACL;
13-
var file = require('./fileStore.js');
13+
var utils = require('./utils.js');
1414
var ns = require('./vocab/ns.js').ns;
1515
var rdfVocab = require('./vocab/rdf.js');
1616

@@ -115,8 +115,8 @@ ACL.prototype.findACL = function(mode, address, userId, callback) {
115115
var ldp = this.ldp;
116116
var acl = this;
117117
var accessType = "accessTo";
118-
var filepath = file.uriToFilename(address, ldp.root);
119-
var relativePath = file.uriToRelativeFilename(address, ldp.root);
118+
var filepath = utils.uriToFilename(address, ldp.root);
119+
var relativePath = utils.uriToRelativeFilename(address, ldp.root);
120120
var i = 0;
121121
var depth = relativePath.split('/');
122122

@@ -128,7 +128,7 @@ ACL.prototype.findACL = function(mode, address, userId, callback) {
128128
function (done) {
129129
var pathAcl = S(filepath).endsWith(ldp.suffixAcl) ?
130130
filepath : filepath + ldp.suffixAcl;
131-
var pathUri = file.filenameToBaseUri(filepath, acl.uri, ldp.root);
131+
var pathUri = utils.filenameToBaseUri(filepath, acl.uri, ldp.root);
132132
var relativePath = path.relative(ldp.root, filepath);
133133
// debug('relativePath = ' + relativePath);
134134

@@ -376,7 +376,7 @@ ACL.prototype.fetchDocument = function(uri, callback) {
376376
// Fetch URL
377377
var newPath = S(uri).chompLeft(acl.uri).s;
378378
// TODO prettify this
379-
var documentPath = file.uriToFilename(newPath, ldp.root);
379+
var documentPath = utils.uriToFilename(newPath, ldp.root);
380380
var documentUri = url.parse(documentPath);
381381
documentPath = documentUri.pathname;
382382
acl.allow('Read', newPath, function (err) {
@@ -483,7 +483,7 @@ function reqToACL (req) {
483483
return new ACL({
484484
onBehalfOf: req.get('On-Behalf-Of'),
485485
session: req.session,
486-
uri: file.uriBase(req),
486+
uri: utils.uriBase(req),
487487
ldp: req.app.locals.ldp,
488488
origin: req.get('origin')
489489
});
@@ -501,7 +501,7 @@ function allow(mode, req, res, next) {
501501
var ldp = req.app.locals.ldp;
502502

503503
// Handle glob requests
504-
var filepath = file.uriToFilename(req.path, ldp.root);
504+
var filepath = utils.uriToFilename(req.path, ldp.root);
505505
if (req.method === 'GET' && glob.hasMagic(filepath)) {
506506
return next();
507507
}

handlers/delete.js renamed to lib/handlers/delete.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
var fs = require('fs');
55
var debug = require('../logging').handlers;
6-
var file = require('../fileStore.js');
6+
var utils = require('../utils.js');
77
var metadata = require('../metadata.js');
88

99
// Delete a container or resource
1010
function handler(req, res) {
1111
debug('DELETE -- ' + req.originalUrl);
1212

1313
var ldp = req.app.locals.ldp;
14-
var filename = file.uriToFilename(req.path, ldp.root);
14+
var filename = utils.uriToFilename(req.path, ldp.root);
1515

1616
ldp.delete(filename, function(err) {
1717
if (err) {

handlers/get.js renamed to lib/handlers/get.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ var acl = require('../acl.js');
1414
var header = require('../header.js');
1515
var metadata = require('../metadata.js');
1616
var ns = require('../vocab/ns.js').ns;
17-
var file = require('../fileStore.js');
17+
var utils = require('../utils.js');
1818
var subscription = require('../subscription.js');
1919

2020
var ldpVocab = require('../vocab/ldp.js');
2121
var turtleExtension = '.ttl';
2222

2323
function get(req, res, includeBody) {
2424
var ldp = req.app.locals.ldp;
25-
var uri = file.uriBase(req);
26-
var filename = file.uriToFilename(req.path, ldp.root);
25+
var uri = utils.uriBase(req);
26+
var filename = utils.uriToFilename(req.path, ldp.root);
2727

2828
// Add request to subscription service
2929
if (req.path.slice(-ldp.suffixChanges.length) ===
@@ -52,12 +52,12 @@ function get(req, res, includeBody) {
5252
}
5353

5454
// Add ACL and Meta Link in header
55-
var aclLink = file.getResourceLink(
55+
var aclLink = utils.getResourceLink(
5656
filename, uri,
5757
ldp.root, ldp.suffixAcl,
5858
ldp.suffixMeta);
5959

60-
var metaLink = file.getResourceLink(
60+
var metaLink = utils.getResourceLink(
6161
filename, uri,
6262
ldp.root, ldp.suffixMeta,
6363
ldp.suffixAcl);
@@ -117,8 +117,8 @@ function get(req, res, includeBody) {
117117

118118
function globHandler(req, res) {
119119
var ldp = req.app.locals.ldp;
120-
var filename = file.uriToFilename(req.path, ldp.root);
121-
var uri = file.uriBase(req);
120+
var filename = utils.uriToFilename(req.path, ldp.root);
121+
var uri = utils.uriBase(req);
122122

123123
var globOptions = {
124124
noext: true,
@@ -135,7 +135,7 @@ function globHandler(req, res) {
135135
var globGraph = $rdf.graph();
136136

137137
async.each(matches, function(match, done) {
138-
var baseUri = file.filenameToBaseUri(match, uri, ldp.root);
138+
var baseUri = utils.filenameToBaseUri(match, uri, ldp.root);
139139
fs.readFile(match, {encoding: "utf8"}, function(err, fileData) {
140140
if (err) {
141141
debug('GET -- Error in globHandler' + err);
@@ -186,12 +186,12 @@ function aclAllow(match, req, res, callback) {
186186

187187
function parseLinkedData(req, res) {
188188
var ldp = req.app.locals.ldp;
189-
var filename = file.uriToFilename(req.path, ldp.root);
190-
var uri = file.uriBase(req);
189+
var filename = utils.uriToFilename(req.path, ldp.root);
190+
var uri = utils.uriBase(req);
191191
var turtleData = res.locals.turtleData;
192192

193193
var accept = header.parseAcceptHeader(req) || 'text/turtle';
194-
var baseUri = file.filenameToBaseUri(filename, uri, ldp.root);
194+
var baseUri = utils.filenameToBaseUri(filename, uri, ldp.root);
195195

196196
// Handle Turtle Accept header
197197
if (accept === 'text/turtle' ||

handlers/patch.js renamed to lib/handlers/patch.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var fs = require('fs');
66
var $rdf = require('rdflib');
77

88
var debug = require('../logging').handlers;
9-
var file = require('../fileStore.js');
9+
var utils = require('../utils.js');
1010
var subscription = require('../subscription.js');
1111

1212
function handler(req, res) {
@@ -15,10 +15,10 @@ function handler(req, res) {
1515
debug('PATCH -- text length: ' + (req.text ? req.text.length : 'undefined2'));
1616
res.header('MS-Author-Via' , 'SPARQL' );
1717

18-
var filename = file.uriToFilename(req.path, ldp.root);
18+
var filename = utils.uriToFilename(req.path, ldp.root);
1919
var targetContentType = mime.lookup(filename);
2020
var patchContentType = req.get('content-type').split(';')[0].trim(); // Ignore parameters
21-
var targetURI = file.uriAbs(req) + req.originalUrl;
21+
var targetURI = utils.uriAbs(req) + req.originalUrl;
2222

2323

2424
debug("PATCH -- Content-type " + patchContentType + " patching target " + targetContentType + " <" + targetURI + '>');

handlers/post.js renamed to lib/handlers/post.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var $rdf = require('rdflib');
66
var S = require('string');
77

88
var debug = require('../logging').handlers;
9-
var file = require('../fileStore.js');
9+
var utils = require('../utils.js');
1010
var header = require('../header.js');
1111
var metadata = require('../metadata.js');
1212
var patch = require('./patch.js');
@@ -44,7 +44,7 @@ function handler(req, res) {
4444
}
4545

4646

47-
var containerPath = file.uriToFilename(req.path, ldp.root);
47+
var containerPath = utils.uriToFilename(req.path, ldp.root);
4848
debug("POST -- Container path: " + containerPath);
4949

5050
// Not a container
@@ -75,8 +75,8 @@ function handler(req, res) {
7575
// Creating a graph and add the req text
7676
var resourceGraph = $rdf.graph();
7777
var requestText = req.convertedText || req.text;
78-
var uri = file.uriBase(req);
79-
var resourceBaseUri = file.filenameToBaseUri(
78+
var uri = utils.uriBase(req);
79+
var resourceBaseUri = utils.filenameToBaseUri(
8080
resourcePath,
8181
uri,
8282
ldp.root);

handlers/put.js renamed to lib/handlers/put.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var path = require('path');
66
var $rdf = require('rdflib');
77

88
var debug = require('../logging').handlers;
9-
var file = require('../fileStore.js');
9+
var utils = require('../utils.js');
1010
var header = require('../header.js');
1111

1212
function handler(req, res) {
@@ -15,7 +15,7 @@ function handler(req, res) {
1515
debug("PUT -- Text length: " + (req.text ? req.text.length : 'undefined'));
1616
res.header('MS-Author-Via' , 'SPARQL' );
1717

18-
var filePath = file.uriToFilename(req.path, ldp.root);
18+
var filePath = utils.uriToFilename(req.path, ldp.root);
1919

2020
// PUT requests not supported on containers. Use POST instead
2121
if (filePath[filePath.length - 1] === '/') {

header.js renamed to lib/header.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var li = require('li');
33
var path = require('path');
44
var S = require('string');
55
var metadata = require('./metadata.js');
6-
var file = require('./fileStore.js');
6+
var utils = require('./utils.js');
77
var ldpVocab = require('./vocab/ldp.js');
88

99
function addLink(res, value, rel) {
@@ -30,7 +30,7 @@ function addLinks(res, fileMetadata) {
3030

3131
function linksHandler(req, res, next) {
3232
var ldp = req.app.locals.ldp;
33-
var filename = file.uriToFilename(req.url, ldp.root);
33+
var filename = utils.uriToFilename(req.url, ldp.root);
3434

3535
filename = path.join(filename, req.path);
3636
if (ldp.isMetadataFile(filename)) {

ldp.js renamed to lib/ldp.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var uuid = require('node-uuid');
1313

1414
var debug = require('./logging');
1515

16-
var utils = require('./fileStore.js');
16+
var utils = require('./utils.js');
1717
var ns = require('./vocab/ns.js').ns;
1818
var turtleExtension = '.ttl';
1919

0 commit comments

Comments
 (0)