No more uribase

nicola · nicola · commit 0487c157821e · 2015-07-13T04:43:02.000+02:00
diff --git a/README.md b/README.md
@@ -30,10 +30,7 @@ npm install
 ```javascript
 var ldnode = require('ldnode')
 
-var ldp = ldnode.createServer({
-  uri: "http://example.com/test/",
-  base: __dirname + '/test/'
-})
+var ldp = ldnode.createServer()
 ldp.listen(1234, function() {
   // Started Linked Data Platform
 })
@@ -46,7 +43,7 @@ You can integrate it with your existing express app
 ```javascript
 var ldnode = require('ldnode')
 var app = require('express')()
-app.use('/test', ldnode(opts))
+app.use('/test', ldnode())
 ...
 ```
 
@@ -76,18 +73,19 @@ Usage: ldnode [options]
 Options:
    -v, --verbose           Print the logs to console
    --version               Print current ldnode version
-   -u, --uri               Default address of the server (e.g. http[s]://host:port/path)
+   -m, --mount             Where to mount Linked Data Platform (default: '/')
    -b, --base              Base location to serve resources
    -p, --port              Port to use
    -c, --cache             Set cache time (in seconds), 0 for no cache
    -K, --key               Path to the ssl key
    -C, --cert              Path to the ssl cert
    --webid                 Enable WebID+TLS authentication
    -s, --secret            HTTP Session secret key (e.g. "your secret phrase")
-   --no-live           Disable live support through WebSockets
+   --no-live               Disable live support through WebSockets
    -sA, --suffix-acl       Suffix for acl files (default: '.acl')
    -sC, --suffix-changes   Suffix for acl files (default: '.changes')
    -sE, --suffix-sse       Suffix for SSE files (default: '.events')
+
 ```
 
 ## Tests
diff --git a/acl.js b/acl.js
@@ -35,7 +35,7 @@ function allow(mode, req, res) {
     for (var i = 0; i < depth.length; i++) {
         var pathAcl = S(filepath).endsWith(options.suffixAcl) ?
                 filepath : filepath + options.suffixAcl;
-        var uri = options.uri || file.uriAbs(req);
+        var uri = file.uriAbs(req);
         var pathUri = file.filenameToBaseUri(filepath, uri, options.base);
         relativePath = path.relative(options.base, filepath);
 
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -19,9 +19,9 @@ var argv = require('nomnom')
       });
     }
   })
