finally making solid-ws working

nicola · nicola · commit 1d2182dd03be · 2015-09-28T05:47:59.000-04:00
diff --git a/lib/create-server.js b/lib/create-server.js
@@ -70,7 +70,8 @@ function createServer(argv) {
 
     // Setup Express app
     if (ldp.live) {
-        SolidWs(server, app)
+        var solidWs = SolidWs(server, ldpApp)
+        ldpApp.locals.ldp.live = solidWs.publish.bind(solidWs)
     }
 
     return server
diff --git a/lib/handlers/delete.js b/lib/handlers/delete.js
@@ -20,7 +20,8 @@ function handler(req, res, next) {
         }
 
         debug("DELETE -- Ok.");
-        if (ldp.live) ldp.live(req.originalUrl)
+        if (ldp.live) ldp.live(utils.uriAbs(req) + path.basename(req.originalUrl))
+        if (ldp.live) ldp.live(utils.uriAbs(req) + req.originalUrl)
         return res.sendStatus(200);
     });
 
diff --git a/lib/handlers/patch.js b/lib/handlers/patch.js
@@ -39,10 +39,8 @@ function handler(req, res, next) {
                 return next(err);
             }
 
-            if (ldp.live) {
-                ldp.live(req.originalUrl)
-                // subscription.publishDelta(req, res, patchKB, targetURI);
-            }
+            if (ldp.live) ldp.live(utils.uriAbs(req) + req.originalUrl)
+            // subscription.publishDelta(req, res, patchKB, targetURI);
             debug("PATCH -- applied OK (sync)");
             res.send("Patch applied OK\n");
         });
diff --git a/lib/handlers/post.js b/lib/handlers/post.js
@@ -133,6 +133,7 @@ function handler(req, res, next) {
 
         debug("POST -- Created new container " + resourceBaseUri);
         res.set('Location', resourceBaseUri);
+        if (ldp.live) ldp.live(utils.uriAbs(req) + path.basename(req.originalUrl))
         return res.sendStatus(201);
     }
 
@@ -142,6 +143,8 @@ function handler(req, res, next) {
             return next(err);
         }
         res.set('Location', resourceBaseUri);
+        if (ldp.live) ldp.live(utils.uriAbs(req) + req.originalUrl)
+            if (ldp.live) ldp.live(utils.uriAbs(req) + path.basename(req.originalUrl))
         return res.sendStatus(201);
     }
 }
diff --git a/lib/handlers/put.js b/lib/handlers/put.js
@@ -4,6 +4,7 @@
 var mime = require('mime');
 var path = require('path');
 var $rdf = require('rdflib');
+var path = require('path')
 
 var debug = require('../debug').handlers;
 var utils = require('../utils.js');
@@ -26,7 +27,7 @@ function handler(req, res, next) {
 
         debug("PUT -- Write Ok. Bytes written: " + req.text.length);
 
-        if (ldp.live) ldp.live(req.originalUrl)
+        if (ldp.live) ldp.live(utils.uriAbs(req) + req.originalUrl)
         return res.sendStatus(201);
     });
 }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ function createServer(argv) {`
`70`	`70`
`71`	`71`	`// Setup Express app`
`72`	`72`	`if (ldp.live) {`
`73`		`- SolidWs(server, app)`
	`73`	`+ var solidWs = SolidWs(server, ldpApp)`
	`74`	`+ ldpApp.locals.ldp.live = solidWs.publish.bind(solidWs)`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`return server`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ function handler(req, res, next) {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`debug("DELETE -- Ok.");`
`23`		`- if (ldp.live) ldp.live(req.originalUrl)`
	`23`	`+ if (ldp.live) ldp.live(utils.uriAbs(req) + path.basename(req.originalUrl))`
	`24`	`+ if (ldp.live) ldp.live(utils.uriAbs(req) + req.originalUrl)`
`24`	`25`	`return res.sendStatus(200);`
`25`	`26`	`});`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ function handler(req, res, next) {`
`133`	`133`
`134`	`134`	`debug("POST -- Created new container " + resourceBaseUri);`
`135`	`135`	`res.set('Location', resourceBaseUri);`
	`136`	`+ if (ldp.live) ldp.live(utils.uriAbs(req) + path.basename(req.originalUrl))`
`136`	`137`	`return res.sendStatus(201);`
`137`	`138`	`}`
`138`	`139`
`@@ -142,6 +143,8 @@ function handler(req, res, next) {`
`142`	`143`	`return next(err);`
`143`	`144`	`}`
`144`	`145`	`res.set('Location', resourceBaseUri);`
	`146`	`+ if (ldp.live) ldp.live(utils.uriAbs(req) + req.originalUrl)`
	`147`	`+ if (ldp.live) ldp.live(utils.uriAbs(req) + path.basename(req.originalUrl))`
`145`	`148`	`return res.sendStatus(201);`
`146`	`149`	`}`
`147`	`150`	`}`