Fix: paths location

config.js

@@ -2,6 +2,11 @@ var convict = require('convict')
 var fs = require('fs')
 var path = require('path')
 
+// Set folder location differently if an npm install
+var installRoot = ~process.cwd().indexOf('node_modules')
+  ? __dirname
+  : process.cwd()
+
 // Define a schema
 var conf = convict({
   app: {
@@ -320,13 +325,13 @@ var conf = convict({
     doc: '',
     format: Object,
     default: {
-      datasources: path.join(__dirname, '/workspace/datasources'),
-      events: path.join(__dirname, '/workspace/events'),
-      middleware: path.join(__dirname, '/workspace/middleware'),
-      pages: path.join(__dirname, '/workspace/pages'),
-      public: path.join(__dirname, '/workspace/public'),
-      routes: path.join(__dirname, '/workspace/routes'),
-      tokenWallets: path.join(__dirname, '/.wallet')
+      datasources: path.join(installRoot, '/workspace/datasources'),
+      events: path.join(installRoot, '/workspace/events'),
+      middleware: path.join(installRoot, '/workspace/middleware'),
+      pages: path.join(installRoot, '/workspace/pages'),
+      public: path.join(installRoot, '/workspace/public'),
+      routes: path.join(installRoot, '/workspace/routes'),
+      tokenWallets: path.join(installRoot, '/.wallet')
     }
   },
   sessions: {

dadi/lib/cache/datasource.js

@@ -150,14 +150,25 @@ DatasourceCache.prototype.cachingEnabled = function (opts) {
  * @param {object} datasource - a datasource schema object containing the datasource settings
  */
 DatasourceCache.prototype.getFilename = function (opts) {
-  var filename = crypto.createHash('sha1').update(opts.name).digest('hex')
+  var filename = crypto
+    .createHash('sha1')
+    .update(opts.name)
+    .digest('hex')
 
   if (opts.cacheKey) {
     filename +=
-      '_' + crypto.createHash('sha1').update(opts.cacheKey).digest('hex')
+      '_' +
+      crypto
+        .createHash('sha1')
+        .update(opts.cacheKey)
+        .digest('hex')
   } else {
     filename +=
-      '_' + crypto.createHash('sha1').update(opts.endpoint).digest('hex')
+      '_' +
+      crypto
+        .createHash('sha1')
+        .update(opts.endpoint)
+        .digest('hex')
   }
 
   return filename

dadi/lib/help.js

@@ -175,7 +175,10 @@ module.exports.parseQuery = function (queryStr) {
 
 module.exports.clearCache = function (req, Cache, callback) {
   var pathname = req.body.path
-  var modelDir = crypto.createHash('sha1').update(pathname).digest('hex')
+  var modelDir = crypto
+    .createHash('sha1')
+    .update(pathname)
+    .digest('hex')
   var cacheDir = config.get('caching.directory.path')
 
   var datasourceCachePaths = []

dadi/lib/view/send.js

@@ -72,7 +72,7 @@ module.exports.html = function (res, req, next, statusCode, contentType) {
 module.exports.addHeaders = function (res) {
   var headers = config.get('headers').cors || {}
 
-  Object.keys(headers).forEach((key) => {
+  Object.keys(headers).forEach(key => {
     res.setHeader(key, headers[key])
     if (key === 'Access-Control-Allow-Origin' && headers[key] !== '*') {
       res.setHeader('Vary', 'Origin')

scripts/copy-config.js

@@ -1,32 +1,32 @@
 #! /usr/bin/env node
 
-var fs = require('fs')
-var mkdirp = require('mkdirp')
-var path = require('path')
+var fs = require("fs")
+var mkdirp = require("mkdirp")
+var path = require("path")
 
 var currentPath = process.cwd() // should be node_modules/@dadi/web
 var configPath = path.join(
   __dirname,
-  '../config/config.development.json.sample'
+  "../config/config.development.json.sample"
 )
-var destinationDir = path.join(currentPath, '../../../config')
-var destinationFile = path.join(destinationDir, 'config.development.json')
+var destinationDir = path.join(currentPath, "../../../config")
+var destinationFile = path.join(destinationDir, "config.development.json")
 
 // Only run if in a node_modules folder
-if (~currentPath.indexOf('node_modules')) {
+if (~currentPath.indexOf("node_modules")) {
   mkdirp(destinationDir, (err, made) => {
     if (err) throw err
 
     fs.stat(destinationFile, (err, stats) => {
-      if (err && err.code && err.code === 'ENOENT') {
+      if (err && err.code && err.code === "ENOENT") {
         // file doesn't exist
         fs.readFile(configPath, (err, data) => {
           if (err) throw err
 
           fs.writeFile(destinationFile, data, err => {
             if (err) throw err
 
-            console.log('Web configuration created at', destinationFile)
+            console.log("Web configuration created at", destinationFile)
           })
         })
       }

scripts/copy-workspace.js

@@ -1,19 +1,19 @@
 #! /usr/bin/env node
 
-var fs = require('fs-extra')
-var path = require('path')
+var fs = require("fs-extra")
+var path = require("path")
 
 var currentPath = process.cwd() // should be node_modules/@dadi/web
-var workspacePath = path.join(currentPath, 'workspace')
-var destinationDir = path.join(currentPath, '../../../workspace')
+var workspacePath = path.join(currentPath, "workspace")
+var destinationDir = path.join(currentPath, "../../../workspace")
 
 // Only run if in a node_modules folder
-if (~currentPath.indexOf('node_modules')) {
+if (~currentPath.indexOf("node_modules")) {
   fs.stat(destinationDir, (err, stats) => {
-    if (err && err.code && err.code === 'ENOENT') {
+    if (err && err.code && err.code === "ENOENT") {
       fs.copy(workspacePath, destinationDir, { overwrite: false }, err => {
         if (err) return console.error(err)
-        console.log('Web workspace created at', destinationDir)
+        console.log("Web workspace created at", destinationDir)
       })
     }
   })

scripts/init-web.js

@@ -1,25 +1,25 @@
 #! /usr/bin/env node
 
-var fs = require('fs')
-var path = require('path')
+var fs = require("fs")
+var path = require("path")
 
 var currentPath = process.cwd() // should be node_modules/@dadi/web
-var destinationFile = path.join(currentPath, '../../../server.js')
+var destinationFile = path.join(currentPath, "../../../server.js")
 
 // Add an server.js (which runs on npm start) file containing - require('@dadi/web')
 // More info: https://docs.npmjs.com/cli/start
 
 // Only run if in a node_modules folder
-if (~currentPath.indexOf('node_modules')) {
+if (~currentPath.indexOf("node_modules")) {
   fs.stat(destinationFile, (err, stats) => {
-    if (err && err.code && err.code === 'ENOENT') {
+    if (err && err.code && err.code === "ENOENT") {
       // file doesn't exist
       fs.writeFile(
         destinationFile,
         "require('@dadi/web')({engines:[require('@dadi/web-dustjs')]})",
-        function (err) {
+        function(err) {
           if (err) return console.log(err)
-          console.log('Web entry point created at', destinationFile)
+          console.log("Web entry point created at", destinationFile)
         }
       )
     }

test/acceptance/routing.js

@@ -99,10 +99,14 @@ describe("Routing", function(done) {
     var pages = TestHelper.setUpPages()
 
     TestHelper.startServer(pages).then(() => {
-      client.get("/test").set("Host", "").expect(400).end(function(err, res) {
-        if (err) return done(err)
-        done()
-      })
+      client
+        .get("/test")
+        .set("Host", "")
+        .expect(400)
+        .end(function(err, res) {
+          if (err) return done(err)
+          done()
+        })
     })
   })
 
@@ -648,10 +652,13 @@ describe("Routing", function(done) {
           var httpClient = request(
             "http://" + config.get("server.host") + ":9999"
           )
-          httpClient.get("/test").expect(302).end(function(err, res) {
-            if (err) return done(err)
-            done()
-          })
+          httpClient
+            .get("/test")
+            .expect(302)
+            .end(function(err, res) {
+              if (err) return done(err)
+              done()
+            })
         })
       })
     })

test/unit/cache.js

@@ -114,7 +114,9 @@ describe("Cache", function(done) {
       }
 
       cache.reset()
-      cache(server.object).cachingEnabled(req).should.eql(false)
+      cache(server.object)
+        .cachingEnabled(req)
+        .should.eql(false)
 
       done()
     })
@@ -249,7 +251,9 @@ describe("Cache", function(done) {
       }
 
       cache.reset()
-      cache(server.object).cachingEnabled(req).should.eql(false)
+      cache(server.object)
+        .cachingEnabled(req)
+        .should.eql(false)
 
       done()
     })
@@ -321,7 +325,9 @@ describe("Cache", function(done) {
       }
 
       cache.reset()
-      cache(server.object).cachingEnabled(req).should.eql(false)
+      cache(server.object)
+        .cachingEnabled(req)
+        .should.eql(false)
       done()
     })
   )

test/unit/preloader.js

@@ -56,7 +56,9 @@ describe("Preloader", function(done) {
           preloadSpy.called.should.eql(true)
           providerStub.called.should.eql(true)
 
-          Preload().get("car-makes").should.eql(results.results)
+          Preload()
+            .get("car-makes")
+            .should.eql(results.results)
 
           done()
         })