-  .option('uri', {
-    abbr: 'u',
-    help: 'Default address of the server (e.g. http[s]://host:port/path)'
+  .option('mount', {
+    abbr: 'm',
+    help: 'Where to mount Linked Data Platform (default: \'/\')'
   })
   .option('base', {
     abbr: 'b',
diff --git a/fileStore.js b/fileStore.js
@@ -27,7 +27,7 @@ function uriToRelativeFilename(uri, base) {
 
 function filenameToBaseUri(filename, uri, base) {
     var uriPath = S(filename).strip(base).toString();
-    return uri + uriPath;
+    return uri + '/' + uriPath;
 }
 
 function uriBase(req) {
diff --git a/handlers/get.js b/handlers/get.js
@@ -22,7 +22,7 @@ var metaExtension = '.meta';
 
 function get(req, res, includeBody) {
     var options = req.app.locals.ldp;
-    var uri = options.uri || file.uriAbs(req);
+    var uri = file.uriAbs(req);
 
     // Add request to subscription service
     if (('' + req.path).slice(-options.suffixChanges.length) ===
diff --git a/handlers/post.js b/handlers/post.js
@@ -77,14 +77,13 @@ function handler(req, res) {
     // Get the request text
     // TODO make sure correct text is selected
     var requestText = req.convertedText || req.text;
-    var uri = options.uri || file.uriAbs(req);
+    var uri = file.uriAbs(req);
     var resourceBaseUri = file.filenameToBaseUri(
         resourcePath,
         uri,
         options.base);
 
     try {
-        console.log(requestText);
         $rdf.parse(
             requestText,
             resourceGraph,
diff --git a/index.js b/index.js
@@ -48,11 +48,10 @@ function ldnode (argv) {
     }));
 
     // Creating root container
-    // TODO make sure pathStart is where it is mounted
-    container.createRootContainer(opts.fileBase, opts.pathStart);
+    container.createRootContainer(opts.fileBase, opts.mount);
 
     // Setting up routes
-    app.use(opts.pathStart, routes());
+    app.use('/', routes());
 
     // Adding proxy
     if (opts.xssProxy) {
@@ -65,14 +64,16 @@ function ldnode (argv) {
         ws(app);
     }
 
-    debugServer("Router attached to " + opts.pathStart);
+    debugServer("Router attached to " + opts.mount);
 
     return app;
 }
 
 function createServer(argv) {
-    var app = ldnode(argv);
-    var opts = app.locals.ldp;
+    var app = express();
+    var ldp = ldnode(argv);
+    var opts = ldp.locals.ldp;
+    app.use(opts.mount, ldp);
 
     if (opts && (opts.webid || opts.key || opts.cert) ) {
         debug("SSL Private Key path: " + opts.key);
diff --git a/options.js b/options.js
@@ -20,8 +20,7 @@ function params(argv) {
   opts.secret = argv.secret;
   opts.cert = argv.cert;
   opts.key = argv.key;
-  // TODO no need of uri
-  opts.uri = opts.uri = argv.uri || argv.uriBase;
+  opts.mount = argv.mount || '/';
   opts.verbose = argv.verbose;
   opts.webid = argv.webid;
 
@@ -35,32 +34,19 @@ function params(argv) {
       opts.base += '/';
   }
 
-  opts.pathStart = '/' +
-    opts.uri
-    .split('//')[1]
-    .split('/')
-    .slice(1)
-    .join('/');
-
-  opts.prePathSlash = opts.uri
-    .split('/')
-    .slice(0, 3)
-    .join('/');
-
-  opts.pathFilter = regexp().start(opts.pathStart).toRegExp();
+  opts.pathFilter = regexp().start(opts.mount).toRegExp();
   opts.xssProxy = argv.xssProxy;
   opts.proxyFilter = regexp().start(opts.xssProxy).toRegExp();
 
   // TODO this should be an attribute of an object
   opts.usedURIs = {};
 
-  debug("uri: " + opts.uri);
-  debug("pathStart: " + opts.pathStart);
+  debug("mount: " + opts.mount);
   debug("URI path filter regexp: " + opts.pathFilter);
   debug("Verbose: " + !!opts.verbose);
   debug("WebID: " + !!opts.webid);
   debug("Live: " + !!opts.live);
 
-  return opts
+  return opts;
 }
 
diff --git a/test/secure-test.js b/test/secure-test.js
@@ -15,7 +15,7 @@ describe('ACL', function() {
     var address = 'https://localhost:3456/test/';
 
     var ldp = ldnode.createServer({
-        uri: address,
+        mount: '/test',
         base: __dirname,
         key: __dirname + '/key.pem',
         cert: __dirname + '/cert.pem',
diff --git a/test/test.js b/test/test.js
@@ -6,9 +6,8 @@ var fs = require('fs');
 var S = require('string');
 
 describe('ldnode', function() {
-  var address = 'http://localhost:3457/test/';
+  var address = 'http://localhost:3457';
   var ldp = ldnode.createServer({
-    uri: address,
     base: __dirname
   });
   ldp.listen(3457);
@@ -156,7 +155,7 @@ describe('ldnode', function() {
               .send(postRequest1Body)
               .set('content-type', 'text/turtle')
               .set('slug', 'post-resource-1')
-              .expect('location', address + 'post-resource-1.ttl')
+              .expect('location', address + '/post-resource-1.ttl')
               .expect(201, done);
       });
       it('Should reject requests to existing resources', function(done) {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function uriToRelativeFilename(uri, base) {`
`27`	`27`
`28`	`28`	`function filenameToBaseUri(filename, uri, base) {`
`29`	`29`	`var uriPath = S(filename).strip(base).toString();`
`30`		`- return uri + uriPath;`
	`30`	`+ return uri + '/' + uriPath;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`function uriBase(req) {`