Merge branch 'master' into release/v5.0.0

Author: kjetilk

.github/ISSUE_TEMPLATE/nss-5-0-0-regressions.md

@@ -0,0 +1,20 @@
+---
+name: NSS-5.0.0 Regressions
+about: To report regressions in 5.0.0 (i.e. things that used to work in earlier releases),
+  use this template
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Please describe what you did in reproducible steps
+
+
+## How did it work with 4.x series servers?
+
+
+## What happened when you tried the same with the 5.0.0 beta?
+
+
+## Any material that will help, logs, error messages, etc.

.travis.yml

@@ -23,6 +23,7 @@ install:
 script:
   # Test the code
   - npm run standard
+  - npm run validate
   - npm run nyc
   # Test global install of the package
   - npm pack .

package-lock.json

@@ -118,21 +118,23 @@
     "nock": "^9.0.14",
     "node-mocks-http": "^1.7.0",
     "nyc": "^13.0.1",
+    "randombytes": "^2.0.1",
     "sinon": "^2.1.0",
     "sinon-chai": "^2.8.0",
     "snyk": "^1.88.2",
     "standard": "^8.6.0",
     "supertest": "^3.0.0",
-    "whatwg-url": "^6.1.0",
-    "randombytes": "^2.0.1"
+    "turtle-validator": "^1.0.2",
+    "whatwg-url": "^6.1.0"
   },
   "main": "index.js",
   "scripts": {
     "solid": "node ./bin/solid",
     "standard": "standard '{bin,examples,lib,test}/**/*.js'",
+    "validate": "node ./test/validate-turtle.js",
     "nyc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nyc --reporter=text-summary mocha",
     "mocha": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha",
-    "test": "npm run standard && npm run nyc",
+    "test": "npm run standard && npm run validate && npm run nyc",
     "clean": "rimraf config/templates config/views"
   },
   "nyc": {

package.json

@@ -0,0 +1,38 @@
+
+const fs = require('fs')
+const Handlebars = require('handlebars')
+const path = require('path')
+const validate = require('turtle-validator/lib/validator')
+
+const regex = new RegExp('\\.(acl|ttl)$', 'i')
+const substitutions = {
+  webId: 'http://example.com/#me',
+  email: '[email protected]',
+  name: 'Test test'
+}
+
+const files = recursiveFiles(path.join(__dirname, '../default-templates/'))
+
+for (const file of files) {
+  const data = fs.readFileSync(file, 'utf8')
+  const template = Handlebars.compile(data)
+  validate(template(substitutions), feedback => {
+    if (feedback.errors.length > 0) {
+      throw new Error(`Validation error in ${file}: ${feedback.errors[0]}`)
+    }
+  })
+}
+
+function recursiveFiles (dir) {
+  const content = fs.readdirSync(dir)
+  return [].concat(...content.map(file => {
+    const fullPath = path.join(dir, file)
+    const stat = fs.statSync(fullPath)
+    if (stat.isDirectory()) {
+      return recursiveFiles(fullPath)
+    } else if (regex.test(file)) {
+      return [fullPath]
+    }
+    return []
+  }))
+}