Renamed defaultApp to fileBrowser and skin to dataBrowser

deiu · deiu · commit 4c094c69ee26 · 2016-03-08T15:33:54.000-05:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -93,14 +93,14 @@ var argv = require('nomnom')
     full: 'error-pages',
     help: 'Folder from which to look for custom error pages files (files must be named <error-code>.html -- eg. 500.html)'
   })
-  .option('defaultApp', {
-    full: 'default-app',
+  .option('fileBrowser', {
+    full: 'file-browser',
     help: 'URI to use as a default app for resources (default: https://linkeddata.github.io/warp/#/list/)'
   })
-  .option('skin', {
-    full: 'skin',
+  .option('dataBrowser', {
+    full: 'data-browser',
     flag: true,
-    help: 'Enable viewing RDF resources using a skin application (like mashlib)'
+    help: 'Enable viewing RDF resources using a default data browser application (e.g. mashlib)'
   })
   .option('createAdmin', {
     full: 'create-admin',
diff --git a/lib/handlers/get.js b/lib/handlers/get.js
@@ -72,17 +72,17 @@ function handler (req, res, next) {
       return next()
     }
 
-    // Handle defaultApp
+    // Handle fileBrowser and dataBrowser
     if (requestedType.indexOf('text/html') === 0) {
-      if (container && ldp.defaultApp) {
+      if (container && ldp.fileBrowser) {
         var address = req.protocol + '/' + req.get('host') + req.originalUrl
-        return res.redirect(303, ldp.defaultApp + address)
+        return res.redirect(303, ldp.fileBrowser + address)
       }
 
-      if (RDFs.indexOf(contentType) >= 0 && ldp.skin) {
+      if (RDFs.indexOf(contentType) >= 0 && ldp.dataBrowser) {
         res.set('Content-Type', 'text/html')
-        var skin = _path.join(__dirname, '../../static/skin.html')
-        res.sendFile(skin)
+        var dataBrowser = _path.join(__dirname, '../../static/databrowser.html')
+        res.sendFile(dataBrowser)
         return
       } else {
         res.setHeader('Content-Type', contentType)
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -52,12 +52,12 @@ function LDP (argv) {
     }
   }
 
-  if (this.defaultApp !== false) {
-    this.defaultApp = argv.defaultApp || 'https://linkeddata.github.io/warp/#/list/'
+  if (this.fileBrowser !== false) {
+    this.fileBrowser = argv.fileBrowser || 'https://linkeddata.github.io/warp/#/list/'
   }
 
-  if (this.skin !== false) {
-    this.skin = true
+  if (this.dataBrowser !== false) {
+    this.dataBrowser = true
   }
 
   debug.settings('Suffix Acl: ' + this.suffixAcl)
@@ -66,7 +66,8 @@ function LDP (argv) {
   debug.settings('WebID support: ' + !!this.webid)
   debug.settings('Live-updates: ' + !!this.live)
   debug.settings('Identity Provider: ' + !!this.idp)
-  debug.settings('Default App: ' + this.defaultApp)
+  debug.settings('Default file broswer app: ' + this.fileBrowser)
+  debug.settings('Default data broswer app: ' + this.dataBrowser)
 
   return this
 }
diff --git a/static/databrowser.html b/static/databrowser.html
diff --git a/test/http.js b/test/http.js
@@ -219,13 +219,13 @@ describe('HTTP APIs', function () {
         })
         .expect(200, done) // Can't check for 303 because of internal redirects
     })
-    it('should NOT load skin (mashlib) if resource is not RDF', function (done) {
+    it('should NOT load data browser (mashlib) if resource is not RDF', function (done) {
       server.get('/sampleContainer/solid.png')
         .set('Accept', 'text/html')
         .expect('content-type', /image\/png/)
         .expect(200, done)
     })
-    it('should redirect to defaultApp if container was requested as text/html', function (done) {
+    it('should redirect to file browser if container was requested as text/html', function (done) {
       server.get('/sampleContainer/')
         .set('Accept', 'text/html')
         .expect('content-type', /text\/html/)

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@ function LDP (argv) {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (this.defaultApp !== false) {`
`56`		`- this.defaultApp = argv.defaultApp \|\| 'https://linkeddata.github.io/warp/#/list/'`
	`55`	`+ if (this.fileBrowser !== false) {`
	`56`	`+ this.fileBrowser = argv.fileBrowser \|\| 'https://linkeddata.github.io/warp/#/list/'`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (this.skin !== false) {`
`60`		`- this.skin = true`
	`59`	`+ if (this.dataBrowser !== false) {`
	`60`	`+ this.dataBrowser = true`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`debug.settings('Suffix Acl: ' + this.suffixAcl)`
`@@ -66,7 +66,8 @@ function LDP (argv) {`
`66`	`66`	`debug.settings('WebID support: ' + !!this.webid)`
`67`	`67`	`debug.settings('Live-updates: ' + !!this.live)`
`68`	`68`	`debug.settings('Identity Provider: ' + !!this.idp)`
`69`		`- debug.settings('Default App: ' + this.defaultApp)`
	`69`	`+ debug.settings('Default file broswer app: ' + this.fileBrowser)`
	`70`	`+ debug.settings('Default data broswer app: ' + this.dataBrowser)`
`70`	`71`
`71`	`72`	`return this`
`72`	`73`	`}`